Commit b1134e36 authored by Tom Lane's avatar Tom Lane

Cope with versions of vsnprintf() written by people who

don't read man pages...
parent bee7cd2a
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: stringinfo.c,v 1.21 1999/08/31 01:28:25 tgl Exp $ * $Id: stringinfo.c,v 1.22 1999/09/08 16:31:38 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -121,7 +121,12 @@ appendStringInfo(StringInfo str, const char *fmt,...) ...@@ -121,7 +121,12 @@ appendStringInfo(StringInfo str, const char *fmt,...)
nprinted = vsnprintf(str->data + str->len, avail, nprinted = vsnprintf(str->data + str->len, avail,
fmt, args); fmt, args);
va_end(args); va_end(args);
if (nprinted < avail-1) /*
* Note: some versions of vsnprintf return the number of chars
* actually stored, but at least one returns -1 on failure.
* Be conservative about believing whether the print worked.
*/
if (nprinted >= 0 && nprinted < avail-1)
{ {
/* Success. Note nprinted does not include trailing null. */ /* Success. Note nprinted does not include trailing null. */
str->len += nprinted; str->len += nprinted;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment