From 8b1e9acd2eef54c5c156387f52792efdbfec7677 Mon Sep 17 00:00:00 2001
From: SVN Migration <svn@php.net>
Date: Sun, 24 Aug 2003 19:44:48 +0000
Subject: This commit was manufactured by cvs2svn to create tag 'php_4_3_3'.

---
 ext/mbstring/mbstring.c          |  2 +-
 ext/mbstring/tests/bug25140.phpt | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 ext/mbstring/tests/bug25140.phpt

(limited to 'ext/mbstring')

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 */
diff --git a/ext/mbstring/tests/bug25140.phpt b/ext/mbstring/tests/bug25140.phpt
deleted file mode 100644
index 0b209120f5..0000000000
--- a/ext/mbstring/tests/bug25140.phpt
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-Bug #25140 (mb_convert_encoding returns FALSE on an empty string)
---SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---FILE--
-<?php
-var_dump( mb_convert_encoding( '', 'SJIS', 'EUC-JP' ) );
-?>
---EXPECT--
-string(0) ""
-- 
cgit v1.2.1