archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
137499 commits 526 branches 1434 tags 865 MiB
Commit graph

335 commits

Author SHA1 Message Date
Anatol Belski
5ac288bcc6 fix crash in sqlite when executing with bound stream param 
rel #70862
 2015-11-05 18:08:08 +01:00
Xinchen Hui
010509355d Fixed Conditional jump or move depends on uninitialised value 2015-10-14 10:19:57 +08:00
Adam Harvey
6413ecb439 Fix a memory leak in sqlite3_do_callback. 
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).
 2015-09-24 14:16:45 +02:00
Xinchen Hui
59e8eae4b0 Useless ZVAL_UNDEF 2015-09-09 18:00:04 +08:00
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
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
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
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
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
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
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Anatol Belski
aac7b1db7c converted ext/sqlite and ext/pdo_mysql to use static tsrmls cache 2014-10-16 18:50:19 +02:00
Anatol Belski
c00424e427 bring back all the TSRMLS_FETCH() stuff 
for better comparability with the mainstream
 2014-10-15 09:37:55 +02:00
Anatol Belski
1b9e905f43 cleanup TSRMLS_FETCH in ext/sqlite3 2014-09-26 09:38:12 +02:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Anatol Belski
3234480827 first show to make 's' work with size_t 2014-08-27 20:49:31 +02:00
Anatol Belski
af59e92b24 master renames phase 7 2014-08-25 21:51:49 +02:00
Anatol Belski
4d997f63d9 master renames phase 3 2014-08-25 20:22:49 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
5eef3a9eed fix zpp 2014-08-21 15:51:09 +02:00
Anatol Belski
acdda1093b ported ext/sqlite3 2014-08-19 12:04:15 +02:00
Anatol Belski
97c5172ac7 Merge remote-tracking branch 'php/master' 
Conflicts:
	ext/date/lib/parse_date.c
 2014-08-19 08:27:43 +02:00
Anatol Belski
63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Anatol Belski
5fe1e5fefd c89 compat 2014-08-19 08:05:31 +02:00
Xinchen Hui
35dd200430 clean up - remove checked questions 2014-08-13 16:44:22 +08:00
Dmitry Stogov
7301994c28 Merge branch 'master' into phpng 
* master: (46 commits)
  PHP_INT_MIN and _MAX tests
  NEWS and UPGRADING
  Added PHP_INT_MIN
  Fix wrong lenght size
  Bug #51096 - Remove unnecessary ? for first/last day of
  Moved streams related functions to xp_ssl.c
  Remove duplicate NEWS
  Update NEWS
  Update NEWS
  Update NEWS
  BFN
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).
  We need to turn off any strict mode here for this warning to show up
  Disable restrictions regarding arrays in constants at run-time. For the discussion around it, see the thread on the mailing list: http://www.mail-archive.com/internals@lists.php.net/msg68245.html
  Revert "Fix bug #67064 in a BC safe way"
  Updated NEWS for #67693
  Updated NEWS for #67693
  Fixed bug #67693 - incorrect push to the empty array
  add missing entry to NEWS
  ...

Conflicts:
	Zend/tests/errmsg_040.phpt
	Zend/tests/ns_059.phpt
	Zend/zend_language_parser.y
	Zend/zend_vm_def.h
	ext/openssl/openssl.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_directory.c
	ext/spl/spl_iterators.c
	ext/sqlite3/sqlite3.c
	ext/standard/array.c
 2014-08-04 13:56:27 +04:00
Stanislav Malyshev
403eca4173 Add object initialization checks for sqlite3 classes 2014-07-26 16:57:45 -07:00
Xinchen Hui
d8651fbe1c Make they are in the same style of Z_ISREF 2014-05-03 16:08:58 +08:00
Xinchen Hui
9fe8531309 Various bugs fixed 2014-04-24 21:14:36 +08:00
Nikita Popov
20580a511c Fix ZTS build 2014-04-23 18:30:24 +02:00