[svn-commits] russell: trunk r66072 - in /trunk: ./ main/channel.c

[svn-commits at lists.digium.com]

Author: russell
Date: Thu May 24 17:08:33 2007
New Revision: 66072

URL: http://svn.digium.com/view/asterisk?view=rev&rev=66072
Log:
Merged revisions 66070 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r66070 | russell | 2007-05-24 17:07:39 -0500 (Thu, 24 May 2007) | 2 lines

Check the result of ast_string_field_init() in ast_channel_alloc()

........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?view=diff&rev=66072&r1=66071&r2=66072
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Thu May 24 17:08:33 2007
@@ -652,7 +652,8 @@
 		return NULL;
 	}
 	
-	ast_string_field_init(tmp, 128);
+	if ((ast_string_field_init(tmp, 128)))
+		return NULL;
 
 	/* Don't bother initializing the last two FD here, because they
 	   will *always* be set just a few lines down (AST_TIMING_FD,