If we don't match registrar when destroying a context, it can cause a crash.
authorTilghman Lesher <tilghman@meg.abyt.es>
Tue, 17 Jun 2008 18:23:01 +0000 (18:23 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Tue, 17 Jun 2008 18:23:01 +0000 (18:23 +0000)
(closes issue #12835)
 Reported by: ys
 Patches:
       pbx.c.diff uploaded by ys (license 281)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@123358 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/pbx.c

index 9654bd8..a0ba3a9 100644 (file)
@@ -7153,13 +7153,13 @@ void __ast_context_destroy(struct ast_context *list, struct ast_hashtab *context
        struct ast_context *tmp, *tmpl=NULL;
        struct ast_exten *exten_item, *prio_item;
 
-
        for (tmp = list; tmp; ) {
                struct ast_context *next = NULL;        /* next starting point */
                for (; tmp; tmpl = tmp, tmp = tmp->next) {
                        ast_debug(1, "check ctx %s %s\n", tmp->name, tmp->registrar);
-                       if ( registrar || (con && strcasecmp(tmp->name, con->name)) )
+                       if ( (registrar && !strcasecmp(tmp->registrar, registrar)) || (con && !strcasecmp(tmp->name, con->name)) ) {
                                break;  /* found it */
+                       }
                }
                if (!tmp)       /* not found, we are done */
                        break;