diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2003-07-17 22:20:14 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2003-07-17 22:20:14 +0000 |
| commit | 0347d310d70326f29133fb1dab09a7d5e1c6d7c4 (patch) | |
| tree | bf5a56b868ca5d9562161ffc57f9501557681f4c /src/backend/utils/adt/selfuncs.c | |
| parent | 59d9a370808d51bc232f99571ae654b6ed8172b7 (diff) | |
| download | postgresql-0347d310d70326f29133fb1dab09a7d5e1c6d7c4.tar.gz postgresql-0347d310d70326f29133fb1dab09a7d5e1c6d7c4.zip | |
Oh, for crying in a bucket ... relax Assert so that glibc's strxfrm
does not dump core.
Diffstat (limited to 'src/backend/utils/adt/selfuncs.c')
| -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 e48baa2cbfd..917bdc2fe20 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.140 2003/07/17 20:52:36 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.141 2003/07/17 22:20:14 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -2700,11 +2700,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; } |