Fix calling on deleted objects

2 files changed, 4 insertions, 4 deletions

diff --git a/src/pk_pad/emsa2/emsa2.cpp b/src/pk_pad/emsa2/emsa2.cpp
index d299ddacd..02a3dbe72 100644
--- a/src/pk_pad/emsa2/emsa2.cpp
+++ b/src/pk_pad/emsa2/emsa2.cpp
@@ -99,12 +99,13 @@ EMSA2::EMSA2(HashFunction* hash_in) : hash(hash_in)
    {
    empty_hash = hash->final();
 
-   hash_id = ieee1363_hash_id(hash->name());
+   const std::string hash_name = hash->name();
+   hash_id = ieee1363_hash_id(hash_name);
 
    if(hash_id == 0)
       {
       delete hash;
-      throw Encoding_Error("EMSA2 cannot be used with " + hash->name());
+      throw Encoding_Error("EMSA2 no hash identifier for " + hash_name);
       }
    }
 
diff --git a/src/rng/randpool/randpool.cpp b/src/rng/randpool/randpool.cpp
index ef55f3975..aa029fef3 100644
--- a/src/rng/randpool/randpool.cpp
+++ b/src/rng/randpool/randpool.cpp
@@ -184,8 +184,7 @@ Randpool::Randpool(BlockCipher* cipher_in,
       {
       delete cipher;
       delete mac;
-      throw Internal_Error("Randpool: Invalid algorithm combination " +
-                           cipher->name() + "/" + mac->name());
+      throw Internal_Error("Randpool: Invalid algorithm combination");
       }
 
    buffer.resize(BLOCK_SIZE);