moriyoshi Fri Jan 3 09:29:49 2003 EDT
Modified files:
/php4/ext/iconv iconv.c
Log:
Added offset validity check for iconv_strpos()
Index: php4/ext/iconv/iconv.c
diff -u php4/ext/iconv/iconv.c:1.74 php4/ext/iconv/iconv.c:1.75
--- php4/ext/iconv/iconv.c:1.74 Fri Jan 3 00:38:50 2003
+++ php4/ext/iconv/iconv.c Fri Jan 3 09:29:49 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.74 2003/01/03 05:38:50 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.75 2003/01/03 14:29:49 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1590,6 +1590,11 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|ls",
&haystk, &haystk_len, &ndl, &ndl_len,
&offset, &charset, &charset_len) == FAILURE) {
+ RETURN_FALSE;
+ }
+
+ if (offset < 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in
+string.");
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
