diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-11-24 14:06:19 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-11-24 14:06:53 +0100 |
| commit | e589609b4c08209fb414ffd189dfd2b49cc145ca (patch) | |
| tree | 09ffcf21b1abcda41caaed365bfa2a3679539af4 /ext/fileinfo/libmagic | |
| parent | 337031abbde89758724f3d7583f2ea607b9491e3 (diff) | |
| parent | 39f95f56144d595b9af7828726c3e28c313fb2b7 (diff) | |
| download | php-git-e589609b4c08209fb414ffd189dfd2b49cc145ca.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #77961: finfo_open crafted magic parsing SIGABRT
Diffstat (limited to 'ext/fileinfo/libmagic')
| -rw-r--r-- | ext/fileinfo/libmagic/file.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/fileinfo/libmagic/file.h b/ext/fileinfo/libmagic/file.h index ea19faf7d4..b4d083f3c9 100644 --- a/ext/fileinfo/libmagic/file.h +++ b/ext/fileinfo/libmagic/file.h @@ -86,6 +86,8 @@ #include <sys/stat.h> #include <stdarg.h> +#define abort() zend_error_noreturn(E_ERROR, "fatal libmagic error") + #define ENABLE_CONDITIONALS #ifndef MAGIC |