From: Stanislav Malyshev <stas@php.net>
Date: Sun, 19 Dec 2010 05:07:31 +0000 (+0000)
Subject: Fix bad args to grapheme_extract(), reported by Maksymilian Arciemowicz
X-Git-Tag: php-5.3.6RC1~200
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25c584116053c9d10343f06d0c3d13565f5c6e94;p=php

Fix bad args to grapheme_extract(), reported by Maksymilian Arciemowicz
---

diff --git a/ext/intl/grapheme/grapheme_string.c b/ext/intl/grapheme/grapheme_string.c
index ba883f34a8..6ad8769619 100755
--- a/ext/intl/grapheme/grapheme_string.c
+++ b/ext/intl/grapheme/grapheme_string.c
@@ -799,7 +799,7 @@ PHP_FUNCTION(grapheme_extract)
 
 	if ( NULL != next ) {
 		if ( !PZVAL_IS_REF(next) ) {
-			intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
+			intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, 
 				 "grapheme_extract: 'next' was not passed by reference", 0 TSRMLS_CC );
 			 
 			RETURN_FALSE;
@@ -819,11 +819,17 @@ PHP_FUNCTION(grapheme_extract)
 	}
 
 	if ( lstart > INT32_MAX || lstart < 0 || lstart >= str_len ) {
+		intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_extract: start not contained in string", 0 TSRMLS_CC );
+		RETURN_FALSE;
+	}
 
-		intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_extract: start not contained in string", 1 TSRMLS_CC );
-
+	if ( size > INT32_MAX || size < 0) {
+		intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_extract: size is invalid", 0 TSRMLS_CC );
 		RETURN_FALSE;
 	}
+	if (size == 0) {
+		RETURN_EMPTY_STRING();
+	}
 
 	/* we checked that it will fit: */
 	start = (int32_t) lstart;