diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2003-07-17 22:20:22 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2003-07-17 22:20:22 +0000 |
| commit | 004d2be5d939693da2bf650e5abe4a0293d121d1 (patch) | |
| tree | 7074225a7ed61146125a8d7dfe45f41fbaae1608 | |
| parent | df32af15b6681f7f34430414bf56d0fd15fdcb54 (diff) | |
| download | postgresql-004d2be5d939693da2bf650e5abe4a0293d121d1.tar.gz postgresql-004d2be5d939693da2bf650e5abe4a0293d121d1.zip | |
Oh, for crying in a bucket ... relax Assert so that glibc's strxfrm
does not dump core.
| -rw-r--r-- | src/backend/utils/adt/selfuncs.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 26d585b99c3..6a56ef1eeef 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.119.2.5 2003/07/17 20:52:42 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.119.2.6 2003/07/17 22:20:22 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -2362,11 +2362,16 @@ convert_string_datum(Datum value, Oid typid) * However, it seems that some versions of Solaris have buggy * strxfrm that can write past the specified buffer length in that * scenario. So, do it the dumb way for portability. + * + * Yet other systems (e.g., glibc) sometimes return a smaller value + * from the second call than the first; thus the Assert must be <= + * not == as you'd expect. Can't any of these people program their + * way out of a paper bag? */ xfrmlen = strxfrm(NULL, val, 0); xfrmstr = (char *) palloc(xfrmlen + 1); xfrmlen2 = strxfrm(xfrmstr, val, xfrmlen + 1); - Assert(xfrmlen2 == xfrmlen); + Assert(xfrmlen2 <= xfrmlen); pfree(val); val = xfrmstr; } |