Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.6' into PHP-7.0 | Christoph M. Becker | 2016-06-27 | 2 | -0/+61 |
|\ | |||||
| * | Fix #70628: Clearing bindings on an SQLite3 statement doesn't work | Christoph M. Becker | 2016-06-27 | 2 | -0/+61 |
| | | | | | | | | | | Obiously, it isn't sufficient to call sqlite3_clear_bindings() alone, but also the bound_params of the php_sqlite3_stmt have to be cleared. | ||||
* | | Fixed bug #68849 bindValue is not using the right data type | Anatol Belski | 2016-04-12 | 2 | -0/+101 |
| | | |||||
* | | Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE | Nikita Popov | 2016-03-03 | 2 | -2/+2 |
| | | | | | | | | Also re bug #71575. | ||||
* | | Merge branch 'PHP-5.6' into PHP-7.0 | Nikita Popov | 2016-02-13 | 1 | -1/+2 |
|\ \ | |/ | | | | | | | Conflicts: ext/sqlite3/sqlite3.c | ||||
| * | Check length of string before comparing to :memory: | Nikita Popov | 2016-02-13 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'PHP-5.6' into PHP-7.0 | Lior Kaplan | 2016-01-01 | 3 | -3/+3 |
|\ \ | |/ | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016) | ||||
| * | Happy new year (Update copyright to 2016) | Lior Kaplan | 2016-01-01 | 3 | -3/+3 |
| | | |||||
* | | Fixed Bug #71049 (SQLite3Stmt::execute() releases bound parameter instead ↵ | Xinchen Hui | 2015-12-07 | 2 | -2/+22 |
| | | | | | | | | of internal buffer) | ||||
* | | fix crash in sqlite when executing with bound stream param | Anatol Belski | 2015-11-05 | 2 | -4/+44 |
| | | | | | | | | rel #70862 | ||||
* | | Fixed Conditional jump or move depends on uninitialised value | Xinchen Hui | 2015-10-14 | 1 | -0/+2 |
| | | |||||
* | | Fix a memory leak in sqlite3_do_callback. | Adam Harvey | 2015-09-24 | 1 | -1/+5 |
| | | | | | | | | | | | | | | This was very, very obvious when using a debug build of PHP to build the manual! Fixes bug #70571 (Memory leak in sqlite3_do_callback). | ||||
* | | Useless ZVAL_UNDEF | Xinchen Hui | 2015-09-09 | 1 | -2/+1 |
| | | |||||
* | | SQLite3::open/__construct has 2 optional args | Rasmus Lerdorf | 2015-07-07 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PHP-5.6' | Xinchen Hui | 2015-07-07 | 2 | -2/+38 |
|\ \ | |/ | | | | | | | Conflicts: ext/sqlite3/sqlite3.c | ||||
| * | Fixed bug #69972 (Use-after-free vulnerability in sqlite3SafetyCheckSickOrOk()) | Xinchen Hui | 2015-07-07 | 2 | -2/+38 |
| | | |||||
* | | Switch position of ce in exception ce variable names | Aaron Piotrowski | 2015-07-03 | 1 | -8/+8 |
| | | |||||
* | | Change zend_exception_get_default() to zend_exception_ce | Aaron Piotrowski | 2015-07-03 | 1 | -8/+8 |
| | | |||||
* | | Use ZSTR_ API to access zend_string elements (this is just renaming without ↵ | Dmitry Stogov | 2015-06-30 | 1 | -24/+24 |
| | | | | | | | | semantick changes). | ||||
* | | Fixed bug #69897 (segfault when manually constructing SQLite3Result) | Kalle Sommer Nielsen | 2015-06-22 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into throwable-interface | Aaron Piotrowski | 2015-06-14 | 2 | -2207/+4818 |
|\ \ | | | | | | | | | | | | | | | | | | | # Conflicts: # Zend/zend_language_scanner.c # Zend/zend_language_scanner.l # ext/simplexml/tests/SimpleXMLElement_xpath.phpt | ||||
| * \ | Merge branch 'PHP-5.6' | Lior Kaplan | 2015-06-08 | 2 | -2207/+4818 |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.6: Upgrade bundled sqlite to 3.8.10.2 | ||||
| | * | Merge branch 'PHP-5.5' into PHP-5.6 | Lior Kaplan | 2015-06-08 | 2 | -2207/+4818 |
| | |\ | | | | | | | | | | | | | | | | | * PHP-5.5: Upgrade bundled sqlite to 3.8.10.2 | ||||
| | | * | Upgrade bundled sqlite to 3.8.10.2 | Lior Kaplan | 2015-06-08 | 2 | -2207/+4818 |
| | | | | | | | | | | | | | | | | Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416 done in 3.8.9 | ||||
* | | | | Merge branch 'master' into throwable-interface | Aaron Piotrowski | 2015-05-17 | 3 | -3/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Tweak uncaught exception message display | Nikita Popov | 2015-05-17 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements a reduced variant of #1226 with just the following change: -Fatal error: Uncaught exception 'EngineException' with message 'Call to private method foo::bar() from context ''' in %s:%d +Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d The '' wrapper around messages is very weird if the exception message itself contains ''. Futhermore having the message wrapped in '' doesn't work for the "and defined" suffix of TypeExceptions. | ||||
* | | | | Merge branch 'master' into throwable-interface | Aaron Piotrowski | 2015-05-17 | 1 | -6/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | fix typos | olshevskiy87 | 2015-05-13 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | Signed-off-by: olshevskiy87 <olshevskiy87@bk.ru> | ||||
* | | | | Updated tests to reflect exception class changes. | Aaron Piotrowski | 2015-05-16 | 1 | -1/+1 |
|/ / / | |||||
* | | | Fixed access to uninitialized value (in case of exception) | Dmitry Stogov | 2015-04-08 | 1 | -1/+1 |
| | | | |||||
* | | | Always throw TypeException on throwing zpp failures | Nikita Popov | 2015-04-06 | 2 | -11/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces a ZEND_PARSE_PARAMS_THROW flag for zpp, which forces to report FAILURE errors using a TypeException instead of a Warning, like it would happen in strict mode. Adds a zend_parse_parameters_throw() convenience function, which invokes zpp with this flag. Converts all cases I could identify, where we currently have throwing zpp usage in constructors and replaces them with this API. Error handling is still replaced to EH_THROW in some cases to handle other, domain-specific errors in constructors. | ||||
* | | | Merge branch 'PHP-5.6' | Stanislav Malyshev | 2015-04-05 | 2 | -1/+32 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | * PHP-5.6: Fix bug #66550 (SQLite prepared statement use-after-free) Conflicts: ext/sqlite3/sqlite3.c | ||||
| * | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-04-05 | 2 | -0/+39 |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.5: Fix bug #66550 (SQLite prepared statement use-after-free) | ||||
| | * | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2015-04-05 | 2 | -0/+39 |
| | |\ | | | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #66550 (SQLite prepared statement use-after-free) | ||||
| | | * | Fix bug #66550 (SQLite prepared statement use-after-free) | Stanislav Malyshev | 2015-04-05 | 2 | -0/+39 |
| | | | | |||||
| | | * | Bump year | Xinchen Hui | 2014-01-03 | 3 | -3/+3 |
| | | | | |||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2015-03-25 | 3 | -1889/+3744 |
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | * PHP-5.5: Fixed bug #69287 upgrade bundled sqlite to 3.8.8.3 fix dir separator in test | ||||
| | * | | Fixed bug #69287 upgrade bundled sqlite to 3.8.8.3 | Anatol Belski | 2015-03-25 | 2 | -1888/+3743 |
| | | | | |||||
| | * | | fix dir separator in test | Anatol Belski | 2015-03-25 | 1 | -1/+1 |
| | | | | |||||
* | | | | updated bundled libsqlite to 3.8.8.3 | Anatol Belski | 2015-03-25 | 3 | -6766/+8621 |
| | | | | |||||
* | | | | Merge branch 'pull-request/1091' | Stanislav Malyshev | 2015-03-22 | 2 | -8/+12 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * pull-request/1091: Stop trying to call the callback after it has thrown an exception. Also, as an exception has been thrown, there is no need to have a separate error message. Fix freeing null segfault. Added test for behaviour. Conflicts: ext/sqlite3/tests/bug68760.phpt | ||||
| * | | | | Stop trying to call the callback after it has thrown an exception. Also, as ↵ | Danack | 2015-02-16 | 2 | -9/+13 |
| | | | | | | | | | | | | | | | | | | | | an exception has been thrown, there is no need to have a separate error message. | ||||
| * | | | | Merge branch 'sqlite3_exceptionSegfault56' into sqlite3_exception7 | Danack | 2015-02-16 | 1 | -0/+32 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sqlite3_exceptionSegfault56: Fix freeing null segfault. Added test for behaviour. Conflicts: ext/sqlite3/sqlite3.c | ||||
| | * | | | | Fix freeing null segfault. Added test for behaviour. | Danack | 2015-01-06 | 2 | -6/+43 |
| | | | | | | |||||
* | | | | | | Merge branch 'PHP-5.6' | Stanislav Malyshev | 2015-03-22 | 1 | -0/+36 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Fix #68760: Fix freeing null segfault. Added test for behaviour. Fix #68760: Fix freeing null segfault. Added test for behaviour. Conflicts: ext/sqlite3/sqlite3.c | ||||
| * | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-03-22 | 1 | -0/+4 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fix #68760: Fix freeing null segfault. Added test for behaviour. Conflicts: ext/sqlite3/tests/bug68760.phpt | ||||
| | * | | | | Fix #68760: Fix freeing null segfault. Added test for behaviour. | Danack | 2015-03-22 | 2 | -6/+47 |
| | | | | | | |||||
| | * | | | | Bump year | Xinchen Hui | 2015-01-15 | 4 | -4/+4 |
| | | | | | | |||||
| * | | | | | Fix #68760: Fix freeing null segfault. Added test for behaviour. | Danack | 2015-03-22 | 2 | -6/+43 |
| | | | | | | |||||
| * | | | | | bump year | Xinchen Hui | 2015-01-15 | 4 | -4/+4 |
| | | | | | |