Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4: add protection against nulls
12 years ago · a3cb69d63e
1 changed files with 5 additions and 0 deletions
--- a/main/spprintf.c
+++ b/main/spprintf.c
@ -813,6 +813,11 @@ PHPAPI int vspprintf(char **pbuf, size_t max_len, const char *format, va_list ap
 {
 	smart_str xbuf = {0};

+	/* since there are places where (v)spprintf called without checking for null,
+	   a bit of defensive coding here */
+	if(!pbuf) {
+		return 0;
+	}
 	xbuf_format_converter(&xbuf, format, ap);

 	if (max_len && xbuf.len > max_len) {