feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix issues in botan shown up by a coverity scan

Browse Source 
Reviewed-by: kh
This commit is contained in:
Bill King
2010-05-27 12:15:53 +02:00
parent ed018f691a
commit b201dcb584
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/3rdparty/botan/src/alloc/mem_pool/mem_pool.cpp vendored
View File

@@ -180,7 +180,7 @@ void Pooling_Allocator::deallocate(void* ptr, u32bit n)
const u32bit BITMAP_SIZE = Memory_Block::bitmap_size(); const u32bit BITMAP_SIZE = Memory_Block::bitmap_size();
const u32bit BLOCK_SIZE = Memory_Block::block_size(); const u32bit BLOCK_SIZE = Memory_Block::block_size();
if(ptr == 0 && n == 0) if(ptr == 0 || n == 0)
return; return;
Mutex_Holder lock(mutex); Mutex_Holder lock(mutex);

3
src/libs/3rdparty/botan/src/pk_pad/emsa2/emsa2.cpp vendored
View File

@@ -103,8 +103,9 @@ EMSA2::EMSA2(HashFunction* hash_in) : hash(hash_in)
if(hash_id == 0) if(hash_id == 0)
{ {
std::string hashname = hash->name();
delete hash; delete hash;
throw Encoding_Error("EMSA2 cannot be used with " + hash->name()); throw Encoding_Error("EMSA2 cannot be used with " + hashname);
} }
} }

3
src/libs/3rdparty/botan/src/rng/randpool/randpool.cpp vendored
View File

@@ -186,10 +186,11 @@ Randpool::Randpool(BlockCipher* cipher_in,
!cipher->valid_keylength(OUTPUT_LENGTH) || !cipher->valid_keylength(OUTPUT_LENGTH) ||
!mac->valid_keylength(OUTPUT_LENGTH)) !mac->valid_keylength(OUTPUT_LENGTH))
{ {
std::string ciphername = cipher->name(), macname = mac->name();
delete cipher; delete cipher;
delete mac; delete mac;
throw Internal_Error("Randpool: Invalid algorithm combination " + throw Internal_Error("Randpool: Invalid algorithm combination " +
cipher->name() + "/" + mac->name()); ciphername + "/" + macname);
} }
buffer.create(BLOCK_SIZE); buffer.create(BLOCK_SIZE);