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

Botan: Fix potential null pointer access.

Browse Source 
Change-Id: I0bc9ea383f74dc642b17001593313044a36abede
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Christian Kandeler
2014-11-18 17:18:06 +01:00
parent c91980ce12
commit 7214971199
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/3rdparty/botan/botan.cpp vendored
View File

@@ -40267,8 +40267,9 @@ EMSA2::EMSA2(HashFunction* hash_in) : hash(hash_in)
if(hash_id == 0) if(hash_id == 0)
{ {
const 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);
} }
} }
@@ -44282,10 +44283,12 @@ 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))
{ {
const std::string cipherName = cipher->name();
const std::string 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.resize(BLOCK_SIZE); buffer.resize(BLOCK_SIZE);