From: Rui Hirokawa <hirokawa@php.net>
Date: Sun, 17 Feb 2008 01:59:03 +0000 (+0000)
Subject: MF PHP5_3 (fixed #43840)
X-Git-Tag: php-5.2.6RC1~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd98b8a3e0e122fad9039db3e8452724c6123a8a;p=php

MF PHP5_3 (fixed #43840)
---

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 4c0293c1dd..7550fa691d 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -1613,7 +1613,7 @@ PHP_FUNCTION(mb_strpos)
 		}
 	}
 
-	if (offset < 0 || (unsigned long)offset > haystack.len) {
+	if (offset < 0 || (unsigned long)offset > (unsigned long)mbfl_strlen(&haystack)) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in string.");
 		RETURN_FALSE;
 	}