Index: configure
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: channels/chan_sip.c
===================================================================
--- channels/chan_sip.c	(revision 306529)
+++ channels/chan_sip.c	(working copy)
@@ -23426,7 +23426,7 @@
 		if (!authpeer || AST_LIST_EMPTY(&authpeer->mailboxes)) {
 			transmit_response(p, "404 Not found (no mailbox)", req);
 			pvt_set_needdestroy(p, "received 404 response");
-			ast_log(LOG_NOTICE, "Received SIP subscribe for peer without mailbox: %s\n", authpeer->name);
+			ast_log(LOG_NOTICE, "Received SIP subscribe for peer without mailbox: %s\n", authpeer->name ? authpeer->name : "");
 			if (authpeer)
 				unref_peer(authpeer, "unref_peer, from handle_request_subscribe (authpeer 4)");
 			return 0;
Index: res/res_jabber.c
===================================================================
--- res/res_jabber.c	(revision 306529)
+++ res/res_jabber.c	(working copy)
@@ -2490,7 +2490,7 @@
 			"Account: %s\r\nJID: %s\r\nResource: %s\r\nStatus: %d\r\nPriority: %d"
 			"\r\nDescription: %s\r\n",
 			client->name, pak->from->partial, found->resource, found->status,
-			found->priority, found->description);
+			found->priority, found->description ? found->description : "");
 	} else {
 		manager_event(EVENT_FLAG_USER, "JabberStatus",
 			"Account: %s\r\nJID: %s\r\nStatus: %d\r\n",