Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '9f0fa1f4c1ed8499bf53479cf51c440a8f665d5e' into eclair-mr2-plus-aosp

* commit '9f0fa1f4c1ed8499bf53479cf51c440a8f665d5e':
  Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.
This commit is contained in:
Scott Main
2009-12-03 16:51:20 -08:00
committed by Android Git Automerger
parent 0633dc49fa 9f0fa1f4c1
commit 06ef1d2104
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/libstagefright/omx/OMXSoftwareCodecsPlugin.cpp
View File

@@ -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;
}