5af586bec5
Remove more PHP 6 leftovers from tests
2016-11-24 22:39:39 +01:00
617dcf1b37
Remove the binary cast from unrelated tests
2016-11-20 21:11:53 +01:00
9c5af4e4cb
Remove the b prefix from literals on unrelated tests
2016-11-20 21:11:53 +01:00
c0d4e72a68
Revert "Fix test, this is kinda ugly, but at least for me on Windows there seems to be some messed up line endings"
...
This reverts commit aeeaedeeb7
2016-10-20 16:02:37 +02:00
9935d7e163
Save a call to strlen(), since we can figure out the length of this constant value with sizeof() at compile time
2016-10-20 14:28:24 +02:00
aeeaedeeb7
Fix test, this is kinda ugly, but at least for me on Windows there seems to be some messed up line endings
2016-10-20 14:24:01 +02:00
336322ce63
Fix bug #73150 : missing NULL check in dom_document_save_html
...
(cherry picked from commit 1c0e9126fbd1e878f272
2016-10-14 01:40:12 +02:00
d103a41679
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
followup with #73276 merge
fix test
Fix bug #73276 - crash in openssl_random_pseudo_bytes function
Fix bug #73293 - NULL pointer dereference in SimpleXMLElement::asXML()
Fix for #73240 - Write out of bounds at number_format
avoid strlen
Bug #73218 : add mitigation for ICU int overflow
Add more locale length checks, due to ICU bugs.
Fix bug #73150 : missing NULL check in dom_document_save_html
Clear FG(user_stream_current_filename) when bailing out
set versions and release date
sync NEWS
Revert "Fixed bug #73067 (__debugInfo crashes when throwing an exception)"
Fix for #73240 - Write out of bounds at number_format
Fix bug #73257 and bug #73258 - SplObjectStorage unserialize allows use of non-object as key
set versions
Fix bug #73091 - Unserializing DateInterval object may lead to __toString invocation
2016-10-12 16:06:11 +02:00
d1e878f272
Fix bug #73150 : missing NULL check in dom_document_save_html
...
(cherry picked from commit 1c0e9126fb
2016-10-12 12:19:41 +02:00
ef0279b640
Merge branch 'PHP-7.0'
2016-07-15 01:22:26 +02:00
b01b093ca9
Merge branch 'PHP-5.6' into PHP-7.0
2016-07-15 01:14:41 +02:00
a4aa4f9772
Fix bug #66502 : DOM document dangling reference
...
When we decrement the refcount of a node's document, we state that we
won't need it anymore. Therefore we can *always* set the pointer to the
document to NULL, what avoids invalid memory accesses for some edge cases
as demonstrated with the PHPT.
Original patch provided by Sean Heelan.
2016-07-15 01:08:08 +02:00
24237027bc
Merge branch 'throw-error-in-extensions'
2016-07-05 02:08:39 -05:00
0cfb47651c
Fixed compilation warnings
2016-06-28 11:37:51 +03:00
323b2733f6
Fixed compilation warnings
2016-06-22 00:40:50 +03:00
771e5cc247
Replace zend_ce_error with NULL and replace more E_ERROR with thrown Error
2016-06-13 09:02:17 -05:00
e3c681aa5c
Merge branch 'master' into throw-error-in-extensions
2016-06-10 22:02:23 -05:00
f0a2e8eb13
Removed "zend_fcall_info.function_table". It was assigned in many places, but is never used.
2016-04-27 13:46:38 +03:00
c67c166f93
Removed zend_fcall_info.symbol_table
2016-03-02 17:50:55 +03:00
2068bb1a11
Missed semicolon
2016-02-18 12:04:27 +08:00
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
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
aadb3dd503
These function docs are referencing zend_object_value but this should be zend_object
2015-12-24 10:24:53 +01:00
4171a8f6c6
Internal function argumensts cleanup (strict_types)
2015-12-12 22:52:37 -08:00
a7552ca310
add ovfl check, fix warnings
2015-09-24 16:33:56 +02:00
51cd49b2cf
Cleanup: replace removed condition with ZEND_ASSERT()
2015-09-24 00:25:51 +03:00
c87ef023aa
Fixed Bug #70558 ("Couldn't fetch" error in DOMDocument::registerNodeClass())
2015-09-23 07:01:50 -07:00
0c7872f88a
add range check
2015-09-16 15:39:21 +02:00
969dcf7b61
add overflow check
2015-09-12 18:57:23 +02:00
5d035b57ee
fix data types
2015-09-12 18:53:30 +02:00
c6ff5be09d
add range checks
2015-09-12 10:29:00 +02:00
1b344f55f4
Revert "Fix #70029 : nodeValue of DOMElement list content of children nodes"
...
This reverts commit 25a52d98d7
2015-09-06 15:36:43 +02:00
25a52d98d7
Fix #70029 : nodeValue of DOMElement list content of children nodes
...
According to the W3C DOM Core Level 3 specification DOMElement::nodeValue is
supposed to yield null, but currently the DOM extension yield the result of
calling xmlNodeGetContent(), what is the concatenation of the values of the
children of the element. This patch fixes the non standard behavior.
2015-09-05 01:52:41 +02:00
c9a8733ce2
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #70001 : Assigning to DOMNode::textContent does additional entity encoding
Resolved conflicts:
ext/dom/node.c
2015-09-05 01:32:08 +02:00
b2954c64ab
Fix #70001 : Assigning to DOMNode::textContent does additional entity encoding
...
Assigning to DOMNode::textContent encodes entities, what does not match the
behavior of DOMText::__construct() and DOMDocument::createTextNode. This patch
changes the behavior of DOMNode::textContent in this regard.
2015-09-05 01:17:50 +02:00
201afce875
add some range checks to ext/dom
2015-08-26 16:39:50 +02:00
715d5d2855
Get rid of implicit type casting in GC_*() macros in Zend/zend_types.h.
...
This prevented compilation warnings and disclosed few incorrect usages in Zend/zend_vm_def.h and ext/dom/xpath.c.
Now explicit type casting may be required on call site.
This may break some C extension code, but it shoulfn't be a problem to add explicit casting.
2015-08-13 13:56:29 +03:00
6576d809a5
test fails with old libxml2; skip in this case
2015-07-31 19:52:42 +02:00
ed3c7adc5f
Remove unneded space(s)
2015-08-03 18:38:41 +08:00
545b364d56
remove TSRMLS_*
...
either remains or merged in from PHP5
2015-08-02 13:42:01 +02:00
78eab007a9
Merge branch 'PHP-5.6'
...
* PHP-5.6:
test fails with old libxml2; skip in this case
2015-07-31 19:55:07 +02:00
5c95226d50
Various warning fixes
2015-07-17 20:18:25 +02:00
1af1afdfdc
DOMDocument::saveXML has a 2nd optional arg
2015-07-10 15:17:06 -07:00
7ec1e17464
Update memory freeing and other issues, revert some changes
2015-07-05 23:25:53 -05:00
907476f34c
Convert E_ERROR to thrown Error in extensions
2015-07-05 12:16:57 -05:00
ed1b64877d
Switch position of ce in exception ce variable names
2015-07-03 09:45:03 -05:00
a812a74c2e
Change zend_exception_get_default() to zend_exception_ce
2015-07-03 09:44:48 -05:00
4a2e40bb86
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
2015-06-30 04:05:24 +03:00
86df85f43a
Merge branch 'PHP-5.6'
...
* PHP-5.6:
added regression test for bug #69679
2015-06-27 01:10:41 +02:00
6400ef192c
added regression test for bug #69679
...
DOMDocument::loadHTML refuses to accept NULL bytes.
2015-06-27 01:08:56 +02:00
Nikita Popov