View | Details | Raw Unified | Return to bug 72
Collapse All | Expand All

(-)a/src/common/buffer.cc (+2 lines)
 Lines 396-401   Buffer Link Here 
396
Buffer 
396
Buffer 
397
Buffer::CreateFragment (uint32_t start, uint32_t length) const
397
Buffer::CreateFragment (uint32_t start, uint32_t length) const
398
{
398
{
399
  NS_ASSERT (m_start <= m_data->m_initialStart);
399
  uint32_t zeroStart = m_data->m_initialStart - m_start;
400
  uint32_t zeroStart = m_data->m_initialStart - m_start;
400
  uint32_t zeroEnd = zeroStart + m_zeroAreaSize;
401
  uint32_t zeroEnd = zeroStart + m_zeroAreaSize;
401
  if (m_zeroAreaSize != 0 &&
402
  if (m_zeroAreaSize != 0 &&
 Lines 407-412   Buffer::CreateFragment (uint32_t start, Link Here 
407
  Buffer tmp = *this;
408
  Buffer tmp = *this;
408
  tmp.RemoveAtStart (start);
409
  tmp.RemoveAtStart (start);
409
  tmp.RemoveAtEnd (GetSize () - (start + length));
410
  tmp.RemoveAtEnd (GetSize () - (start + length));
411
  NS_ASSERT (m_start <= m_data->m_initialStart);
410
  return tmp;
412
  return tmp;
411
}
413
}
412
414
(-)a/src/common/buffer.h (+2 lines)
 Lines 406-411   Buffer::Buffer (Buffer const&o) Link Here 
406
{
406
{
407
  m_data->m_count++;
407
  m_data->m_count++;
408
  NS_ASSERT (m_start <= m_data->m_size);
408
  NS_ASSERT (m_start <= m_data->m_size);
409
  NS_ASSERT (m_start <= m_data->m_initialStart);
409
}
410
}
410
411
411
Buffer &
412
Buffer &
 Lines 426-431   Buffer::operator = (Buffer const&o) Link Here 
426
  m_start = o.m_start;
427
  m_start = o.m_start;
427
  m_size = o.m_size;
428
  m_size = o.m_size;
428
  NS_ASSERT (m_start <= m_data->m_size);
429
  NS_ASSERT (m_start <= m_data->m_size);
430
  NS_ASSERT (m_start <= m_data->m_initialStart);
429
  return *this;
431
  return *this;
430
}
432
}
431
433

Return to bug 72