[asterisk-commits] markm: trunk r321156 - in /trunk: ./ channels/ channels/sip/

[SVN commits to the Asterisk project]

Author: markm
Date: Thu May 26 16:50:06 2011
New Revision: 321156

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=321156
Log:
Merged revisions 321155 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r321155 | markm | 2011-05-26 17:48:45 -0400 (Thu, 26 May 2011) | 10 lines
  
  Fixed build problem with dev mode enabled, which was caused by commit 321100.  Reformulated patch to be more generic.
  
  Moved the sip uri parse variable initalization to parse_uri_full in reqresp_parser.c.  This will ensure that any use of parse uri will have null output variables if the parse fails.
  
  (closes issue #19346)
  Reported by: kobaz
  Tested by: kobaz,JonathanRose
  
  Review: [full review board URL with trailing slash]
........

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

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

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=321156&r1=321155&r2=321156
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Thu May 26 16:50:06 2011
@@ -13550,21 +13550,8 @@
 }
 
 /*! \brief parse uri in a way that allows semicolon stripping if legacy mode is enabled */
-static int parse_uri_legacy_check(char *uri, const char *scheme, char **user, char **pass, char **domain, char **transport) {
-	/* Assume invalid to start */
-	if (user) {
-		*user = 0;
-	}
-	if (pass) {
-		*pass = 0;
-	}
-	if (domain) {
-		*domain = 0;
-	}
-	if (transport) {
-		*transport = 0;
-	}
-
+static int parse_uri_legacy_check(char *uri, const char *scheme, char **user, char **pass, char **domain, char **transport)
+{
 	int ret = parse_uri(uri, scheme, user, pass, domain, transport);
 	if (sip_cfg.legacy_useroption_parsing) { /* if legacy mode is active, strip semis from the user field */
 		char *p;

Modified: trunk/channels/sip/reqresp_parser.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/sip/reqresp_parser.c?view=diff&rev=321156&r1=321155&r2=321156
==============================================================================
--- trunk/channels/sip/reqresp_parser.c (original)
+++ trunk/channels/sip/reqresp_parser.c Thu May 26 16:50:06 2011
@@ -44,6 +44,23 @@
 
 	/* check for valid input */
 	if (ast_strlen_zero(uri)) {
+		/* make sure we leave nothing undefined after we exit */
+		if (user) {
+			*user = "";
+		}
+		if (pass) {
+			*pass = "";
+		}
+		if (domain) {
+			*domain = "";
+		}
+		if (headers) {
+			*headers = "";
+		}
+		if (residue) {
+			*residue = "";
+		}
+
 		return -1;
 	}