From 5d28a721302c4f6ed0cd921ca1cf5aae7779676f Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Thu, 28 May 2009 14:52:39 +0000
Subject: [PATCH] Merged revisions 197538 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

........
  r197538 | file | 2009-05-28 11:51:43 -0300 (Thu, 28 May 2009) | 5 lines

  Fix a bug in stringfields where it did not actually free the pools of memory.

  (closes issue #15074)
  Reported by: pj
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@197539 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 main/utils.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/main/utils.c b/main/utils.c
index 554da57d84..21b4ea9aa7 100644
--- a/main/utils.c
+++ b/main/utils.c
@@ -1423,7 +1423,11 @@ int __ast_string_field_init(struct ast_string_field_mgr *mgr, struct ast_string_
 		return add_string_pool(mgr, pool_head, needed, file, lineno, func);
 	}
 	if (needed < 0) {		/* reset all pools */
-		/* nothing to do */
+		if (*pool_head == NULL) {
+			ast_log(LOG_WARNING, "trying to reset empty pool\n");
+			return -1;
+		}
+		cur = *pool_head;
 	} else {			/* preserve the last pool */
 		if (*pool_head == NULL) {
 			ast_log(LOG_WARNING, "trying to reset empty pool\n");