1
0
mirror of https://github.com/php/php-src.git synced 2026-04-21 15:08:16 +02:00
Commit Graph

66 Commits

Author SHA1 Message Date
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 fb7206e452 Merge branch 'master' into throwable-interface 2015-05-17 16:15:35 -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
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 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 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
Danack 0c27a8eb61 Fix #68760: Fix freeing null segfault. Added test for behaviour. 2015-03-22 16:46:02 -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
Danack 92e11f22c5 Fix freeing null segfault. Added test for behaviour. 2015-01-06 22:09:13 +00:00
Lars Strojny b16463a9fb Merge branch 'PHP-5.4' into PHP-5.5 2013-01-14 17:36:07 +01:00
Lars Strojny 99d087e5d4 Fixed bug #63921: sqlite3::bindvalue and relative PHP functions aren't using sqlite3_*_int64 API 2013-01-14 17:35:07 +01:00
Anatoliy Belsky 6996a51d59 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails
2012-04-26 15:18:17 +02:00
Anatoliy Belsky 94d96f7782 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails

Conflicts:
	ext/sqlite3/tests/sqlite3_15_open_error.phpt
2012-04-26 15:17:46 +02:00
Anatoliy Belsky 4daab0abec Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails 2012-04-26 15:14:26 +02:00
Rasmus Lerdorf 9722bff0c3 Missed the test 2012-01-29 04:20:50 +00:00
Rasmus Lerdorf d8b312845c Missed the test 2012-01-29 04:20:50 +00:00
Rasmus Lerdorf 191cc014be Missed the test 2012-01-29 04:20:50 +00:00
Pierre Joye b660f32dab - add skipif 2011-09-06 07:29:59 +00:00
Pierre Joye 702a5de5ac - add skipif 2011-09-06 07:29:59 +00:00
Pierre Joye d6a6c1892b - add skipif 2011-09-06 07:29:59 +00:00
Pierre Joye 9fa90f8a90 - add skipif 2011-09-06 07:28:38 +00:00
Pierre Joye ce70e2b8fd - add skipif 2011-09-06 07:28:38 +00:00
Pierre Joye 95aefb0114 - add skipif 2011-09-06 07:28:38 +00:00
Rasmus Lerdorf 78a46b87e3 Fix another broken test. root can read 0200 files. 2011-08-29 06:19:40 +00:00
Rasmus Lerdorf bf3bb1efbe Fix another broken test. root can read 0200 files. 2011-08-29 06:19:40 +00:00
Rasmus Lerdorf 7c7aa30322 Fix another broken test. root can read 0200 files. 2011-08-29 06:19:40 +00:00
Felipe Pena 29a82ceb56 - Fixed memory leak on SQLite3Result and SQLite3Stmt when assigning to a reference. 2011-01-07 01:11:16 +00:00
Felipe Pena d3e6f27a76 - Fixed memory leak on SQLite3Result and SQLite3Stmt when assigning to a reference. 2011-01-07 01:11:16 +00:00
Scott MacVicar 3870e58759 Add SQLite3_Stmt::readOnly for checking if a statement is read only 2010-12-31 16:37:12 +00:00
Scott MacVicar c9c0de49a8 Add SQLite3_Stmt::readOnly for checking if a statement is read only 2010-12-31 16:37:12 +00:00
Felipe Pena 26d7aafb1a - Fixed bug #53463 (sqlite3 columnName() segfaults on bad column_number) 2010-12-03 21:05:44 +00:00
Felipe Pena 689d1d9e4b - Fixed bug #53463 (sqlite3 columnName() segfaults on bad column_number) 2010-12-03 21:05:44 +00:00
Patrick Allaert 817776d1b9 - Fixed tests not passing under windows because of the directory separator
difference (thanks Eyal Teutsch for reporting)
2010-11-08 09:29:15 +00:00
Patrick Allaert e2e76d40e3 - Fixed tests not passing under windows because of the directory separator
difference (thanks Eyal Teutsch for reporting)
2010-11-08 09:29:15 +00:00
Johannes Schlüter d7b1fa9d35 Berkeley DB 5's SQL frontend gives a slightly different error than libsqlite 2010-06-01 16:39:36 +00:00
Johannes Schlüter 3a5323e9ee Berkeley DB 5's SQL frontend gives a slightly different error than libsqlite 2010-06-01 16:39:36 +00:00
Kalle Sommer Nielsen cb30330800 Merge safe_mode changes into extensions that are in sync in both branches 2010-04-26 23:55:03 +00:00
Kalle Sommer Nielsen dd8e59da8f Removed safe_mode
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
2010-04-26 23:53:30 +00:00
Zoe Slattery 4e0b75042a fix tests 2009-07-17 09:28:19 +00:00
Scott MacVicar 40521699ce MFH make SQLite3::enableExceptions() return the previous value. 2009-06-08 02:15:54 +00:00
Kalle Sommer Nielsen 4d855122a5 MFH: Fix test on Windows 2009-05-22 18:27:38 +00:00
Kalle Sommer Nielsen 7852108cce MFH: Added missing SKIPIF 2009-05-22 18:22:30 +00:00
Hannes Magnusson ebf4c8ddb8 Fix test 2009-05-18 13:52:16 +00:00
Felipe Pena b5cec43162 - New tests (testfest BelgiumUG) 2009-05-17 16:51:59 +00:00
Scott MacVicar bc486b4c7e MFH Fix bug #47678 - Allow loadExtension to be disabled in SQLite3 2009-03-17 02:45:12 +00:00