Fix segv in strcmp when locale_cs_canonic is NULL.

SVN revision: 27033
16 years ago · f8dc34e26f
parent 4d21f126c9
commit f8dc34e26f
1 changed files with 4 additions and 3 deletions
--- a/src/bin/e_intl.c
+++ b/src/bin/e_intl.c
@ -1043,8 +1043,8 @@ _e_intl_locale_validate(const char *locale)
 			      e_intl_locale_charset_canonic_get(locale_cs_next);
 			    if (locale_cs_canonic_next)
 			      {
-				 if (!strcmp(locale_cs_canonic, 
-					  locale_cs_canonic_next))
+				 if (locale_cs_canonic && 
+				       !strcmp(locale_cs_canonic, locale_cs_canonic_next))
 				   {
 				      /* Lang/Resion and charsets in canonic 
 				       * form match 
@ -1055,7 +1055,8 @@ _e_intl_locale_validate(const char *locale)
 			      }
 			    else
 			      {
-				 if (!strcmp(locale_cs_canonic, locale_cs_next))
+				 if (locale_cs_canonic && 
+				       !strcmp(locale_cs_canonic, locale_cs_next))
 				   {
 				      /* Lang/Resion and charsets in canonic 
 				       * form match