v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #598 from LegalizeAdulthood/cppcheck-null 

Fix char buffer issues found by cppcheck
pull/587/head
Alexander Gessler 2015-07-05 13:46:54 +02:00
parent 71b275eea2 e3ebef0094
commit cf4cb6caef
4 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/assimp_cmd/WriteDumb.cpp
View File

@ -677,16 +677,26 @@ void WriteBinaryDump(const aiScene* scene, FILE* _out, const char* src, const ch
Write<uint16_t>(compressed); Write<uint16_t>(compressed);
// == 20 bytes // == 20 bytes
char buff[256]; {
char buff[256] = { 0 };
strncpy(buff,src,256); strncpy(buff,src,256);
buff[255] = 0;
fwrite(buff,256,1,out); fwrite(buff,256,1,out);
}
{
char buff[128] = { 0 };
strncpy(buff,cmd,128); strncpy(buff,cmd,128);
buff[127] = 0;
fwrite(buff,128,1,out); fwrite(buff,128,1,out);
}
// leave 64 bytes free for future extensions // leave 64 bytes free for future extensions
{
char buff[64];
memset(buff,0xcd,64); memset(buff,0xcd,64);
fwrite(buff,64,1,out); fwrite(buff,64,1,out);
}
// == 435 bytes // == 435 bytes
// ==== total header size: 512 bytes // ==== total header size: 512 bytes

12
tools/assimp_view/Display.cpp
View File

@ -1320,8 +1320,10 @@ int CDisplay::HandleTreeViewPopup2(WPARAM wParam,LPARAM lParam)
{ {
// need to remove the file name // need to remove the file name
char* sz = strrchr(szFileName,'\\'); char* sz = strrchr(szFileName,'\\');
if (!sz)sz = strrchr(szFileName,'/'); if (!sz)
if (!sz)*sz = 0; sz = strrchr(szFileName,'/');
if (sz)
*sz = 0;
} }
OPENFILENAME sFilename1 = { OPENFILENAME sFilename1 = {
sizeof(OPENFILENAME), sizeof(OPENFILENAME),
@ -1353,8 +1355,10 @@ int CDisplay::HandleTreeViewPopup2(WPARAM wParam,LPARAM lParam)
{ {
// need to remove the file name // need to remove the file name
char* sz = strrchr(szFileName,'\\'); char* sz = strrchr(szFileName,'\\');
if (!sz)sz = strrchr(szFileName,'/'); if (!sz)
if (!sz)*sz = 0; sz = strrchr(szFileName,'/');
if (sz)
*sz = 0;
} }
OPENFILENAME sFilename1 = { OPENFILENAME sFilename1 = {
sizeof(OPENFILENAME), sizeof(OPENFILENAME),

6
tools/assimp_view/LogWindow.cpp
View File

@ -168,8 +168,10 @@ void CLogWindow::Save()
{ {
// need to remove the file name // need to remove the file name
char* sz = strrchr(szFileName,'\\'); char* sz = strrchr(szFileName,'\\');
if (!sz)sz = strrchr(szFileName,'/'); if (!sz)
if (!sz)*sz = 0; sz = strrchr(szFileName,'/');
if (sz)
*sz = 0;
} }
OPENFILENAME sFilename1 = { OPENFILENAME sFilename1 = {
sizeof(OPENFILENAME), sizeof(OPENFILENAME),

24
tools/assimp_view/MessageProc.cpp
View File

@ -474,8 +474,10 @@ void LoadBGTexture()
{ {
// need to remove the file name // need to remove the file name
char* sz = strrchr(szFileName,'\\'); char* sz = strrchr(szFileName,'\\');
if (!sz)sz = strrchr(szFileName,'/'); if (!sz)
if (!sz)*sz = 0; sz = strrchr(szFileName,'/');
if (sz)
*sz = 0;
} }
OPENFILENAME sFilename1 = { OPENFILENAME sFilename1 = {
sizeof(OPENFILENAME), sizeof(OPENFILENAME),
@ -597,8 +599,10 @@ void LoadSkybox()
{ {
// need to remove the file name // need to remove the file name
char* sz = strrchr(szFileName,'\\'); char* sz = strrchr(szFileName,'\\');
if (!sz)sz = strrchr(szFileName,'/'); if (!sz)
if (!sz)*sz = 0; sz = strrchr(szFileName,'/');
if (sz)
*sz = 0;
} }
OPENFILENAME sFilename1 = { OPENFILENAME sFilename1 = {
sizeof(OPENFILENAME), sizeof(OPENFILENAME),
@ -639,8 +643,10 @@ void SaveScreenshot()
{ {
// need to remove the file name // need to remove the file name
char* sz = strrchr(szFileName,'\\'); char* sz = strrchr(szFileName,'\\');
if (!sz)sz = strrchr(szFileName,'/'); if (!sz)
if (!sz)*sz = 0; sz = strrchr(szFileName,'/');
if (sz)
*sz = 0;
} }
OPENFILENAME sFilename1 = { OPENFILENAME sFilename1 = {
sizeof(OPENFILENAME), sizeof(OPENFILENAME),
@ -938,8 +944,10 @@ void OpenAsset()
{ {
// need to remove the file name // need to remove the file name
char* sz = strrchr(szFileName,'\\'); char* sz = strrchr(szFileName,'\\');
if (!sz)sz = strrchr(szFileName,'/'); if (!sz)
if (!sz)*sz = 0; sz = strrchr(szFileName,'/');
if (sz)
*sz = 0;
} }
// get a list of all file extensions supported by ASSIMP // get a list of all file extensions supported by ASSIMP