Just thought I'd point out that although this fixes the segv, I'm not
100% convinced that it is behaving as it should, so maybe whoever wrote
this stuff can double check it?

metrics

On Thu, Nov 09, 2006 at 06:17:06PM -0500, Enlightenment CVS wrote:
> Enlightenment CVS committal
> 
> Author  : metrics
> Project : e17
> Module  : apps/e
> 
> Dir     : e17/apps/e/src/bin
> 
> 
> Modified Files:
>       e_intl.c 
> 
> 
> Log Message:
> Fix segv in strcmp when locale_cs_canonic is NULL.
> 
> ===================================================================
> RCS file: /cvs/e/e17/apps/e/src/bin/e_intl.c,v
> retrieving revision 1.84
> retrieving revision 1.85
> diff -u -3 -r1.84 -r1.85
> --- e_intl.c  5 Nov 2006 05:09:55 -0000       1.84
> +++ e_intl.c  9 Nov 2006 23:17:06 -0000       1.85
> @@ -1043,8 +1043,8 @@
>                             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 @@
>                             }
>                           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 
> 
> 
> 
> -------------------------------------------------------------------------
> Using Tomcat but need to do more? Need to support web services, security?
> Get stuff done quickly with pre-integrated technology to make your job easier
> Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
> http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
> _______________________________________________
> enlightenment-cvs mailing list
> enlightenment-cvs@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
> 

-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Reply via email to