Further fix for psql's code for locale-aware formatting of numeric output.

On closer inspection, those seemingly redundant atoi() calls were not so
much inefficient as just plain wrong: the author of this code either had
not read, or had not understood, the POSIX specification for localeconv().
The grouping field is *not* a textual digit string but separate integers
encoded as chars.

We'll follow the existing code as well as the backend's cash.c in only
honoring the first group width, but let's at least honor it correctly.

This doesn't actually result in any behavioral change in any of the
locales I have installed on my Linux box, which may explain why nobody's
complained; grouping width 3 is close enough to universal that it's barely
worth considering other cases.  Still, wrong is wrong, so back-patch.

diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
index ecf1137838a53fc154ac9c4cace6d73591bca998..725ce8b34c44fe76c856c8d86e00af8af8101b27 100644 (file)
--- a/src/bin/psql/print.c
+++ b/src/bin/psql/print.c
@@ -3227,16 +3227,24 @@ setDecimalLocale(void)
 
        extlconv = localeconv();
 
+       /* Don't accept an empty decimal_point string */
        if (*extlconv->decimal_point)
                decimal_point = pg_strdup(extlconv->decimal_point);
        else
                decimal_point = ".";    /* SQL output standard */
 
-       if (*extlconv->grouping && atoi(extlconv->grouping) > 0)
-               groupdigits = atoi(extlconv->grouping);
-       else
+       /*
+        * Although the Open Group standard allows locales to supply more than one
+        * group width, we consider only the first one, and we ignore any attempt
+        * to suppress grouping by specifying CHAR_MAX.  As in the backend's
+        * cash.c, we must apply a range check to avoid being fooled by variant
+        * CHAR_MAX values.
+        */
+       groupdigits = *extlconv->grouping;
+       if (groupdigits <= 0 || groupdigits > 6)
                groupdigits = 3;                /* most common */
 
+       /* Don't accept an empty thousands_sep string, either */
        /* similar code exists in formatting.c */
        if (*extlconv->thousands_sep)
                thousands_sep = pg_strdup(extlconv->thousands_sep);