Fix memory leak in video_coding::PacketBuffer::InsertPacket.

webrtc/modules/video_coding/video_packet_buffer_unittest.cc

 /*
  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 46 matching lines @@
               uint8_t* data = nullptr) {  // data pointer
     VCMPacket packet;
     packet.codec = kVideoCodecGeneric;
     packet.seqNum = seq_num;
     packet.frameType = keyframe ? kVideoFrameKey : kVideoFrameDelta;
     packet.isFirstPacket = first == kFirst;
     packet.markerBit = last == kLast;
     packet.sizeBytes = data_size;
     packet.dataPtr = data;
 
-    return packet_buffer_->InsertPacket(packet);
+    return packet_buffer_->InsertPacket(&packet);
   }
 
   void CheckFrame(uint16_t first_seq_num) {
     auto frame_it = frames_from_callback_.find(first_seq_num);
     ASSERT_FALSE(frame_it == frames_from_callback_.end())
         << "Could not find frame with first sequence number " << first_seq_num
         << ".";
   }
 
   const int kStartSize = 16;
@@ skipping 57 matching lines @@
   const uint16_t seq_num = Rand();
 
   VCMPacket packet;
   packet.codec = kVideoCodecGeneric;
   packet.seqNum = seq_num;
   packet.frameType = kVideoFrameKey;
   packet.isFirstPacket = true;
   packet.markerBit = false;
   packet.timesNacked = 0;
 
-  packet_buffer_->InsertPacket(packet);
+  packet_buffer_->InsertPacket(&packet);
 
   packet.seqNum++;
   packet.isFirstPacket = false;
   packet.timesNacked = 1;
-  packet_buffer_->InsertPacket(packet);
+  packet_buffer_->InsertPacket(&packet);
 
   packet.seqNum++;
   packet.timesNacked = 3;
-  packet_buffer_->InsertPacket(packet);
+  packet_buffer_->InsertPacket(&packet);
 
   packet.seqNum++;
   packet.markerBit = true;
   packet.timesNacked = 1;
-  packet_buffer_->InsertPacket(packet);
+  packet_buffer_->InsertPacket(&packet);
 
   ASSERT_EQ(1UL, frames_from_callback_.size());
   RtpFrameObject* frame = frames_from_callback_.begin()->second.get();
   EXPECT_EQ(3, frame->times_nacked());
 }
 
 TEST_F(TestPacketBuffer, FrameSize) {
   const uint16_t seq_num = Rand();
   uint8_t* data1 = new uint8_t[5]();
   uint8_t* data2 = new uint8_t[5]();
@@ skipping 188 matching lines @@
 
   VCMPacket packet;
   packet.seqNum = seq_num;
   packet.codec = kVideoCodecH264;
   packet.insertStartCode = true;
   packet.video_header.codecHeader.H264.packetization_type = kH264SingleNalu;
   packet.dataPtr = data;
   packet.sizeBytes = sizeof(data_data);
   packet.isFirstPacket = true;
   packet.markerBit = true;
-  packet_buffer_->InsertPacket(packet);
+  packet_buffer_->InsertPacket(&packet);
 
   ASSERT_EQ(1UL, frames_from_callback_.size());
   EXPECT_EQ(frames_from_callback_[seq_num]->EncodedImage()._length,
             sizeof(data_data));
   EXPECT_EQ(frames_from_callback_[seq_num]->EncodedImage()._size,
             sizeof(data_data) + EncodedImage::kBufferPaddingBytesH264);
   EXPECT_TRUE(frames_from_callback_[seq_num]->GetBitstream(result.get()));
   EXPECT_EQ(memcmp(result.get(), data, sizeof(data_data)), 0);
 }
 
@@ skipping 52 matching lines @@
   packet_buffer_->ClearTo(9025);
   Insert(9057, kDeltaFrame, kFirst, kLast);
   Insert(9026, kDeltaFrame, kFirst, kLast);
 
   CheckFrame(9024);
   CheckFrame(9025);
   CheckFrame(9026);
   CheckFrame(9057);
 }
 
+TEST_F(TestPacketBuffer, DontLeakPayloadData) {
+  // NOTE! Any eventual leak is suppose to be detected by valgrind
+  //       or any other similar tool.
+  uint8_t* data1 = new uint8_t[5];
+  uint8_t* data2 = new uint8_t[5];
+  uint8_t* data3 = new uint8_t[5];
+  uint8_t* data4 = new uint8_t[5];
+
+  // Expected to free data1 upon PacketBuffer destruction.
+  EXPECT_TRUE(Insert(2, kKeyFrame, kFirst, kNotLast, 5, data1));
+
+  // Expect to free data2 upon insertion.
+  EXPECT_TRUE(Insert(2, kKeyFrame, kFirst, kNotLast, 5, data2));
+
+  // Expect to free data3 upon insertion (old packet).
+  packet_buffer_->ClearTo(1);
+  EXPECT_FALSE(Insert(1, kKeyFrame, kFirst, kNotLast, 5, data3));
+
+  // Expect to free data4 upon insertion (packet buffer is full).
+  EXPECT_FALSE(Insert(2 + kMaxSize, kKeyFrame, kFirst, kNotLast, 5, data4));
+}
+
 }  // namespace video_coding
 }  // namespace webrtc