moriyoshi Fri Jan 3 15:01:14 2003 EDT
Modified files:
/php4/ext/iconv iconv.c
Log:
Fixed an iconv_strrpos() bug that the function doesn't return accurate
position of last occurrence
Index: php4/ext/iconv/iconv.c
diff -u php4/ext/iconv/iconv.c:1.75 php4/ext/iconv/iconv.c:1.76
--- php4/ext/iconv/iconv.c:1.75 Fri Jan 3 09:29:49 2003
+++ php4/ext/iconv/iconv.c Fri Jan 3 15:01:13 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.75 2003/01/03 14:29:49 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.76 2003/01/03 20:01:13 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -910,6 +910,9 @@
ndl_buf_left -= GENERIC_SUPERSET_NBYTES;
if (ndl_buf_left == 0) {
*pretval = match_ofs;
+ ndl_buf_p = ndl_buf;
+ ndl_buf_left = ndl_buf_len;
+ match_ofs = -1;
}
} else {
unsigned int i, j, lim;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
