Inline check for full buffer in appendStringInfoChar.

tglsfdc · tglsfdc · commit ee2ad1cf2e7e · 1999-11-01T05:10:32.000Z
diff --git a/src/backend/lib/stringinfo.c b/src/backend/lib/stringinfo.c
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	  $Id: stringinfo.c,v 1.22 1999/09/08 16:31:38 tgl Exp $
+ *	  $Id: stringinfo.c,v 1.23 1999/11/01 05:10:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -146,10 +146,9 @@ appendStringInfo(StringInfo str, const char *fmt,...)
 void
 appendStringInfoChar(StringInfo str, char ch)
 {
-	Assert(str != NULL);
-
 	/* Make more room if needed */
-	enlargeStringInfo(str, 1);
+	if (str->len + 1 >= str->maxlen)
+		enlargeStringInfo(str, 1);
 
 	/* OK, append the character */
 	str->data[str->len] = ch;

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`* Copyright (c) 1994, Regents of the University of California`
`10`	`10`	`*`
`11`		`- * $Id: stringinfo.c,v 1.22 1999/09/08 16:31:38 tgl Exp $`
	`11`	`+ * $Id: stringinfo.c,v 1.23 1999/11/01 05:10:32 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -146,10 +146,9 @@ appendStringInfo(StringInfo str, const char *fmt,...)`
`146`	`146`	`void`
`147`	`147`	`appendStringInfoChar(StringInfo str, char ch)`
`148`	`148`	`{`
`149`		`- Assert(str != NULL);`
`150`		`-`
`151`	`149`	`/* Make more room if needed */`
`152`		`- enlargeStringInfo(str, 1);`
	`150`	`+ if (str->len + 1 >= str->maxlen)`
	`151`	`+ enlargeStringInfo(str, 1);`
`153`	`152`
`154`	`153`	`/* OK, append the character */`
`155`	`154`	`str->data[str->len] = ch;`