summaryrefslogtreecommitdiff
path: root/ext/mbstring/mbstring.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/mbstring/mbstring.c')
-rw-r--r--ext/mbstring/mbstring.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 7e53e7e350..b0939cebc1 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -2485,7 +2485,7 @@ MBSTRING_API char * php_mb_convert_encoding(char *input, size_t length, char *_t
if (output_len) {
*output_len = 0;
}
- if (!input) {
+ if ( !input || !length) {
return NULL;
}
/* new encoding */