mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-31 19:21:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace strcpys with strlcpy (except for librsound.c)

Browse Source
This commit is contained in:
twinaphex 2012-07-29 18:38:55 +02:00
parent 22dc1b9e72
commit c92c08ff31
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xbox1/frontend/RetroLaunch/IoSupport.cpp
View File

@ -120,7 +120,7 @@ HRESULT CIoSupport::Remount(CHAR* szDrive, CHAR* szDevice)
HRESULT CIoSupport::Remap(CHAR* szMapping) HRESULT CIoSupport::Remap(CHAR* szMapping)
{ {
char szMap[32]; char szMap[32];
strcpy(szMap, szMapping ); strlcpy(szMap, szMapping, sizeof(szMap));
char* pComma = strstr(szMap, ","); char* pComma = strstr(szMap, ",");
if (pComma) if (pComma)

13
xdk/xdk_resources.cpp
View File

@ -92,7 +92,8 @@ static __forceinline void FreeContiguousMemory( void* pData )
#ifdef _XBOX1 #ifdef _XBOX1
char g_strMediaPath[512] = "D:\\Media\\"; char g_strMediaPath[512] = "D:\\Media\\";
static HRESULT FindMediaFile( char *strPath, const char *strFilename )
static HRESULT FindMediaFile( char *strPath, const char *strFilename, size_t strPathsize)
{ {
// Check for valid arguments // Check for valid arguments
if( strFilename == NULL || strPath == NULL ) if( strFilename == NULL || strPath == NULL )
@ -102,7 +103,7 @@ static HRESULT FindMediaFile( char *strPath, const char *strFilename )
} }
// Default path is the filename itself as a fully qualified path // Default path is the filename itself as a fully qualified path
strcpy( strPath, strFilename ); strlcpy( strPath, strFilename, strPathsize);
// Check for the ':' character to see if the filename is a fully // Check for the ':' character to see if the filename is a fully
// qualified path. If not, pre-pend the media directory // qualified path. If not, pre-pend the media directory
@ -115,11 +116,7 @@ static HRESULT FindMediaFile( char *strPath, const char *strFilename )
if( hFile == INVALID_HANDLE_VALUE ) if( hFile == INVALID_HANDLE_VALUE )
{ {
// Return error RARCH_ERR("FindMediaFile(): Could not find file.\n");
CHAR strBuffer[80];
sprintf( strBuffer, "FindMediaFile(): Could not find file [%s]\n",
strFilename );
RARCH_ERR( strBuffer );
return 0x82000004; return 0x82000004;
} }
@ -143,7 +140,7 @@ HRESULT PackedResource::Create( const char *strFilename )
// Find the media file // Find the media file
CHAR strResourcePath[512]; CHAR strResourcePath[512];
if( FAILED( FindMediaFile( strResourcePath, strFilename ) ) ) if( FAILED(FindMediaFile(strResourcePath, strFilename, sizeof(strResourcePath))))
return E_FAIL; return E_FAIL;
else else
strFilename = strResourcePath; strFilename = strResourcePath;