[asterisk-commits] bbryant: trunk r311613 - in /trunk: ./ channels/sip/reqresp_parser.c

[SVN commits to the Asterisk project]

Author: bbryant
Date: Wed Mar 23 16:46:59 2011
New Revision: 311613

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

........
  r311612 | bbryant | 2011-03-23 17:45:46 -0400 (Wed, 23 Mar 2011) | 9 lines
  
  Fix a possible crash in sip/reqresp_parser.c that is caused by a possible null
  value.
  
  (closes issue #18821)
  Reported by: cmaj
  Patches: 
        patch-reqresp_parser_sip_uri_domain_cmp_c_locale-crash-1.8.3-rc2.diff.tx
        uploaded by cmaj (license 830)
........

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

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

Modified: trunk/channels/sip/reqresp_parser.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/sip/reqresp_parser.c?view=diff&rev=311613&r1=311612&r2=311613
==============================================================================
--- trunk/channels/sip/reqresp_parser.c (original)
+++ trunk/channels/sip/reqresp_parser.c Wed Mar 23 16:46:59 2011
@@ -2009,7 +2009,11 @@
 	 */
 	if (!addr1_parsed) {
 #ifdef HAVE_XLOCALE_H
-		return strcasecmp_l(host1, host2, c_locale);
+		if(!c_locale) {
+			return strcasecmp(host1, host2);
+		} else {
+			return strcasecmp_l(host1, host2, c_locale);
+		}
 #else
 		return strcasecmp(host1, host2);
 #endif