Rasmus Lerdorf
40ca0f1927
SQLite3::open/__construct has 2 optional args
2015-07-07 11:53:07 -07:00
Xinchen Hui
ca1ba39102
Merge branch 'PHP-5.6'
...
Conflicts:
ext/sqlite3/sqlite3.c
2015-07-07 21:38:24 +08:00
Xinchen Hui
26471eb69c
Fixed bug #69972 (Use-after-free vulnerability in sqlite3SafetyCheckSickOrOk())
2015-07-07 21:37:35 +08:00
Aaron Piotrowski
ed1b64877d
Switch position of ce in exception ce variable names
2015-07-03 09:45:03 -05:00
Aaron Piotrowski
a812a74c2e
Change zend_exception_get_default() to zend_exception_ce
2015-07-03 09:44:48 -05:00
Dmitry Stogov
4a2e40bb86
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
2015-06-30 04:05:24 +03:00
Kalle Sommer Nielsen
0da4c34f0e
Fixed bug #69897 (segfault when manually constructing SQLite3Result)
2015-06-22 11:12:23 +02:00
Aaron Piotrowski
110e0a5a2c
Merge branch 'master' into throwable-interface
...
# Conflicts:
# Zend/zend_language_scanner.c
# Zend/zend_language_scanner.l
# ext/simplexml/tests/SimpleXMLElement_xpath.phpt
2015-06-14 18:53:11 -05:00
Lior Kaplan
d8d5dc5d32
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Upgrade bundled sqlite to 3.8.10.2
2015-06-08 23:22:03 +03:00
Lior Kaplan
79528c5e24
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Upgrade bundled sqlite to 3.8.10.2
2015-06-08 22:37:02 +03:00
Lior Kaplan
b5d1530e4f
Upgrade bundled sqlite to 3.8.10.2
...
Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416 done in 3.8.9
2015-06-08 22:29:10 +03:00
Aaron Piotrowski
fb7206e452
Merge branch 'master' into throwable-interface
2015-05-17 16:15:35 -05:00
Aaron Piotrowski
0eba6f597a
Merge branch 'master' into throwable-interface
2015-05-17 12:12:02 -05:00
Nikita Popov
3ae995f03c
Tweak uncaught exception message display
...
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.
2015-05-17 18:47:06 +02:00
Aaron Piotrowski
64b167d201
Updated tests to reflect exception class changes.
2015-05-16 16:49:14 -05:00
olshevskiy87
8bdec7a248
fix typos
...
Signed-off-by: olshevskiy87 <olshevskiy87@bk.ru>
2015-05-13 22:28:35 +04:00
Dmitry Stogov
7649a35d52
Fixed access to uninitialized value (in case of exception)
2015-04-08 16:01:22 +03:00
Nikita Popov
122d759618
Always throw TypeException on throwing zpp failures
...
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.
2015-04-06 11:27:34 +02:00
Stanislav Malyshev
ff740f16f9
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #66550 (SQLite prepared statement use-after-free)
Conflicts:
ext/sqlite3/sqlite3.c
2015-04-05 22:45:16 -07:00
Stanislav Malyshev
2a81733c87
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #66550 (SQLite prepared statement use-after-free)
2015-04-05 22:38:20 -07:00
Stanislav Malyshev
66b853d426
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #66550 (SQLite prepared statement use-after-free)
2015-04-05 22:37:51 -07:00
Stanislav Malyshev
5ae20c6247
Fix bug #66550 (SQLite prepared statement use-after-free)
2015-04-05 22:36:26 -07:00
Anatol Belski
c87aee8a8a
updated bundled libsqlite to 3.8.8.3
2015-03-25 13:16:56 +01:00
Anatol Belski
c9550e81da
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #69287 upgrade bundled sqlite to 3.8.8.3
fix dir separator in test
2015-03-25 13:13:42 +01:00
Anatol Belski
1b41dcf9c5
Fixed bug #69287 upgrade bundled sqlite to 3.8.8.3
2015-03-25 13:13:03 +01:00
Anatol Belski
8f9cb39cad
fix dir separator in test
2015-03-25 13:11:27 +01:00
Stanislav Malyshev
5a5b63774b
Merge branch 'pull-request/1091'
...
* 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
2015-03-22 16:48:54 -07:00
Stanislav Malyshev
574b9a4e60
Merge branch 'PHP-5.6'
...
* 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
2015-03-22 16:47:54 -07:00
Stanislav Malyshev
40037f1474
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix #68760 : Fix freeing null segfault. Added test for behaviour.
Conflicts:
ext/sqlite3/tests/bug68760.phpt
2015-03-22 16:46:30 -07:00
Danack
0c27a8eb61
Fix #68760 : Fix freeing null segfault. Added test for behaviour.
2015-03-22 16:46:02 -07:00
Danack
1ec430d4ed
Fix #68760 : Fix freeing null segfault. Added test for behaviour.
2015-03-22 16:44:06 -07:00
Danack
44f15b068d
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.
2015-02-16 21:45:21 +00:00
Anatol Belski
af3ca74501
made ZEND_TSRMLS_CACHE_* macros look like function calls
...
which also comply with the current semantics for such macros
2015-02-16 17:19:32 +01:00
Danack
94e2002de5
Merge branch 'sqlite3_exceptionSegfault56' into sqlite3_exception7
...
* sqlite3_exceptionSegfault56:
Fix freeing null segfault. Added test for behaviour.
Conflicts:
ext/sqlite3/sqlite3.c
2015-02-16 02:22:15 +00:00
Dmitry Stogov
9e70d7672d
Move zend_object->guards into additional slot of zend_object->properties_table[]. As result size of objects without __get/__set/__unset/__isset magic methods is reduced.
2015-02-04 15:24:13 +03:00
Xinchen Hui
fc33f52d8c
bump year
2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
Anatol Belski
5f68ffad71
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #68771 SQL syntax error in sqlite lib
2015-01-12 17:03:00 +01:00
Anatol Belski
edb66e05db
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68771 SQL syntax error in sqlite lib
2015-01-12 17:02:18 +01:00
Anatol Belski
ef58622534
Fixed bug #68771 SQL syntax error in sqlite lib
2015-01-12 16:55:47 +01:00
Stanislav Malyshev
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
Julien Pauli
fb069be475
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Updated NEWS
Fix bug #68260
2015-01-09 16:25:14 +01:00
Julien Pauli
138b6442d4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #68260
2015-01-09 16:24:32 +01:00
Julien Pauli
dc810543cf
Fix bug #68260
2015-01-09 16:24:14 +01:00
Danack
92e11f22c5
Fix freeing null segfault. Added test for behaviour.
2015-01-06 22:09:13 +00:00
Anatol Belski
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
Anatol Belski
ba35b22bc4
Merge remote-tracking branch 'origin/master' into native-tls
...
* origin/master: (35 commits)
Fixed bug #68398 msooxml matches too many archives
Fix zpp call in apache_getenv()
Drop unnecessary zval containers
fixed test
C89 compat
add include for missing localeconv_r proto
updated NEWS
Fixed bug #65230 setting locale randomly broken
Fix compilation error (ref #68424 )
Removed useless handlers
Move checks for references into slow paths of operator functions. Remove duplicate opcode handlers.
Revert unintentional docblock change
Restored zip/oci8 PHP 4 code, add PHP 7 checks
Note macro removal in UPGRADING.INTERNALS
Removed ZEND_ENGINE_2 checks (and ZE1 code, it's been a decade!)
Zend Engine 3
Updated NEWS
Updated NEWS
Updated NEWS
Start adding new attribute to control multi statements
...
2014-12-06 21:37:15 +01:00
Anatol Belski
e0a0bea826
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
. Fixed bug #68120 Update bundled libsqlite
2014-12-05 15:51:53 +01:00
Anatol Belski
297f582f5c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
. Fixed bug #68120 Update bundled libsqlite
Conflicts:
ext/sqlite3/libsqlite/sqlite3.c
2014-12-05 15:50:18 +01:00