config.c: Move memory free earlier in cleanup code to ensure the loca…

…l pool is released.
ironbee · Mar 4, 2014 · 11655cd · 11655cd
1 parent eaa21ee
commit 11655cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/engine/config.c b/engine/config.c
@@ -329,6 +329,7 @@ ib_status_t ib_cfgparser_parse_private(
 
     close(fd);
 cleanup_fd:
+    ib_mpool_lite_destroy(local_mp);
 
     cp->cur_cwd = save_cwd;
 
@@ -344,8 +345,6 @@ ib_status_t ib_cfgparser_parse_private(
         error_count,
         ib_status_to_string(rc));
 
-    ib_mpool_lite_destroy(local_mp);
-
     return rc;
 }
 

diff --git a/tests/ibtest_strbase.hpp b/tests/ibtest_strbase.hpp
@@ -567,7 +567,7 @@ class TestStringModification : public ::testing::Test
         }
     }
 
-    ~TestStringModification() {
+    virtual ~TestStringModification() {
         if (m_mpool != NULL) {
             ib_mpool_destroy(m_mpool);
         }