From nobody@FreeBSD.org  Fri Jan 29 19:32:52 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 53086106568D
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 29 Jan 2010 19:32:52 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id E74368FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 29 Jan 2010 19:32:51 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o0TJWpK4003205
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 29 Jan 2010 19:32:51 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o0TJWpRK003204;
	Fri, 29 Jan 2010 19:32:51 GMT
	(envelope-from nobody)
Message-Id: <201001291932.o0TJWpRK003204@www.freebsd.org>
Date: Fri, 29 Jan 2010 19:32:51 GMT
From: Corinna Vinschen <corinna@vinschen.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: pointer comparison against '\0' in strfmon.c
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         143350
>Category:       bin
>Synopsis:       [libc] [patch] strfmon(3): pointer comparison against '\0' in strfmon.c
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 29 19:40:09 UTC 2010
>Closed-Date:    Tue Feb 09 19:05:20 EST 2010
>Last-Modified:  Wed Feb 10 00:10:03 UTC 2010
>Originator:     Corinna Vinschen
>Release:        CVS HEAD
>Organization:
Cygwin
>Environment:
>Description:
There appears to be a bug in strfom.c, function __setup_vars.

When the value for the negative sign string is fetched, there
are two comparisons of the following style:

  *signstr = (lc->negative_sign == '\0') ? "-"
      : lc->negative_sign;

lc->negative_sign is a string pointer.  The above statement
compares the pointer against '\0'.  This looks like a typo.
Actually the comparison should check if the first character
in lc->negative_sign is \0, or better, if lc->negative_sign
is an empty string.  A check for NULL doesn't make sense
since localeconv never returns NULL pointers as struct lconv
members.

So I think the patch below should be the right way to go.


Corinna
>How-To-Repeat:

>Fix:
Index: strfmon.c
===================================================================
RCS file: /home/ncvs/src/lib/libc/stdlib/strfmon.c,v
retrieving revision 1.19
diff -u -p -r1.19 strfmon.c
--- strfmon.c   24 Apr 2008 07:49:00 -0000      1.19
+++ strfmon.c   29 Jan 2010 19:23:39 -0000
@@ -413,7 +413,7 @@ __setup_vars(int flags, char *cs_precede
                *cs_precedes = lc->int_n_cs_precedes;
                *sep_by_space = lc->int_n_sep_by_space;
                *sign_posn = (flags & PARENTH_POSN) ? 0 : lc->int_n_sign_posn;
-               *signstr = (lc->negative_sign == '\0') ? "-"
+               *signstr = (*lc->negative_sign == '\0') ? "-"
                    : lc->negative_sign;
        } else if (flags & USE_INTL_CURRENCY) {
                *cs_precedes = lc->int_p_cs_precedes;
@@ -424,7 +424,7 @@ __setup_vars(int flags, char *cs_precede
                *cs_precedes = lc->n_cs_precedes;
                *sep_by_space = lc->n_sep_by_space;
                *sign_posn = (flags & PARENTH_POSN) ? 0 : lc->n_sign_posn;
-               *signstr = (lc->negative_sign == '\0') ? "-"
+               *signstr = (*lc->negative_sign == '\0') ? "-"
                    : lc->negative_sign;
        } else {
                *cs_precedes = lc->p_cs_precedes;


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: cracauer 
State-Changed-When: Tue Feb 9 19:03:55 EST 2010 
State-Changed-Why:  
Fixed in -current as suggested after testing, commit r203734. 

Let me know if backports are desired. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=143350 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/143350: commit references a PR
Date: Wed, 10 Feb 2010 00:02:22 +0000 (UTC)

 Author: cracauer
 Date: Wed Feb 10 00:02:09 2010
 New Revision: 203734
 URL: http://svn.freebsd.org/changeset/base/203734
 
 Log:
   Fix PR
   http://www.freebsd.org/cgi/query-pr.cgi?pr=bin/143350
   Empty string test gone wrong.
   
   Testing this requires that you have a locale that has the sign string
   unset but has int_n_sign_posn set (the default locale falls through to
   use "()" around negative numbers which is probably another bug).
   
   I created that setup by hand and indeed without this fix negative
   numbers are put out as positive numbers (doesn't fall through to use
   "-" as default indicator).
   
   Unfixed example in nl_NL.ISO8859-1 with lc->negative_sign set to empty
   string:
     strfmon(buf, sizeof(buf), "%-8i", -42.0);
   ==>
   example2: 'EUR  42,00' 'Eu 42,00'
   
   Fixed:
   example2: 'EUR  42,00-' 'Eu 42,00-'
   
   This file and suggested fix are identical in at least freebsd-8.
   Backport might be appropriate but some expert on locales should
   probably have a look at us defaulting to negative numbers in
   parenthesis when LC_* is default.  That doesn't look right and is not
   what other OSes are doing.
   
   PR:		143350
   Submitted by:	Corinna Vinschen
   Reviewed by:	bug reporter submitted, tested by me
 
 Modified:
   head/lib/libc/stdlib/strfmon.c
 
 Modified: head/lib/libc/stdlib/strfmon.c
 ==============================================================================
 --- head/lib/libc/stdlib/strfmon.c	Wed Feb 10 00:01:35 2010	(r203733)
 +++ head/lib/libc/stdlib/strfmon.c	Wed Feb 10 00:02:09 2010	(r203734)
 @@ -413,7 +413,7 @@ __setup_vars(int flags, char *cs_precede
  		*cs_precedes = lc->int_n_cs_precedes;
  		*sep_by_space = lc->int_n_sep_by_space;
  		*sign_posn = (flags & PARENTH_POSN) ? 0 : lc->int_n_sign_posn;
 -		*signstr = (lc->negative_sign == '\0') ? "-"
 +		*signstr = (lc->negative_sign[0] == '\0') ? "-"
  		    : lc->negative_sign;
  	} else if (flags & USE_INTL_CURRENCY) {
  		*cs_precedes = lc->int_p_cs_precedes;
 @@ -424,7 +424,7 @@ __setup_vars(int flags, char *cs_precede
  		*cs_precedes = lc->n_cs_precedes;
  		*sep_by_space = lc->n_sep_by_space;
  		*sign_posn = (flags & PARENTH_POSN) ? 0 : lc->n_sign_posn;
 -		*signstr = (lc->negative_sign == '\0') ? "-"
 +		*signstr = (lc->negative_sign[0] == '\0') ? "-"
  		    : lc->negative_sign;
  	} else {
  		*cs_precedes = lc->p_cs_precedes;
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
