diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-26 15:32:18 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-05 14:25:07 +0200 |
| commit | a31f46421d7bf6f55dd9ac5876b8e2eacf7e0708 (patch) | |
| tree | 24ffd7c5ae5e321c3994048fdd0fd9f68ae7457c /ext/standard/pack.c | |
| parent | 528aa7932a839fc6319979c34aa372805d8dc41c (diff) | |
| download | php-git-a31f46421d7bf6f55dd9ac5876b8e2eacf7e0708.tar.gz | |
Allow exceptions in __toString()
RFC: https://wiki.php.net/rfc/tostring_exceptions
And convert some object to string conversion related recoverable
fatal errors into Error exceptions.
Improve exception safety of internal code performing string
conversions.
Diffstat (limited to 'ext/standard/pack.c')
| -rw-r--r-- | ext/standard/pack.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/standard/pack.c b/ext/standard/pack.c index 5f375585d4..3c0dc009f1 100644 --- a/ext/standard/pack.c +++ b/ext/standard/pack.c @@ -297,7 +297,12 @@ PHP_FUNCTION(pack) } if (arg < 0) { - convert_to_string(&argv[currentarg]); + if (!try_convert_to_string(&argv[currentarg])) { + efree(formatcodes); + efree(formatargs); + return; + } + arg = Z_STRLEN(argv[currentarg]); if (code == 'Z') { /* add one because Z is always NUL-terminated: |