From fd4d8d545040d88f505293a48317c36c5646f0dd Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Sun, 23 Jun 2002 22:02:35 +0000 Subject: [PATCH] -allways terminate buffer -allow pbuf parameter to be NULL for buffer size calculation --- main/spprintf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/main/spprintf.c b/main/spprintf.c index 1bda78d1c6..fcef72b564 100644 --- a/main/spprintf.c +++ b/main/spprintf.c @@ -627,7 +627,10 @@ PHPAPI int vspprintf(char **pbuf, size_t max_len, const char *format, va_list ap cc = xbuf_format_converter(&xbuf, format, ap); if (xbuf.nextb <= xbuf.buf_end) *(xbuf.nextb) = '\0'; - *pbuf = xbuf.buf; + else if (xbuf.size) + xbuf.buf[xbuf.size-1] = '\0'; + if (pbuf) + *pbuf = xbuf.buf; return cc; } } -- 2.50.1