From: Anthony Minessale <anthm@freeswitch.org>
Date: Mon, 23 Apr 2012 12:50:57 +0000 (-0500)
Subject: FS-4141 --resolve
X-Git-Tag: v1.2-rc1~17^2~149
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e5a2ff84b94b1b86eff6c7063c7877b0bc6a581;p=thirdparty%2Ffreeswitch.git

FS-4141 --resolve
---

diff --git a/src/mod/applications/mod_hash/mod_hash.c b/src/mod/applications/mod_hash/mod_hash.c
index 3a93062ada..5905116883 100644
--- a/src/mod/applications/mod_hash/mod_hash.c
+++ b/src/mod/applications/mod_hash/mod_hash.c
@@ -451,8 +451,6 @@ SWITCH_STANDARD_APP(hash_function)
 			value = strdup(argv[3]);
 			switch_assert(value);
 			switch_core_hash_insert(globals.db_hash, hash_key, value);
-		} else {
-			switch_safe_free(value);
 		}
 
 	} else if (!strcasecmp(argv[0], "delete")) {
@@ -466,9 +464,9 @@ SWITCH_STANDARD_APP(hash_function)
 		}
 		if ((value = switch_core_hash_find(globals.db_hash, hash_key))) {
 			if(!strcmp(argv[3], value)) {
+				switch_safe_free(value);
 				switch_core_hash_delete(globals.db_hash, hash_key);
 			}
-			switch_safe_free(value);
 		}
 	} else {
 		goto usage;
@@ -527,7 +525,6 @@ SWITCH_STANDARD_API(hash_api_function)
 		switch_thread_rwlock_wrlock(globals.db_hash_rwlock);
 		if ((value = switch_core_hash_find(globals.db_hash, hash_key))) {
 			stream->write_function(stream, "-ERR key already exists\n");
-			switch_safe_free(value);
 		} else {
 			value = strdup(argv[3]);
 			switch_assert(value);
@@ -552,12 +549,12 @@ SWITCH_STANDARD_API(hash_api_function)
 		switch_thread_rwlock_wrlock(globals.db_hash_rwlock);
 		if ((value = switch_core_hash_find(globals.db_hash, hash_key))) {
 			if(!strcmp(argv[3],value)) {
+				switch_safe_free(value);
 				switch_core_hash_delete(globals.db_hash, hash_key);
 				stream->write_function(stream, "+OK\n");
 			} else {
 				stream->write_function(stream, "-ERR Doesn't match\n");
 			}
-			switch_safe_free(value);
 		} else {
 			stream->write_function(stream, "-ERR Not found\n");
 		}