[asterisk-commits] coreyfarrell: branch 12 r427382 - in /branches/12: ./ include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: coreyfarrell
Date: Thu Nov  6 03:15:15 2014
New Revision: 427382

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=427382
Log:
Fix unintential memory retention in stringfields.

* Fix missing / unreachable calls to __ast_string_field_release_active.
* Reset pool->used to zero when the current pool->active reaches zero.

ASTERISK-24307 #close
Reported by: Etienne Lessard
Tested by: ibercom, Etienne Lessard
Review: https://reviewboard.asterisk.org/r/4114/
........

Merged revisions 427380 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 427381 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/include/asterisk/stringfields.h
    branches/12/main/utils.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/include/asterisk/stringfields.h
URL: http://svnview.digium.com/svn/asterisk/branches/12/include/asterisk/stringfields.h?view=diff&rev=427382&r1=427381&r2=427382
==============================================================================
--- branches/12/include/asterisk/stringfields.h (original)
+++ branches/12/include/asterisk/stringfields.h Thu Nov  6 03:15:15 2014
@@ -316,26 +316,28 @@
 */
 #define ast_string_field_ptr_set(x, ptr, data) ast_string_field_ptr_set_by_fields((x)->__field_mgr_pool, (x)->__field_mgr, ptr, data)
 
-#define ast_string_field_ptr_set_by_fields(field_mgr_pool, field_mgr, ptr, data) \
-({ \
-    int __res__ = 0; \
-    const char *__d__ = (data);                                         \
-    size_t __dlen__ = (__d__) ? strlen(__d__) + 1 : 1;                              \
-    ast_string_field *__p__ = (ast_string_field *) (ptr);                               \
-    if (__dlen__ == 1) {                                                \
-        __ast_string_field_release_active(field_mgr_pool, *__p__);                  \
-        *__p__ = __ast_string_field_empty;                                  \
-    } else if ((__dlen__ <= AST_STRING_FIELD_ALLOCATION(*__p__)) ||                         \
-           (!__ast_string_field_ptr_grow(&field_mgr, &field_mgr_pool, __dlen__, __p__)) ||   \
-           (*__p__ = __ast_string_field_alloc_space(&field_mgr, &field_mgr_pool, __dlen__))) {   \
-        if (*__p__ != (*ptr)) {                                         \
-            __ast_string_field_release_active(field_mgr_pool, (*ptr));              \
-        }                                                   \
-        memcpy(* (void **) __p__, __d__, __dlen__);                             \
-    } else { \
-        __res__ = -1; \
-    }                                                       \
-    __res__; \
+#define ast_string_field_ptr_set_by_fields(field_mgr_pool, field_mgr, ptr, data)               \
+({                                                                                             \
+    int __res__ = 0;                                                                           \
+    const char *__d__ = (data);                                                                \
+    size_t __dlen__ = (__d__) ? strlen(__d__) + 1 : 1;                                         \
+    ast_string_field *__p__ = (ast_string_field *) (ptr);                                      \
+    ast_string_field target = *__p__;                                                          \
+    if (__dlen__ == 1) {                                                                       \
+        __ast_string_field_release_active(field_mgr_pool, *__p__);                             \
+        *__p__ = __ast_string_field_empty;                                                     \
+    } else if ((__dlen__ <= AST_STRING_FIELD_ALLOCATION(*__p__)) ||                            \
+           (!__ast_string_field_ptr_grow(&field_mgr, &field_mgr_pool, __dlen__, __p__)) ||     \
+           (target = __ast_string_field_alloc_space(&field_mgr, &field_mgr_pool, __dlen__))) { \
+        if (target != *__p__) {                                                                \
+            __ast_string_field_release_active(field_mgr_pool, *__p__);                         \
+            *__p__ = target;                                                                   \
+        }                                                                                      \
+        memcpy(* (void **) __p__, __d__, __dlen__);                                            \
+    } else {                                                                                   \
+        __res__ = -1;                                                                          \
+    }                                                                                          \
+    __res__;                                                                                   \
 })
 
 /*!

Modified: branches/12/main/utils.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/main/utils.c?view=diff&rev=427382&r1=427381&r2=427382
==============================================================================
--- branches/12/main/utils.c (original)
+++ branches/12/main/utils.c Thu Nov  6 03:15:15 2014
@@ -2091,9 +2091,13 @@
 	for (pool = pool_head, prev = NULL; pool; prev = pool, pool = pool->prev) {
 		if ((ptr >= pool->base) && (ptr <= (pool->base + pool->size))) {
 			pool->active -= AST_STRING_FIELD_ALLOCATION(ptr);
-			if ((pool->active == 0) && prev) {
-				prev->prev = pool->prev;
-				ast_free(pool);
+			if (pool->active == 0) {
+				if (prev) {
+					prev->prev = pool->prev;
+					ast_free(pool);
+				} else {
+					pool->used = 0;
+				}
 			}
 			break;
 		}
@@ -2140,6 +2144,11 @@
 
 	if (res < 0) {
 		/* Are we out of memory? */
+		return;
+	}
+	if (res == 0) {
+		__ast_string_field_release_active(*pool_head, *ptr);
+		*ptr = __ast_string_field_empty;
 		return;
 	}
 	needed = (size_t)res + 1; /* NUL byte */