From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 24 Nov 2010 23:26:43 +0000 (+0000)
Subject: Make Asterisk less crashy.
X-Git-Tag: 1.4.39-rc1~3^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f95e212afcb51ee2d69eb9c5c9d1a3a8fce60f9d;p=thirdparty%2Fasterisk.git

Make Asterisk less crashy.

Since we might not put a new translation path on the channel, go ahead and
set it to NULL right after destroying the old one to ensure we don't try
to free an invalid translation path later on.


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

diff --git a/main/channel.c b/main/channel.c
index 175c0bd5e5..0e3c315fd8 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -3400,8 +3400,10 @@ static int set_format(struct ast_channel *chan, int fmt, int *rawformat, int *fo
 	/* User perspective is fmt */
 	*format = fmt;
 	/* Free any read translation we have right now */
-	if (*trans)
+	if (*trans) {
 		ast_translator_free_path(*trans);
+		*trans = NULL;
+	}
 	/* Build a translation path from the raw format to the desired format */
 	if (*format == *rawformat) {
 		/*