MFH

diff --git a/main/rfc1867.c b/main/rfc1867.c
index 4ce2b071470e4b4dc40ccdcdac3106932fb31074..f422b7e66cff8bc0e7674a4ff5cb7258e53c76cf 100644 (file)
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -513,7 +513,7 @@ static char *substring_conf(char *start, int len, char quote TSRMLS_DC)
 #if HAVE_MBSTRING && !defined(COMPILE_DL_MBSTRING)
                        if (php_mb_encoding_translation(TSRMLS_C)) {
                                size_t j = php_mb_mbchar_bytes(start+i TSRMLS_CC);
-                               while (j-- > 0) {
+                               while (j-- > 0 && i < len) {
                                        *resp++ = start[i++];
                                }
                                --i;