Merge branch 'eclair-mr2' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2

2009-12-03 16:14:13 -08:00
parent e08361d7fd 805cc709b7
commit 9f0fa1f4c1
1 changed files with 2 additions and 1 deletions
--- a/media/libstagefright/omx/OMXSoftwareCodecsPlugin.cpp
+++ b/media/libstagefright/omx/OMXSoftwareCodecsPlugin.cpp
@@ -74,7 +74,8 @@ OMX_ERRORTYPE OMXSoftwareCodecsPlugin::enumerateComponents(
        return OMX_ErrorNoMore;
    }

-    strlcpy(name, kComponentInfos[index].mName, size);
+    strncpy(name, kComponentInfos[index].mName, size - 1);
+    name[size - 1] = '\0';

    return OMX_ErrorNone;
 }