postgres.git / summary / log / commit / refs

commit    004d2be5d939693da2bf650e5abe4a0293d121d1
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Thu Jul 17 22:20:22 2003 +0000
First released in: 7.4, 7.3.4

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


 src/backend/utils/adt/selfuncs.c | 9 +++++++--
 1 file 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;
 	}


[parent: df32af15b668]