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)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@311613 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/sip/reqresp_parser.c b/channels/sip/reqresp_parser.c
index a40054ac00848ac5dd8061cf248c4e3bdb8f2f2f..594bcfad95f347e69b4357bbf7d5a96dff2c453c 100644 (file)
--- a/channels/sip/reqresp_parser.c
+++ b/channels/sip/reqresp_parser.c
@@ -2009,7 +2009,11 @@ static int sip_uri_domain_cmp(const char *host1, const char *host2)
         */
        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