summaryrefslogtreecommitdiff
path: root/Zend/zend_exceptions.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Fix exception leak in interactive consoleNikita Popov2015-05-151-1/+2
| | | | | | | | | | | | | | | Shows up there because it throws at E_WARNING severity level and as such leak detection is not suppressed.
* | | Minor Typo in Commenthakre2015-04-271-1/+1
| | |
* | | Merge branch 'PHP-5.6'Xinchen Hui2015-04-141-1/+1
|\ \ \ | |/ / | | | | | | | | | Conflicts: Zend/zend_exceptions.c
| * | codes standardXinchen Hui2015-04-141-1/+1
| | |
* | | Merge branch 'PHP-5.6'Stanislav Malyshev2015-04-141-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: (27 commits) fix non-standard C update NEWS 5.4.41 next fix CVE num update NEWS Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode) fix test fix type in fix for #69085 fix memory leak & add test Fix tests fix CVE num Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability) Fix test Additional fix for bug #69324 More fixes for bug #69152 Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar) Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) ... Conflicts: Zend/zend_exceptions.c ext/curl/interface.c ext/dom/document.c ext/fileinfo/libmagic/softmagic.c ext/gd/gd.c ext/hash/hash.c ext/pgsql/pgsql.c ext/phar/phar.c ext/phar/phar_internal.h ext/standard/http_fopen_wrapper.c ext/standard/link.c ext/standard/streamsfuncs.c ext/xmlwriter/php_xmlwriter.c ext/zlib/zlib.c
| * | Merge branch 'PHP-5.4.40' into PHP-5.5.24Stanislav Malyshev2015-04-111-0/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4.40: Additional fix for bug #69324 More fixes for bug #69152 Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar) Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) Fixed bug #68901 (use after free) Fixed bug #68740 (NULL Pointer Dereference) Fix bug #66550 (SQLite prepared statement use-after-free) Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467 Fix bug #68601 buffer read overflow in gd_gif_in.c Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4" Fixed bug #69293 Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
| | * More fixes for bug #69152Stanislav Malyshev2015-04-111-0/+3
| | |
| * | Bump yearXinchen Hui2015-01-151-1/+1
| | |
| * | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2014-05-111-1/+1
| |\ \ | | |/
| | * Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245)Bob Weinand2014-05-111-1/+1
| | | | | | | | | | | | Linux apparently does not like memcpy in overlapping regions...
* | | Convert fatal errors into EngineExceptionDmitry Stogov2015-04-021-6/+9
| | |
* | | Use zend_error_noreturn() for fatal errorsDmitry Stogov2015-04-011-6/+6
| | |
* | | Fixed error messagesDmitry Stogov2015-03-201-1/+1
| | |
* | | Refactor error messages to only append defined in the event of rendering as ↵Anthony Ferrara2015-03-181-1/+6
| | | | | | | | | | | | a fatal error. Fix relative typehints to not work
* | | Refactor error implementation significantly to centralize error mode ↵Anthony Ferrara2015-03-181-1/+12
| | | | | | | | | | | | behavior. Add zend_internal_type_error() function
* | | Implement engine exceptionsDmitry Stogov2015-03-091-43/+128
| | | | | | | | | | | | | | | | | | | | | RFC: https://wiki.php.net/rfc/engine_exceptions_for_php7 Pending changes regarding naming of BaseException and whether it should be an interface.
* | | zend_read_property() has to provide a holder for return value.Dmitry Stogov2015-01-221-8/+22
| | | | | | | | | | | | Previously it was possible that zend_read_property() returned pointer to zval allocated on stack.
* | | bump yearXinchen Hui2015-01-151-1/+1
| | |
* | | trailing whitespace removalStanislav Malyshev2015-01-101-7/+7
| | |
* | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-75/+75
| | |
* | | Fixed compilation warningsDmitry Stogov2014-12-121-3/+3
| | |
* | | fixed compilation errorDmitry Stogov2014-10-201-1/+1
| | |
* | | Update get_class_name semanticsNikita Popov2014-10-091-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * get_class_name is now only used for displaying the class name in debugging functions like var_dump, print_r, etc. It is no longer used in get_class() etc. * As it is no longer used in get_parent_class() the parent argument is now gone. This also fixes incorrect parent classes being reported in COM. * get_class_name is now always required (previously some places made it optional and some required it) and is also required to return a non-NULL value. * Remove zend_get_object_classname. This also fixes a number of potential leaks due to incorrect usage of this function.
* | | Drop convert_to usage in zend_exceptionsNikita Popov2014-10-061-57/+48
| | | | | | | | | | | | | | | | | | | | | | | | To make everything work correctly with refs. I'm unsure whether the GET_PROPERTY_SILENT distinction is really necessary, because the choice seemed pretty random, but kept it around.
* | | Expose zend_throw_exception_internal()Dmitry Stogov2014-10-011-1/+1
| | |
* | | Add smart_str_append for appending zend_stringsNikita Popov2014-09-211-7/+4
| | | | | | | | | | | | Also replaces usages in Zend/ and ext/standard
* | | Use smart_str for exception stack tracesNikita Popov2014-09-211-166/+113
| | |
* | | fix length data typesAnatol Belski2014-09-191-4/+4
| | |
* | | fix formatAnatol Belski2014-08-281-1/+1
| | |
* | | first show to make 's' work with size_tAnatol Belski2014-08-271-1/+2
| | |
* | | several signature and data type fixesAnatol Belski2014-08-261-4/+4
| | |
* | | Fix compiler warningsNikita Popov2014-08-251-2/+2
| | |
* | | master renames phase 7PRE_AST_MERGEAnatol Belski2014-08-251-2/+2
| | |
* | | master renames phase 3Anatol Belski2014-08-251-2/+2
| | |
* | | master renames phase 1Anatol Belski2014-08-251-40/+40
| | |
* | | fixes to %pd format usageAnatol Belski2014-08-241-3/+3
| | |
* | | Merge remote-tracking branch 'php/master'Anatol Belski2014-08-211-7/+7
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: Zend/zend_exceptions.c
| * | | Separate values before conversionDmitry Stogov2014-08-211-7/+7
| | | |
* | | | further fixes on coreAnatol Belski2014-08-161-4/+4
| | | |
* | | | first shot on merging the core fro the int64 branchAnatol Belski2014-08-161-32/+32
|/ / /
* | | Fixed dtrace supportDmitry Stogov2014-07-221-4/+3
| | |
* | | Simplify call-frame handlingDmitry Stogov2014-07-071-1/+2
| | |
* | | Fixed refcounting bugDmitry Stogov2014-06-231-6/+1
| | |
* | | cleanupDmitry Stogov2014-06-031-1/+5
| | |
* | | Use new zend_hash APIDmitry Stogov2014-05-281-21/+21
| | |
* | | Fixed apply_func_args_tXinchen Hui2014-05-251-2/+2
| | |
* | | Added vstrpprintf strpprintf to avoid duplicate stringXinchen Hui2014-05-101-17/+26
| | | | | | | | | | | | (the function name maybe improvement)
* | | Split IS_BOOL into IS_FALSE and IS_TRUEDmitry Stogov2014-04-301-6/+5
| | |
* | | Merge mainstream 'master' branch into refactoringDmitry Stogov2014-04-261-3/+59
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During merge I had to revert: Nikita's patch for php_splice() (it probably needs to be applyed again) Bob Weinand's patches related to constant expression handling (we need to review them carefully) I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway) Conflicts: Zend/zend.h Zend/zend_API.c Zend/zend_ast.c Zend/zend_compile.c Zend/zend_compile.h Zend/zend_constants.c Zend/zend_exceptions.c Zend/zend_execute.c Zend/zend_execute.h Zend/zend_execute_API.c Zend/zend_hash.c Zend/zend_highlight.c Zend/zend_language_parser.y Zend/zend_language_scanner.c Zend/zend_language_scanner_defs.h Zend/zend_variables.c Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/date/php_date.c ext/dom/documenttype.c ext/hash/hash.c ext/iconv/iconv.c ext/mbstring/tests/zend_multibyte-10.phpt ext/mbstring/tests/zend_multibyte-11.phpt ext/mbstring/tests/zend_multibyte-12.phpt ext/mysql/php_mysql.c ext/mysqli/mysqli.c ext/mysqlnd/mysqlnd_reverse_api.c ext/mysqlnd/php_mysqlnd.c ext/opcache/ZendAccelerator.c ext/opcache/zend_accelerator_util_funcs.c ext/opcache/zend_persist.c ext/opcache/zend_persist_calc.c ext/pcre/php_pcre.c ext/pdo/pdo_dbh.c ext/pdo/pdo_stmt.c ext/pdo_pgsql/pgsql_driver.c ext/pgsql/pgsql.c ext/reflection/php_reflection.c ext/session/session.c ext/spl/spl_array.c ext/spl/spl_observer.c ext/standard/array.c ext/standard/basic_functions.c ext/standard/html.c ext/standard/mail.c ext/standard/php_array.h ext/standard/proc_open.c ext/standard/streamsfuncs.c ext/standard/user_filters.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re main/php_variables.c sapi/phpdbg/phpdbg.c sapi/phpdbg/phpdbg_bp.c sapi/phpdbg/phpdbg_frame.c sapi/phpdbg/phpdbg_help.c sapi/phpdbg/phpdbg_list.c sapi/phpdbg/phpdbg_print.c sapi/phpdbg/phpdbg_prompt.c
| * | | Fix Linux specific fail in error tracesBob Weinand2014-04-071-1/+1
| |/ / | | | | | | | | | Linux apparently does not like memcpy in overlapping regions...