summaryrefslogtreecommitdiff
path: root/ext/ereg
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2008-04-09 13:51:09 +0000
committerFelipe Pena <felipe@php.net>2008-04-09 13:51:09 +0000
commite3040a0815b1d42e21a730a8b7cb4e3d0c5470ee (patch)
tree4e8c55b36d3fe2c37a8414eaee3fbd1d8304daf3 /ext/ereg
parent9412a490069d6445f8af5b3ad08400b41440e2c2 (diff)
downloadphp-git-e3040a0815b1d42e21a730a8b7cb4e3d0c5470ee.tar.gz
MFB: Fixed bug #44678 (spliti error message includes wrong function name)
Diffstat (limited to 'ext/ereg')
-rw-r--r--ext/ereg/ereg.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/ext/ereg/ereg.c b/ext/ereg/ereg.c
index 7185d66d08..d3d49ec08b 100644
--- a/ext/ereg/ereg.c
+++ b/ext/ereg/ereg.c
@@ -644,7 +644,13 @@ static void php_split(INTERNAL_FUNCTION_PARAMETERS, int icase)
} else if (subs[0].rm_so == 0 && subs[0].rm_eo == 0) {
/* No more matches */
regfree(&re);
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Regular Expression to split()");
+
+ if (icase) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Regular Expression to spliti()");
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Regular Expression to split()");
+ }
+
zend_hash_destroy(Z_ARRVAL_P(return_value));
efree(Z_ARRVAL_P(return_value));
RETURN_FALSE;