iconv + tests

Author: Girgias

ext/iconv/iconv.c

@@ -646,23 +646,38 @@ static php_iconv_err_t _php_iconv_substr(smart_str *pretval,
 	}
 
 	if (len < 0) {
-		if ((len += (total_len - offset)) < 0) {
-			return PHP_ICONV_ERR_SUCCESS;
+		len += (total_len - offset);
+		if (len < 0) {
+			/* Argument 2 is offsetn and argument 1 is source string */
+			php_error_docref(NULL, E_NOTICE, "Argument #2 ($%s) is not contained in argument #1 ($%s)",
+				get_active_function_arg_name(2), get_active_function_arg_name(1));
+			len = 0;
 		}
 	}
 
 	if (offset < 0) {
-		if ((offset += total_len) < 0) {
-			return PHP_ICONV_ERR_SUCCESS;
+		offset += total_len;
+		if (offset < 0) {
+			/* Argument 2 is offsetn and argument 1 is source string */
+			php_error_docref(NULL, E_NOTICE, "Argument #2 ($%s) is not contained in argument #1 ($%s)",
+				get_active_function_arg_name(2), get_active_function_arg_name(1));
+			offset = 0;
 		}
 	}
 
 	if((size_t)len > total_len) {
+		// TODO Emit notice/ValueError
 		len = total_len;
 	}
 
 
 	if ((size_t)offset > total_len) {
+		/* Argument 2 is offsetn and argument 1 is source string */
+		php_error_docref(NULL, E_NOTICE, "Argument #2 ($%s) is not contained in argument #1 ($%s)",
+			get_active_function_arg_name(2), get_active_function_arg_name(1));
+		/* Return an empty string */
+		smart_str_appendl(pretval, "", 0);
+		smart_str_0(pretval);
 		return PHP_ICONV_ERR_SUCCESS;
 	}
 

ext/iconv/tests/iconv_substr.phpt

@@ -43,12 +43,14 @@ var_dump(iconv("ISO-2022-JP", "EUC-JP", iconv_substr(iconv("EUC-JP", "ISO-2022-J
 --EXPECTF--
 666768696a6b6c
 666768696a6b6c
-a6a4a8a4aaa4ab
-a4aba4ada4afa4b1a4b3a4b5a4b7
+a4c2a4c2a4c2a6
+c2a6c2a4c2a8c2a4c2aac2a4c2ab
 
 Notice: substr(): Argument #2 ($start) is not contained in argument #1 ($str) in %s on line %d
 string(0) ""
-bool(false)
+
+Notice: iconv_substr(): Argument #2 ($offset) is not contained in argument #1 ($str) in %s on line %d
+string(0) ""
 string(14) "This is a test"
 string(14) "This is a test"
 string(3) "est"
@@ -58,7 +60,15 @@ string(3) "est"
 string(5) "This "
 string(5) "This "
 bool(false)
+
+Notice: iconv_substr(): Argument #2 ($offset) is not contained in argument #1 ($str) in %s on line %d
+string(0) ""
 bool(false)
-bool(false)
-bool(false)
-string(10) "¤Á¤Ï ISO-2"
+
+Notice: iconv_substr(): Argument #2 ($offset) is not contained in argument #1 ($str) in %s on line %d
+string(0) ""
+
+Notice: iconv(): Detected an illegal character in input string in %s on line %d
+
+Notice: iconv_substr(): Argument #2 ($offset) is not contained in argument #1 ($str) in %s on line %d
+string(0) ""

ext/standard/tests/file/bug38450.phpt

@@ -101,7 +101,7 @@ var_dump($myvar);
 
 echo "Done\n";
 ?>
---EXPECT--
+--EXPECTF--
 string(12) "constructor!"
 
 Notice: substr(): Argument #2 ($start) is not contained in argument #1 ($str) in %s on line %d