commit 9064b2d12a572cb53469883a595eed6360b49cd8
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 08 23:28:35 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 08 23:28:36 2017 +0000
tree 8bd737bf7db07a8c97e3044db7e50c13518da96f
parent 659cb35e192201158837ccf89efb2cea603e7fab
parent 65c954e72a126e4ea59d1fe2859bfb39cb800380

Merge "Fix static analyzer warnings"

media/libstagefright/DataSource.cpp

diff --git a/media/libstagefright/DataSource.cpp b/media/libstagefright/DataSource.cpp
index 163a527..2cfadba 100644
--- a/media/libstagefright/DataSource.cpp
+++ b/media/libstagefright/DataSource.cpp
@@ -231,7 +231,7 @@
         }
 
         String8 cacheConfig;
-        bool disconnectAtHighwatermark;
+        bool disconnectAtHighwatermark = false;
         KeyedVector<String8, String8> nonCacheSpecificHeaders;
         if (headers != NULL) {
             nonCacheSpecificHeaders = *headers;

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 9392e7d..02be033 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -4412,8 +4412,8 @@
         // fall through
     }
 
-    off64_t offset;
-    size_t size;
+    off64_t offset = 0;
+    size_t size = 0;
     uint32_t cts, stts;
     bool isSyncSample;
     bool newBuffer = false;