diff options
| -rw-r--r-- | contrib/seg/expected/seg.out | 7 | ||||
| -rw-r--r-- | contrib/seg/seg.c | 8 | ||||
| -rw-r--r-- | contrib/seg/segparse.y | 22 | ||||
| -rw-r--r-- | contrib/seg/sql/seg.sql | 3 |
4 files changed, 33 insertions, 7 deletions
diff --git a/contrib/seg/expected/seg.out b/contrib/seg/expected/seg.out index e617dd7e299..2320464dd47 100644 --- a/contrib/seg/expected/seg.out +++ b/contrib/seg/expected/seg.out @@ -256,6 +256,13 @@ SELECT '12.34567890123456'::seg AS seg; 12.3457 (1 row) +-- Same, with a very long input +SELECT '12.3456789012345600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'::seg AS seg; + seg +--------- + 12.3457 +(1 row) + -- Numbers with certainty indicators SELECT '~6.5'::seg AS seg; seg diff --git a/contrib/seg/seg.c b/contrib/seg/seg.c index e964560053d..a7effc1b190 100644 --- a/contrib/seg/seg.c +++ b/contrib/seg/seg.c @@ -928,9 +928,13 @@ restore(char *result, float val, int n) /* * Put a cap on the number of significant digits to avoid garbage in the - * output and ensure we don't overrun the result buffer. + * output and ensure we don't overrun the result buffer. (n should not be + * negative, but check to protect ourselves against corrupted data.) */ - n = Min(n, FLT_DIG); + if (n <= 0) + n = FLT_DIG; + else + n = Min(n, FLT_DIG); /* remember the sign */ sign = (val < 0 ? 1 : 0); diff --git a/contrib/seg/segparse.y b/contrib/seg/segparse.y index 1d2adbbec89..0156c3e0274 100644 --- a/contrib/seg/segparse.y +++ b/contrib/seg/segparse.y @@ -3,6 +3,7 @@ #include "postgres.h" +#include <float.h> #include <math.h> #include "fmgr.h" @@ -20,6 +21,8 @@ static float seg_atof(const char *value); +static int sig_digits(const char *value); + static char strbuf[25] = { '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', @@ -62,9 +65,9 @@ range: boundary PLUMIN deviation result->lower = $1.val - $3.val; result->upper = $1.val + $3.val; sprintf(strbuf, "%g", result->lower); - result->l_sigd = Max(Min(6, significant_digits(strbuf)), Max($1.sigd, $3.sigd)); + result->l_sigd = Max(sig_digits(strbuf), Max($1.sigd, $3.sigd)); sprintf(strbuf, "%g", result->upper); - result->u_sigd = Max(Min(6, significant_digits(strbuf)), Max($1.sigd, $3.sigd)); + result->u_sigd = Max(sig_digits(strbuf), Max($1.sigd, $3.sigd)); result->l_ext = '\0'; result->u_ext = '\0'; } @@ -121,7 +124,7 @@ boundary: SEGFLOAT float val = seg_atof($1); $$.ext = '\0'; - $$.sigd = significant_digits($1); + $$.sigd = sig_digits($1); $$.val = val; } | EXTENSION SEGFLOAT @@ -130,7 +133,7 @@ boundary: SEGFLOAT float val = seg_atof($2); $$.ext = $1[0]; - $$.sigd = significant_digits($2); + $$.sigd = sig_digits($2); $$.val = val; } ; @@ -141,7 +144,7 @@ deviation: SEGFLOAT float val = seg_atof($1); $$.ext = '\0'; - $$.sigd = significant_digits($1); + $$.sigd = sig_digits($1); $$.val = val; } ; @@ -157,3 +160,12 @@ seg_atof(const char *value) datum = DirectFunctionCall1(float4in, CStringGetDatum(value)); return DatumGetFloat4(datum); } + +static int +sig_digits(const char *value) +{ + int n = significant_digits(value); + + /* Clamp, to ensure value will fit in sigd fields */ + return Min(n, FLT_DIG); +} diff --git a/contrib/seg/sql/seg.sql b/contrib/seg/sql/seg.sql index 6fe33e90e4e..a027d4de97e 100644 --- a/contrib/seg/sql/seg.sql +++ b/contrib/seg/sql/seg.sql @@ -60,6 +60,9 @@ SELECT '3.400e5'::seg AS seg; -- Digits truncated SELECT '12.34567890123456'::seg AS seg; +-- Same, with a very long input +SELECT '12.3456789012345600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'::seg AS seg; + -- Numbers with certainty indicators SELECT '~6.5'::seg AS seg; SELECT '<6.5'::seg AS seg; |