Avoid a memory leak if lookup of a component algorithm of Lion cannot be

found by using auto_ptr

1 files changed, 9 insertions, 2 deletions

diff --git a/src/core/libstate/def_alg.cpp b/src/core/libstate/def_alg.cpp
index 7199b06bd..c637262ee 100644
--- a/src/core/libstate/def_alg.cpp
+++ b/src/core/libstate/def_alg.cpp
@@ -399,8 +399,15 @@ Default_Engine::find_block_cipher(const std::string& algo_spec) const
       if(name.size() != 4)
          throw Invalid_Algorithm_Name(algo_spec);
 
-      return new Lion(get_hash(name[1]), get_stream_cipher(name[2]),
-                      to_u32bit(name[3]));
+      std::auto_ptr<HashFunction> hash(get_hash(name[1]));
+      if(!hash.get())
+         throw Algorithm_Not_Found(name[1]);
+
+      std::auto_ptr<StreamCipher> sc(get_stream_cipher(name[2]));
+      if(!sc.get())
+         throw Algorithm_Not_Found(name[2]);
+
+      return new Lion(hash.release(), sc.release(), to_u32bit(name[3]));
       }
 #endif