[asterisk-commits] file: trunk r57771 - in /trunk: ./ res/res_jabber.c

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Sun Mar 4 20:39:33 MST 2007


Author: file
Date: Sun Mar  4 21:39:32 2007
New Revision: 57771

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

........
r57770 | file | 2007-03-04 22:35:03 -0500 (Sun, 04 Mar 2007) | 2 lines

Don't reference a potentially NULL pointer. (issue #9199 reported by klolik)

........

Modified:
    trunk/   (props changed)
    trunk/res/res_jabber.c

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

Modified: trunk/res/res_jabber.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_jabber.c?view=diff&rev=57771&r1=57770&r2=57771
==============================================================================
--- trunk/res/res_jabber.c (original)
+++ trunk/res/res_jabber.c Sun Mar  4 21:39:32 2007
@@ -383,7 +383,8 @@
 		r = buddy->resources;
 	if(!r)
 		ast_log(LOG_NOTICE, "Resource %s of buddy %s not found \n", resource, screenname);
-	stat = r->status;
+	else
+		stat = r->status;
 	sprintf(status, "%d", stat);
 	pbx_builtin_setvar_helper(chan, variable, status);
 	return 0;



More information about the asterisk-commits mailing list