Xinchen Hui
ccd4716ec7
year++
2018-01-02 12:53:31 +08:00
Xinchen Hui
08177312fb
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74950 (nullpointer deref in simplexml_element_getDocNamespaces)
2017-07-21 18:16:54 +08:00
Xinchen Hui
3a7b0027f3
Fixed bug #74950 (nullpointer deref in simplexml_element_getDocNamespaces)
2017-07-21 18:16:11 +08:00
Sammy Kaye Powers
dac6c639bb
Update copyright headers to 2017
2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
478f119ab9
Update copyright headers to 2017
2017-01-04 11:14:55 -06:00
Anatol Belski
a5e9a73db2
fix typo
...
(cherry picked from commit efc1f33b58
2016-10-14 01:43:54 +02:00
Stanislav Malyshev
e7e60851ae
Fix bug #73293 - NULL pointer dereference in SimpleXMLElement::asXML()
...
(cherry picked from commit 96a8cf8e1b4ef79370a8
2016-10-14 01:42:05 +02:00
Anatol Belski
efc1f33b58
fix typo
2016-10-12 17:12:38 +02:00
Stanislav Malyshev
4ef79370a8
Fix bug #73293 - NULL pointer dereference in SimpleXMLElement::asXML()
...
(cherry picked from commit 96a8cf8e1b
2016-10-12 15:40:21 +02:00
Nikita Popov
d49024c6de
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-30 13:06:32 +02:00
Nikita Popov
bfd4277008
Fix bug #72957
2016-08-30 13:05:53 +02:00
Nikita Popov
6adb7e0b7a
Followup for bug #72971
...
Property writes did not respect the namespace either. This is an
incomplete fix in that it only handles the case where an existing
child element is modified, not when a new one is created.
2016-08-30 12:53:50 +02:00
Nikita Popov
51a564e505
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-30 10:56:06 +02:00
Nikita Popov
07cc6a6ba2
Fix bug #72971
2016-08-30 10:54:31 +02:00
Nikita Popov
735bec4f40
Avoid uncollectable cycle in sxe_property_get_adr
...
The code was storing the created object in a property on the
created object, creating a trivial cycle. This cycle cannot be
collected (even if sxe->tmp is exposed via get_gc), because it
is never rooted (and we cannot safely manually root it).
Change the code to store the created object on the parent node
instead.
The only reason this is not showing up as a leak is that sxe->tmp
is dtor'ed in the dtor handler, which means that these objects
do get collected on shutdown -- but never earlier.
2016-07-16 23:43:24 +02:00
Nikita Popov
2c51a2d00b
Remove unnecessary use of sxe->tmp
2016-07-16 23:16:51 +02:00
Xinchen Hui
f24ed8c2fe
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed bug #72588 (Using global var doesn't work while accessing SimpleXML element)
2016-07-13 10:50:15 +08:00
Xinchen Hui
8129b83992
Fixed bug #72588 (Using global var doesn't work while accessing SimpleXML element)
2016-07-13 10:49:58 +08:00
Aaron Piotrowski
24237027bc
Merge branch 'throw-error-in-extensions'
2016-07-05 02:08:39 -05:00
Dmitry Stogov
323b2733f6
Fixed compilation warnings
2016-06-22 00:40:50 +03:00
Dmitry Stogov
1616038698
Added ZEND_ATTRIBUTE_FORMAT to some middind functions.
...
"%p" replaced by ZEND_LONG_FMT to avoid compilation warnings.
Fixed most incorrect use cases of format specifiers.
2016-06-21 16:00:37 +03:00
Aaron Piotrowski
771e5cc247
Replace zend_ce_error with NULL and replace more E_ERROR with thrown Error
2016-06-13 09:02:17 -05:00
Aaron Piotrowski
e3c681aa5c
Merge branch 'master' into throw-error-in-extensions
2016-06-10 22:02:23 -05:00
Anatol Belski
7a4c2fa829
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix regression introduced in 5683b6fa39
2016-03-08 13:16:08 +01:00
Anatol Belski
8ca02bb233
fix regression introduced in 5683b6fa39
...
Test extended. Basically, both iterator type and next node have
to be checked.
2016-03-08 12:59:59 +01:00
Lior Kaplan
ed35de784f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
Anatol Belski
2c523f21c9
add range checks to simplexml
2015-08-26 16:39:47 +02:00
Nikita Popov
36e49c702b
Fix simplexml warnings
2015-07-17 21:12:15 +02:00
Aaron Piotrowski
7ec1e17464
Update memory freeing and other issues, revert some changes
2015-07-05 23:25:53 -05:00
Aaron Piotrowski
907476f34c
Convert E_ERROR to thrown Error in extensions
2015-07-05 12:16:57 -05: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
6daed13c8b
Cleanup (removed dead code)
2015-07-01 22:18:40 +03:00
Dmitry Stogov
4bd22cf1c1
Improved zend_string API (Francois Laupretre)
...
Squashed commit of the following:
commit d96eab8d79francois@tekwire.net >
Date: Fri Jun 26 01:23:31 2015 +0200
Use the new 'ZSTR' macros in the rest of the code.
Does not change anything to the generated code (thanks to compat macros) but cleaner.
commit b352643910francois@tekwire.net >
Date: Thu Jun 25 13:45:06 2015 +0200
Improve zend_string API
Add missing methods
2015-06-29 16:44:54 +03:00
Rasmus Lerdorf
28d7bb97a1
Fix more proto comments
2015-06-23 17:46:20 -04:00
Dmitry Stogov
8e10e8f921
Avoid zval duplication in ZVAL_ZVAL() macro (it was necessary only in few places).
...
Switch from ZVAL_ZVAL() to simpler macros where possible (it makes sense to review remaining places)
2015-06-12 12:33:23 +03:00
Nikita Popov
5d3cf577aa
Make convert_to_* safe with rc>1
...
This only involves switching zval_dtor to zval_ptr_dtor for arrays
and making the convert_to_object for arrays a bit more generic.
All the other changes outside zend_operators.c just make use of
this new ability (use COPY instead of DUP).
What's still missing: Proper references handling. I've seen many
convert_to* calls that will break when a reference is used.
Also fixes bug #69788 .
2015-06-11 23:23:57 +02:00
Anatol Belski
5683b6fa39
Refactored the fix for bug #66084 , by cmb@php.net
2015-05-29 21:16:56 +02:00
Christoph M. Becker
f27b9ead6b
fixed whitespace dependend behavior of casting SimpleXMLElements to boolean
2015-05-29 20:43:38 +02:00
Christoph M. Becker
db4a6def47
fixed whitespace depending (mis)behavior of var_dump'ing and print_r'ing SimpleXMLElements
2015-05-29 20:43:34 +02:00
Xinchen Hui
55d94a4532
Merge branch 'master' of git.php.net:php-src
2015-05-06 10:51:52 +08:00
Dmitry Stogov
f6663c7201
Loop splitting and specialization
2015-05-05 18:51:08 +03:00
Dmitry Stogov
81dd375b5f
Fixed compilation warning
2015-05-05 16:28:54 +03:00
Dmitry Stogov
275afbacd1
Use zend heap instead of system
2015-05-05 16:06:10 +03:00
Dmitry Stogov
a610e8c4c6
Use better zend_hash_*() functions.
2015-05-05 12:58:11 +03:00
Dmitry Stogov
17e4c62872
Removed check for count() in SXE class
2015-05-05 12:57:30 +03:00
Xinchen Hui
5f8bc73fc3
fixed comment
2015-05-05 17:37:42 +08:00
Xinchen Hui
7b9e4e19e1
Unused macros
2015-05-05 17:25:25 +08:00
Xinchen Hui
8c0ebb4c5d
Optimize cast simplexml to IS_BOOL
2015-05-05 17:23:54 +08:00
