haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed segfault on getSHA1 (fopen result was not checked)

This commit is contained in:
Cirilo Bernardo 2016-02-23 11:38:58 +11:00
parent d6af042c64
commit 2f8c55cd99
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
3d-viewer/3d_cache/3d_cache.cpp
View File

@ -264,7 +264,7 @@ SCENEGRAPH* S3D_CACHE::checkCache( const wxString& aFileName, S3D_CACHE_ENTRY**
if( !getSHA1( aFileName, sha1sum ) || m_CacheDir.empty() ) if( !getSHA1( aFileName, sha1sum ) || m_CacheDir.empty() )
{ {
// just in case we can't get an hash digest (for example, on access issues) // just in case we can't get a hash digest (for example, on access issues)
// or we do not have a configured cache file directory, we create an // or we do not have a configured cache file directory, we create an
// entry to prevent further attempts at loading the file // entry to prevent further attempts at loading the file
S3D_CACHE_ENTRY* ep = new S3D_CACHE_ENTRY; S3D_CACHE_ENTRY* ep = new S3D_CACHE_ENTRY;
@ -352,6 +352,10 @@ bool S3D_CACHE::getSHA1( const wxString& aFileName, unsigned char* aSHA1Sum )
} }
FILE* fp = fopen( aFileName.ToUTF8(), "rb" ); FILE* fp = fopen( aFileName.ToUTF8(), "rb" );
if( NULL == fp )
return false;
boost::uuids::detail::sha1 dblock; boost::uuids::detail::sha1 dblock;
unsigned char block[4096]; unsigned char block[4096];
size_t bsize = 0; size_t bsize = 0;