]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 277143 via svnmerge from
authorSean Bright <sean@malleable.com>
Fri, 16 Jul 2010 15:21:46 +0000 (15:21 +0000)
committerSean Bright <sean@malleable.com>
Fri, 16 Jul 2010 15:21:46 +0000 (15:21 +0000)
https://origsvn.digium.com/svn/asterisk/trunk

........
  r277143 | seanbright | 2010-07-16 11:20:40 -0400 (Fri, 16 Jul 2010) | 8 lines

  Avoid crashing when installing a duplicate translation path with a lower cost.

  (closes issue #17092)
  Reported by: moy
  Patches:
        translate.rev254273.patch uploaded by moy (license 222)
  Tested by: moy
........

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

main/translate.c

index 293ab3203306303c6311a398808ce1aaffb27555..d313e172cd3105566e652218624a5822dab4cbc6 100644 (file)
@@ -665,6 +665,7 @@ int __ast_register_translator(struct ast_translator *t, struct ast_module *mod)
                    (u->cost > t->cost)) {
                        AST_RWLIST_INSERT_BEFORE_CURRENT(t, list);
                        t = NULL;
+                       break;
                }
        }
        AST_RWLIST_TRAVERSE_SAFE_END;