[asterisk-commits] rmudgett: branch 12 r400015 - in /branches/12: ./ channels/ channels/sip/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Sep 27 16:42:03 2013
New Revision: 400015

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=400015
Log:
chan_sip: Increase some scratch buffer sizes dealing with caller id.

* Eliminated an unnecessary initialization in check_user_full().

(closes issue ASTERISK-22477)
Reported by: Michael Shepelev
........

Merged revisions 400013 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 400014 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/channels/chan_sip.c
    branches/12/channels/sip/reqresp_parser.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/channels/chan_sip.c?view=diff&rev=400015&r1=400014&r2=400015
==============================================================================
--- branches/12/channels/chan_sip.c (original)
+++ branches/12/channels/chan_sip.c Fri Sep 27 16:42:03 2013
@@ -18701,9 +18701,9 @@
 					      int sipmethod, const char *uri, enum xmittype reliable,
 					      struct ast_sockaddr *addr, struct sip_peer **authpeer)
 {
-	char from[256] = "", *of, *name, *unused_password, *domain;
+	char from[256], *of, *name, *unused_password, *domain;
 	enum check_auth_result res = AUTH_DONT_KNOW;
-	char calleridname[50];
+	char calleridname[256];
 	char *uri2 = ast_strdupa(uri);
 
 	terminate_uri(uri2);	/* trim extra stuff */

Modified: branches/12/channels/sip/reqresp_parser.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/channels/sip/reqresp_parser.c?view=diff&rev=400015&r1=400014&r2=400015
==============================================================================
--- branches/12/channels/sip/reqresp_parser.c (original)
+++ branches/12/channels/sip/reqresp_parser.c Fri Sep 27 16:42:03 2013
@@ -806,7 +806,7 @@
 int get_name_and_number(const char *hdr, char **name, char **number)
 {
 	char header[256];
-	char tmp_name[50];
+	char tmp_name[256];
 	char *tmp_number = NULL;
 	char *hostport = NULL;
 	char *dummy = NULL;