[svn-commits] gtjoseph: branch 12 r423278 - in /branches/12: ./ include/asterisk/ main/

[SVN commits to the Digium repositories]

Author: gtjoseph
Date: Thu Sep 18 09:43:41 2014
New Revision: 423278

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=423278
Log:
config: bug: Fix SEGV in ast_category_insert when matching category isn't found

If you call ast_category_insert with a match category that doesn't exist, the
list traverse runs out of 'next' categories and you get a SEGV.  This patch
adds check for the end-of-list condition and changes the signature to return
an int for success/failure indication instead of a void.

The only consumer of this function is manager and it was also changed to use
the return value.

Tested by: George Joseph
Review: https://reviewboard.asterisk.org/r/3993/
........

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

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

Modified:
    branches/12/   (props changed)
    branches/12/include/asterisk/config.h
    branches/12/main/config.c
    branches/12/main/manager.c

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

Modified: branches/12/include/asterisk/config.h
URL: http://svnview.digium.com/svn/asterisk/branches/12/include/asterisk/config.h?view=diff&rev=423278&r1=423277&r2=423278
==============================================================================
--- branches/12/include/asterisk/config.h (original)
+++ branches/12/include/asterisk/config.h Thu Sep 18 09:43:41 2014
@@ -675,8 +675,11 @@
  * \details
  * This function is used to insert a new category above another category
  * matching the match parameter.
- */
-void ast_category_insert(struct ast_config *config, struct ast_category *cat, const char *match);
+ *
+ * \retval 0 if succeeded
+ * \retval -1 if NULL parameters or match category was not found
+ */
+int ast_category_insert(struct ast_config *config, struct ast_category *cat, const char *match);
 int ast_category_delete(struct ast_config *cfg, const char *category);
 
 /*!

Modified: branches/12/main/config.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/main/config.c?view=diff&rev=423278&r1=423277&r2=423278
==============================================================================
--- branches/12/main/config.c (original)
+++ branches/12/main/config.c Thu Sep 18 09:43:41 2014
@@ -783,24 +783,28 @@
 	config->current = category;
 }
 
-void ast_category_insert(struct ast_config *config, struct ast_category *cat, const char *match)
+int ast_category_insert(struct ast_config *config, struct ast_category *cat, const char *match)
 {
 	struct ast_category *cur_category;
 
-	if (!cat || !match)
-		return;
+	if (!config || !cat || !match) {
+		return -1;
+	}
 	if (!strcasecmp(config->root->name, match)) {
 		cat->next = config->root;
 		config->root = cat;
-		return;
-	}
-	for (cur_category = config->root; cur_category; cur_category = cur_category->next) {
+		return 0;
+	}
+	for (cur_category = config->root; cur_category && cur_category->next;
+		cur_category = cur_category->next) {
 		if (!strcasecmp(cur_category->next->name, match)) {
 			cat->next = cur_category->next;
 			cur_category->next = cat;
-			break;
-		}
-	}
+			return 0;
+		}
+	}
+
+	return -1;
 }
 
 static void ast_destroy_template_list(struct ast_category *cat)

Modified: branches/12/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/main/manager.c?view=diff&rev=423278&r1=423277&r2=423278
==============================================================================
--- branches/12/main/manager.c (original)
+++ branches/12/main/manager.c Thu Sep 18 09:43:41 2014
@@ -3231,7 +3231,11 @@
 			if (ast_strlen_zero(match)) {
 				ast_category_append(cfg, category);
 			} else {
-				ast_category_insert(cfg, category, match);
+				if (ast_category_insert(cfg, category, match)) {
+					result = FAILURE_NEWCAT;
+					ast_category_destroy(category);
+					break;
+				}
 			}
 		} else if (!strcasecmp(action, "renamecat")) {
 			if (ast_strlen_zero(value)) {