diff options
| author | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-09-10 13:28:18 +0200 |
|---|---|---|
| committer | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-09-15 14:26:16 +0200 |
| commit | c37a1cd650a5399c4a89543759deedcc7280becd (patch) | |
| tree | 3a36dcdb3a20042ce3f37b3b534cbc5fbec7d1d4 /ext/mbstring/mbstring.c | |
| parent | 62c20c662a961f030178a15311bfe37591c10316 (diff) | |
| download | php-git-c37a1cd650a5399c4a89543759deedcc7280becd.tar.gz | |
Promote a few remaining errors in ext/standard
Closes GH-6110
Diffstat (limited to 'ext/mbstring/mbstring.c')
| -rw-r--r-- | ext/mbstring/mbstring.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 58797eb244..274feec35e 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -2233,8 +2233,7 @@ PHP_FUNCTION(mb_strcut) } if (from > string.len) { - // TODO Out of bounds ValueError - RETURN_FALSE; + RETURN_EMPTY_STRING(); } ret = mbfl_strcut(&string, &result, from, len); @@ -3500,6 +3499,9 @@ PHP_FUNCTION(mb_send_mail) str_headers = php_trim(str_headers, NULL, 0, 2); } else if (headers_ht) { str_headers = php_mail_build_headers(headers_ht); + if (EG(exception)) { + RETURN_THROWS(); + } } zend_hash_init(&ht_headers, 0, NULL, ZVAL_PTR_DTOR, 0); |