commit d8133f4acad121b19da9961ed03b7c1084b89276
author Marco Nelissen <marcone@google.com> Fri Oct 23 12:13:10 2009 -0700
committer Marco Nelissen <marcone@google.com> Fri Oct 23 12:24:04 2009 -0700
tree 7a61c698b082341329b449958ddfca14a5bdac65
parent db2e477e3e40a5863ed243543ae7e2c4b6dc3108

Fix valgrind error in media scanner (http://b/issue?id=2210270) caused
by copying a string without its 0 terminator.

android/mediascanner.cpp

diff --git a/android/mediascanner.cpp b/android/mediascanner.cpp
index e15fe5b..1c3aef2 100644
--- a/android/mediascanner.cpp
+++ b/android/mediascanner.cpp
@@ -371,17 +371,15 @@
                 uint32 trackType = mp4Input->getTrackMediaType(tracks[i]);
                 OSCL_HeapString<OsclMemAllocator> streamtype;
                 mp4Input->getTrackMIMEType(tracks[i], streamtype);
-                char streamtypeutf8[128];
-                strncpy (streamtypeutf8, streamtype.get_str(), streamtype.get_size());
-                if (streamtypeutf8[0]) {
-                    if (strcmp(streamtypeutf8,"FORMATUNKNOWN") != 0) {
+                if (streamtype.get_size()) {
+                    if (strcmp(streamtype.get_cstr(),"FORMATUNKNOWN") != 0) {
                             if (trackType ==  MEDIA_TYPE_AUDIO) {
                                 hasAudio = true;
                             } else if (trackType ==  MEDIA_TYPE_VISUAL) {
                                 hasVideo = true;
                             }
                     } else {
-                        //LOGI("@@@@@@@@ %100s: %s\n", filename, streamtypeutf8);
+                        //LOGI("@@@@@@@@ %100s: %s\n", filename, streamtype.get_cstr());
                     }
                 }
             }