commit ed1abbfc73d4ade0ef08239fc56ac66d70a00a92
author Caroline Tice <cmtice@google.com> Wed Feb 08 23:45:12 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 08 23:45:12 2017 +0000
tree 2a415b98a8761ca8c39cfc70234044b27558a071
parent 89a5055187864ae8bf8d5ee4f2cb2719f4d1054b
parent 4b0f2f51509154f1180dab192bff23ce4bf725c7

Merge "Fix static analyzer warnings" am: 9064b2d12a am: 9924503dfe am: 41194d937c
am: 4b0f2f5150

Change-Id: Ic5ff05b44bcfe9edefff1044c78691d3fd6c9f98

media/libstagefright/DataSource.cpp

diff --git a/media/libstagefright/DataSource.cpp b/media/libstagefright/DataSource.cpp
index 4a965ba..ded79f3 100644
--- a/media/libstagefright/DataSource.cpp
+++ b/media/libstagefright/DataSource.cpp
@@ -130,7 +130,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 5f9c167..0dd3e88 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -4515,8 +4515,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;