summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2015-01-20 11:46:10 -0800
committerStanislav Malyshev <stas@php.net>2015-01-20 11:46:10 -0800
commitef4896d95659af261369bfa2e3c3f2c0317a83e8 (patch)
treedd2c58e17457daa262c65fba52343d698f50b453
parent8825311ce1e9b0c3b627ff32808dd4e0d577c136 (diff)
downloadphp-git-ef4896d95659af261369bfa2e3c3f2c0317a83e8.tar.gz
add protection against nulls
-rw-r--r--main/spprintf.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/main/spprintf.c b/main/spprintf.c
index 5b16d51441..01d80b7548 100644
--- a/main/spprintf.c
+++ b/main/spprintf.c
@@ -796,6 +796,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) {