From: Sean Bright <sean@malleable.com>
Date: Fri, 16 Jul 2010 15:21:46 +0000 (+0000)
Subject: Merged revisions 277143 via svnmerge from
X-Git-Tag: 1.6.2.11-rc1~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b14b49b99966589804213f2e2f6a62da1bc94f67;p=thirdparty%2Fasterisk.git

Merged revisions 277143 via svnmerge from
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
---

diff --git a/main/translate.c b/main/translate.c
index 293ab32033..d313e172cd 100644
--- a/main/translate.c
+++ b/main/translate.c
@@ -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;