com php-src: add protection against nulls: main/spprintf.c
| From: | Ferenc Kovacs | Date: | Wed, 21 Jan 2015 00:34:30 +0000 |
| Subject: | com php-src: add protection against nulls: main/spprintf.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84242@lists.php.net to get a copy of this message | ||
Commit: 896b34177e11556d85fc7986d7b741b7cc9462ca
Author: Stanislav Malyshev <stas@php.net> Tue, 20 Jan 2015 11:46:10 -0800
Committer: Ferenc Kovacs <tyrael@php.net> Wed, 21 Jan 2015 01:34:30 +0100
Parents: 81b4ce3ea35eace41a578643c52fb6569d7b94e5
Branches: PHP-5.6.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=896b34177e11556d85fc7986d7b741b7cc9462ca
Log:
add protection against nulls
Changed paths:
M main/spprintf.c
Diff:
diff --git a/main/spprintf.c b/main/spprintf.c
index ff8e964..5956523 100644
--- 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) {