mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-21 08:29:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Oh, for crying in a bucket ... relax Assert so that glibc's strxfrm

Browse Source 
does not dump core.
This commit is contained in:
Tom Lane 2003-07-17 22:20:14 +00:00
parent 59d9a37080
commit 0347d310d7
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend/utils/adt/selfuncs.c
View File

@ -15,7 +15,7 @@
* *
* *
* IDENTIFICATION * 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 * However, it seems that some versions of Solaris have buggy
* strxfrm that can write past the specified buffer length in that * strxfrm that can write past the specified buffer length in that
* scenario. So, do it the dumb way for portability. * 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); xfrmlen = strxfrm(NULL, val, 0);
xfrmstr = (char *) palloc(xfrmlen + 1); xfrmstr = (char *) palloc(xfrmlen + 1);
xfrmlen2 = strxfrm(xfrmstr, val, xfrmlen + 1); xfrmlen2 = strxfrm(xfrmstr, val, xfrmlen + 1);
Assert(xfrmlen2 == xfrmlen); Assert(xfrmlen2 <= xfrmlen);
pfree(val); pfree(val);
val = xfrmstr; val = xfrmstr;
} }