Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 111eedda authored by Lajos Molnar's avatar Lajos Molnar Committed by android-build-merger
Browse files

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

am: e4fbad46

Change-Id: Ib303db1700ec624c48e5cca095bf38cce22b743d
parents a3b6b741 e4fbad46

media/libstagefright/ACodec.cpp

+4 −2
Original line number Diff line number Diff line
@@ -7615,8 +7615,10 @@ status_t ACodec::setVendorParameters(const sp<AMessage> &params) { 
                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;

            }