summaryrefslogtreecommitdiff
path: root/ext/mbstring/mbstring.c
diff options
context:
space:
mode:
authorSVN Migration <svn@php.net>2003-08-24 19:44:48 +0000
committerSVN Migration <svn@php.net>2003-08-24 19:44:48 +0000
commit8b1e9acd2eef54c5c156387f52792efdbfec7677 (patch)
tree739290025c70f7a7f9cbc01fdd248f84f273ae38 /ext/mbstring/mbstring.c
parentd702e37902570890ff686573c23800209abe5f73 (diff)
downloadphp-git-php-4.3.3.tar.gz
This commit was manufactured by cvs2svn to create tag 'php_4_3_3'.php-4.3.3
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 */