commit e4fbad4654f0af583bb5f0eb4b7300e3e96eaacf
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 24 17:50:16 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 24 17:50:16 2018 +0000
tree 66bd8136fb2b3de4a40ca45a9999b12bdeee7e96
parent 64da22285776f07a775afd45f9fc36cea1aa05e3
parent 69f360e8f1517abfc298a3d6c7252c72269dc6c6

Merge "stagefright: null-terminate vendor OMX string extensions" into pi-dev

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 0296dd8..ad81f04 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -7615,8 +7615,10 @@
                 config->param[paramIndex].bSet =
                     (OMX_BOOL)params->findString(existingKey->second.c_str(), &value);
                 if (config->param[paramIndex].bSet) {
-                    strncpy((char *)config->param[paramIndex].cString, value.c_str(),
-                            sizeof(OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE::cString));
+                    size_t dstSize = sizeof(config->param[paramIndex].cString);
+                    strncpy((char *)config->param[paramIndex].cString, value.c_str(), dstSize - 1);
+                    // null terminate value
+                    config->param[paramIndex].cString[dstSize - 1] = '\0';
                 }
                 break;
             }