cvs: php-src(PHP_5_1) / NEWS /ext/iconv iconv.c
| From: | Antony Dovgal | Date: | Tue, 11 Oct 2005 13:50:54 +0000 |
| Subject: | cvs: php-src(PHP_5_1) / NEWS /ext/iconv iconv.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-34516@lists.php.net to get a copy of this message | ||
tony2001 Tue Oct 11 09:50:54 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/iconv iconv.c
/php-src NEWS
Log:
fix #34757 (iconv_substr() gives "Unknown error" when offset > string length)
http://cvs.php.net/diff.php/php-src/ext/iconv/iconv.c?r1=1.124&r2=1.124.2.1&ty=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.124 php-src/ext/iconv/iconv.c:1.124.2.1
--- php-src/ext/iconv/iconv.c:1.124 Wed Aug 3 10:07:15 2005
+++ php-src/ext/iconv/iconv.c Tue Oct 11 09:50:50 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.124 2005/08/03 14:07:15 sniper Exp $ */
+/* $Id: iconv.c,v 1.124.2.1 2005/10/11 13:50:50 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -583,26 +583,38 @@
size_t out_left;
unsigned int cnt;
-
+ unsigned int total_len;
+
+ err = _php_iconv_strlen(&total_len, str, nbytes, enc);
+ if (err != PHP_ICONV_ERR_SUCCESS) {
+ return err;
+ }
+
/* normalize the offset and the length */
- if (offset < 0 || len < 0) {
- unsigned int total_len;
- err = _php_iconv_strlen(&total_len, str, nbytes, enc);
- if (err != PHP_ICONV_ERR_SUCCESS) {
- return err;
- }
- if (offset < 0) {
- if ((offset += total_len) < 0) {
- offset = 0;
- }
+ if (offset < 0) {
+ if ((offset += total_len) < 0) {
+ offset = 0;
}
- if (len < 0) {
- if ((len += (total_len - offset)) < 0) {
- len = 0;
- }
+ }
+ if (len < 0) {
+ if ((len += (total_len - offset)) < 0) {
+ len = 0;
}
}
+ if (offset >= total_len) {
+ return PHP_ICONV_ERR_SUCCESS;
+ }
+
+ if ((offset + len) > total_len) {
+ /* trying to compute the length */
+ len = total_len - offset;
+ }
+
+ if (len == 0) {
+ return PHP_ICONV_ERR_SUCCESS;
+ }
+
cd1 = iconv_open(GENERIC_SUPERSET_NAME, enc);
if (cd1 == (iconv_t)(-1)) {
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.116&r2=1.2027.2.117&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.116 php-src/NEWS:1.2027.2.117
--- php-src/NEWS:1.2027.2.116 Tue Oct 11 06:15:38 2005
+++ php-src/NEWS Tue Oct 11 09:50:52 2005
@@ -62,6 +62,8 @@
- Fixed bug #34785 (subclassing of mysqli_stmt does not work). (Georg)
- Fixed bug #34777 (Crash in dblib when fetching non-existent error info). (Ilia)
- Fixed bug #34771 (strtotime() fails with 1-12am/pm). (Derick)
+- Fixed bug #34757 (iconv_substr() gives "Unknown error" when offset > string
+ length). (Tony)
- Fixed bug #34723 (array_count_values() strips leading zeroes). (Tony)
- Fixed bug #34704 (Infinite recursion due to corrupt JPEG). (Marcus)
- Fixed bug #34678 (__call(), is_callable() and static methods). (Dmitry)