From: Nikita Popov <nikic@php.net>
Date: Thu, 16 Jul 2015 21:17:29 +0000 (+0200)
Subject: Make s(tr)pprintf infallible
X-Git-Tag: php-7.0.0beta2~6^2~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75dc4486b2b95989f62717da4feca8ebe4bbb528;p=php

Make s(tr)pprintf infallible

spprintf now always creates a buffer and strpprintf always returns
a zend_string. Previously, if the result of the format happened to
be empty, the spprintf buffer would be set to NULL and strpprintf
would return NULL.
---

diff --git a/main/spprintf.c b/main/spprintf.c
index 759372b370..4594fb7605 100644
--- a/main/spprintf.c
+++ b/main/spprintf.c
@@ -838,7 +838,6 @@ skip_output:
 PHPAPI size_t vspprintf(char **pbuf, size_t max_len, const char *format, va_list ap) /* {{{ */
 {
 	smart_string buf = {0};
-	size_t result;
 
 	/* since there are places where (v)spprintf called without checking for null,
 	   a bit of defensive coding here */
@@ -855,13 +854,11 @@ PHPAPI size_t vspprintf(char **pbuf, size_t max_len, const char *format, va_list
 
 	if (buf.c) {
 		*pbuf = buf.c;
-		result = buf.len;
+		return buf.len;
 	} else {
-		*pbuf = NULL;
-		result = 0;
+		*pbuf = estrndup("", 0);
+		return 0;
 	}
-
-	return result;
 }
 /* }}} */
 
@@ -883,11 +880,15 @@ PHPAPI zend_string *vstrpprintf(size_t max_len, const char *format, va_list ap)
 
 	xbuf_format_converter(&buf, 0, format, ap);
 
-	if (max_len && buf.s && ZSTR_LEN(buf.s) > max_len) {
+	if (!buf.s) {
+		return ZSTR_EMPTY_ALLOC();
+	}
+
+	if (max_len && ZSTR_LEN(buf.s) > max_len) {
 		ZSTR_LEN(buf.s) = max_len;
 	}
-	smart_str_0(&buf);
 
+	smart_str_0(&buf);
 	return buf.s;
 }
 /* }}} */