summaryrefslogtreecommitdiff
path: root/Zend/zend_API.c
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2008-03-26 09:09:08 +0000
committerAntony Dovgal <tony2001@php.net>2008-03-26 09:09:08 +0000
commitf2ca4aaf6a192287a759cbd905da3bdccb1f0b71 (patch)
tree8420126934e6f3bb0065b02aaf96b41f3f461c00 /Zend/zend_API.c
parent0084937b1033e4bd0763af55f89c01934d39ad0b (diff)
downloadphp-git-f2ca4aaf6a192287a759cbd905da3bdccb1f0b71.tar.gz
allow NULL argument to be passed where binary string expected
Diffstat (limited to 'Zend/zend_API.c')
-rw-r--r--Zend/zend_API.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index d20439f70a..c386b66513 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -476,7 +476,7 @@ static char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, char **sp
*p = Z_STRVAL_PP(arg);
*pl = Z_STRLEN_PP(arg);
break;
- } else if (c == 'S') {
+ } else if (c == 'S' && Z_TYPE_PP(arg) != IS_NULL /* NULL is ok */) {
return "strictly a binary string";
}
/* fall through */