Anatol Belski
cf1c50957b
re-apply the patch from 1785d2b805
...
too many conflicts to cherry-pick
2016-01-04 17:52:37 +01:00
Stanislav Malyshev
bc4baf608b
Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
...
Conflicts:
ext/wddx/wddx.c
2016-01-04 17:10:29 +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
Dmitry Stogov
ad4fa8f758
Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
2015-09-24 22:39:59 +03:00
Rasmus Lerdorf
3760cb6a59
wddx_add_vars() returns a bool
2015-07-19 07:05:03 -07:00
Nikita Popov
0039a3e96f
Fixed signed/unsigned warnings in wddx
...
Also added extra const annotation to zend_memnstr.
2015-07-17 17:19:23 +02: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
Dmitry Stogov
4bd22cf1c1
Improved zend_string API (Francois Laupretre)
...
Squashed commit of the following:
commit d96eab8d79
Author: Francois Laupretre <francois@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 b352643910
Author: Francois Laupretre <francois@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
Nikita Popov
40e465e357
Clean up some type conversions
...
While at it also fix some type checks in iconv and drop dead and
unported code in standard/filters.
2015-04-27 18:50:08 +02:00
Anatol Belski
663074b6b1
cleanup mod version macros and mod defs, round x
2015-03-23 21:30:22 +01:00
Dmitry Stogov
d146d15003
Optimize zend_string_realloc() add more specialized versions zend_string_extend() and zend_string_truncate()
2015-03-20 02:02:42 +03:00
Dmitry Stogov
8633685675
Use specialized macro for string zval creation
2015-03-12 16:53:51 +03:00
Dmitry Stogov
e10e151e9b
Merged zend_array and HashTable into the single data structure.
...
Now each HashTable is also zend_array, so it's refcounted and may be a subject for Copy on Write
zend_array_dup() was changed to allocate and return HashTable, instead of taking preallocated HashTable as argument.
2015-02-13 22:20:39 +03:00
manuel
13fc7f20a4
Invalid free of CG(interned_empty_string)
...
On failure php_escape_html_entities returns STR_EMPTY_ALLOC which is an
alias of CG(interned_empty_string) if interned strings are enabled.
Make sure we don't free this.
2015-02-06 16:53:01 +01:00
Xinchen Hui
efc75061ed
Ported wddx
2015-02-03 12:02:28 +08: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
Stanislav Malyshev
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
Anatol Belski
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
Anatol Belski
075fc1ff1a
fix some datatype mismatches
2014-11-18 13:19:52 +01:00
Nikita Popov
e33f3d3b7c
Move smart_str implementation into Zend/
...
So we can use it there as well...
For now I've retained the zend_smart_str_public.h header, though
it would probably be better to just move that one struct into
zend_types.h.
2014-09-21 20:49:39 +02:00
Johannes Schlüter
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
Nikita Popov
079409bbc2
Switch (un)mangle property name to size_t and zend_string
...
Also use the _ex variants where possible.
2014-09-16 00:31:27 +02:00
Anatol Belski
e68788745a
fix type
2014-09-12 21:35:21 +02:00
Anatol Belski
6db8d4f829
's' works with size_t round 3
2014-08-27 20:49:36 +02:00
Anatol Belski
3234480827
first show to make 's' work with size_t
2014-08-27 20:49:31 +02:00
Nikita Popov
28e7beea66
Fix zend_longo_str
2014-08-25 22:47:04 +02:00
Anatol Belski
c3e3c98ec6
master renames phase 1
2014-08-25 19:24:55 +02:00
Anatol Belski
63d3f0b844
basic macro replacements, all at once
2014-08-19 08:07:31 +02:00
Dmitry Stogov
6bf24f4dd0
Removed EG(active_symbol_table) and use corresponding value from EG(current_execute_data)
2014-07-04 18:03:45 +04:00
Dmitry Stogov
b3b616cf7e
Introduced immutable arrays. They don't need to be copyed and may be used directly from SHM.
2014-05-29 18:21:56 +04:00
Nikita Popov
9e2bc83fdb
Use zend_long_to_str in wddx
2014-05-28 18:55:51 +02:00
Pierre Joye
684506c4c8
fix ts build
2014-05-15 10:36:09 +02:00
Dmitry Stogov
a08a1ae2c0
Fixed reference counting, IS_REFERENCE and IS_INDIRECT support
2014-05-13 17:27:37 +04:00
Dmitry Stogov
0eeeaa1a23
Terminate string
...
Useproper hash function
2014-05-13 16:40:05 +04:00
Dmitry Stogov
b8b8c497c4
In most user extensions functions like mysql_close() should use zend_list_close() instead of zend_list_delete(). This closes the actual connection and frees extension specific data structures, but doesn't free zend_reference structure that might be referenced from zval(s). This also doesn't decrement the resource reference counter.
2014-05-13 13:18:00 +04:00
Xinchen Hui
b2b508a279
Fixed reference handling
2014-05-12 11:39:55 +08:00
Xinchen Hui
fca5af618f
Fixed IS_INDRICT handling
2014-05-12 10:52:37 +08:00
Xinchen Hui
618d6e273c
Fixed fields handling
2014-05-12 10:46:19 +08:00
Xinchen Hui
8d87e3b841
Refactoring wddx (incompleted, is there any one use it? )
2014-05-11 22:04:45 +08:00
Rouven Weßling
417dbfbacc
Declare a number of functions as variadic.
2014-02-16 00:07:55 +01:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Anatol Belski
95ea1e7ca7
fixed variable corruption under win x64
2013-05-11 02:47:48 +02:00
Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Felipe Pena
8775a37559
- Year++
2012-01-01 13:15:04 +00:00
Dmitry Stogov
e43ff1359e
Fixed ZE specific compile warnings (Bug #55629 )
2011-09-13 13:29:35 +00:00
Felipe Pena
da376383e8
- Make usage of new PHP_FE_END macro
2011-07-25 11:35:02 +00:00
Felipe Pena
0203cc3d44
- Year++
2011-01-01 02:17:06 +00:00
Felipe Pena
88b087bedd
- Fixed bug #52468 (wddx_deserialize corrupts integer field value when left empty)
2010-08-01 17:34:09 +00:00