commit cb5a9477073cf7ae4a28356d6e3e5638aba78dc9
author Angie Chiang <angiebird@google.com> Tue Nov 20 14:41:20 2018 -0800
committer James Zern <jzern@google.com> Tue Nov 20 17:53:18 2018 -0800
tree 3bcde549c8c3130e9545d5d73fcd9217c25c7393
parent e4931ebc0a816458c18a6734e91a4d1b5acd5c56

Fix a potential memory leak in mkvparser.cc

BUG=webm:1575

Change-Id: Id9a903e14daaab7b93df3a2f443d2f196dbe9104

mkvparser/mkvparser.cc

diff --git a/mkvparser/mkvparser.cc b/mkvparser/mkvparser.cc
index 5a7b896..9c78ead 100644
--- a/mkvparser/mkvparser.cc
+++ b/mkvparser/mkvparser.cc
@@ -5312,7 +5312,7 @@
   const long long stop = pos + s.size;
 
   Colour* colour = NULL;
-  Projection* projection = NULL;
+  std::unique_ptr<Projection> projection_ptr;
 
   while (pos < stop) {
     long long id, size;
@@ -5364,8 +5364,12 @@
       if (!Colour::Parse(pReader, pos, size, &colour))
         return E_FILE_FORMAT_INVALID;
     } else if (id == libwebm::kMkvProjection) {
-      if (!Projection::Parse(pReader, pos, size, &projection))
+      Projection* projection = NULL;
+      if (!Projection::Parse(pReader, pos, size, &projection)) {
         return E_FILE_FORMAT_INVALID;
+      } else {
+        projection_ptr.reset(projection);
+      }
     } else if (id == libwebm::kMkvColourSpace) {
       const long status = UnserializeString(pReader, pos, size, colour_space);
       if (status < 0)
@@ -5402,7 +5406,7 @@
   pTrack->m_rate = rate;
   pTrack->m_colour = colour;
   pTrack->m_colour_space = colour_space;
-  pTrack->m_projection = projection;
+  pTrack->m_projection = projection_ptr.release();
 
   pResult = pTrack;
   return 0;  // success