]>
granicus.if.org Git - php/log
Xinchen Hui [Tue, 23 Sep 2014 05:50:00 +0000 (13:50 +0800)]
It is not likely a string
Xinchen Hui [Tue, 23 Sep 2014 04:56:59 +0000 (12:56 +0800)]
Simply make_printable_zval
it's possible to remove make_printable_zval at all
but it will be a API break
Nikita Popov [Mon, 22 Sep 2014 22:57:00 +0000 (00:57 +0200)]
Test a few more error conditions in the compiler
Nikita Popov [Mon, 22 Sep 2014 22:40:17 +0000 (00:40 +0200)]
Test error conditions for ct class const refs
And fix a bug found while doing so...
Nikita Popov [Mon, 22 Sep 2014 22:31:38 +0000 (00:31 +0200)]
Test some additional cases for constexpr evaluation
Nikita Popov [Sun, 21 Sep 2014 21:42:55 +0000 (23:42 +0200)]
Fix tests/serialize/bug64146.phpt
The var hash now retains a reference to its elements, to ensure
that addresses are not reused.
Furthermore the var hash now only stores objects and references
and directly uses their pointer as key, thus making serialization
about two times faster.
Nikita Popov [Mon, 22 Sep 2014 21:39:07 +0000 (23:39 +0200)]
Remove zend_dynamic_array
This was introduced back in 2000 to test a new hashtable
implementation and is no longer used.
Nikita Popov [Mon, 22 Sep 2014 21:21:59 +0000 (23:21 +0200)]
Remove static allocator
We didn't even compile this file anymore
Dmitry Stogov [Mon, 22 Sep 2014 21:04:47 +0000 (01:04 +0400)]
Fixed typo
Nikita Popov [Mon, 22 Sep 2014 16:34:09 +0000 (18:34 +0200)]
Fix list() destructuring to special variables
Nikita Popov [Sun, 21 Sep 2014 22:47:03 +0000 (00:47 +0200)]
Remove php_varname_check
This is a leftover from PHP < 5.4.
Also removed the php_create_empty_class declaration, which no longer
exists.
Dmitry Stogov [Mon, 22 Sep 2014 13:52:38 +0000 (17:52 +0400)]
Avoid useless reference counting
Dmitry Stogov [Mon, 22 Sep 2014 12:17:35 +0000 (16:17 +0400)]
Specialization (only IS_VAR ad IS_CV operands may be references)
Dmitry Stogov [Mon, 22 Sep 2014 10:41:44 +0000 (14:41 +0400)]
Optimized unset()
Dmitry Stogov [Mon, 22 Sep 2014 09:18:49 +0000 (13:18 +0400)]
Make error paths to be UNEXPECTED
Dmitry Stogov [Mon, 22 Sep 2014 08:47:10 +0000 (12:47 +0400)]
Replace IS_OP?_TMP_FREE() with more clear (OP?_TYPE == IS_TMP_VAR)
Anatol Belski [Mon, 22 Sep 2014 07:37:40 +0000 (09:37 +0200)]
added a comment
Anatol Belski [Mon, 22 Sep 2014 06:53:15 +0000 (08:53 +0200)]
fix the REPARSE_DATA_BUFFER struct def
Anatol Belski [Sun, 21 Sep 2014 18:54:14 +0000 (20:54 +0200)]
simplify the condition
Nikita Popov [Sun, 21 Sep 2014 21:56:09 +0000 (23:56 +0200)]
Fix two memory errors by interning earlier
Nikita Popov [Sun, 21 Sep 2014 18:47:07 +0000 (20:47 +0200)]
Add smart_str_append for appending zend_strings
Also replaces usages in Zend/ and ext/standard
Nikita Popov [Sun, 21 Sep 2014 18:28:44 +0000 (20:28 +0200)]
Rename smart_str_append to smart_str_append_smart_str
It's used only rarely and I'm running out of append names...
Nikita Popov [Sat, 20 Sep 2014 22:21:41 +0000 (00:21 +0200)]
Use smart_str for exception stack traces
Nikita Popov [Sat, 20 Sep 2014 21:27:10 +0000 (23:27 +0200)]
Use smart_str in get_function_declaration
Instead of custom smart string implementation
Nikita Popov [Sat, 20 Sep 2014 20:42:02 +0000 (22:42 +0200)]
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.
Andrea Faulds [Sat, 20 Sep 2014 23:47:46 +0000 (00:47 +0100)]
Merge branch 'master' of git.php.net:php-src
Andrea Faulds [Sat, 20 Sep 2014 23:47:25 +0000 (00:47 +0100)]
UPGRADING for Integer Semantics
Ard Biesheuvel [Sat, 20 Sep 2014 23:42:31 +0000 (16:42 -0700)]
Merge branch 'PHP-5.6'
Ard Biesheuvel [Sat, 20 Sep 2014 23:42:12 +0000 (16:42 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
Ard Biesheuvel [Sat, 20 Sep 2014 23:40:02 +0000 (16:40 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
Ard Biesheuvel [Sat, 20 Sep 2014 23:32:31 +0000 (16:32 -0700)]
Fixed bug #66242 (don't assume char is signed)
This fixes a bug in libmagic where a cast to 'char' is assumed to result
in sign extension to occur. However, unqualified 'char' is unsigned on
architectures such as ARM, so the cast needs to be to 'signed char'
explicitly.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Andrea Faulds [Sat, 20 Sep 2014 23:29:48 +0000 (00:29 +0100)]
Merge branch 'master' into integer_semantics
Nikita Popov [Sat, 20 Sep 2014 19:58:06 +0000 (21:58 +0200)]
Merge branch 'PHP-5.6'
Conflicts:
Zend/zend_compile.c
Nikita Popov [Sat, 20 Sep 2014 19:47:16 +0000 (21:47 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Nikita Popov [Sat, 20 Sep 2014 19:46:25 +0000 (21:46 +0200)]
Fixed bug #67633
Anatol Belski [Sat, 20 Sep 2014 18:58:00 +0000 (20:58 +0200)]
fixed copying of the struct as it's not being modified
in the subsequent function call
Anatol Belski [Sat, 20 Sep 2014 18:05:27 +0000 (20:05 +0200)]
avoid strlen usage in loop
Anatol Belski [Sat, 20 Sep 2014 17:46:44 +0000 (19:46 +0200)]
Merge branch 'pull-request/805'
* pull-request/805:
Removes accidentally added files.
Reverts some unwanted changes
Deletes patch leftovers
Replaces php5 with php7, without whitespace changes.
Florian MARGAINE [Sat, 20 Sep 2014 16:27:09 +0000 (18:27 +0200)]
Removes accidentally added files.
Florian MARGAINE [Sat, 20 Sep 2014 16:24:38 +0000 (18:24 +0200)]
Reverts some unwanted changes
Anatol Belski [Sat, 20 Sep 2014 13:46:19 +0000 (15:46 +0200)]
refixed printf fmt, used portable macros
Anatol Belski [Sat, 20 Sep 2014 13:13:42 +0000 (15:13 +0200)]
forked bug41655 test for windows
Nikita Popov [Sat, 20 Sep 2014 10:56:05 +0000 (12:56 +0200)]
Simplify foreach flags
* FE_RESET_VARIABLE and FE_RESET_REFERENCE were always set
together.
* In some places the code checked FE_FETCH_BYREF instead of
FE_RESET_REFERENCE and relied on them having the same value.
* Now the FE_RESET_* flags are dropped and everything uses
FE_FETCH_BYREF
Nikita Popov [Sat, 20 Sep 2014 10:46:05 +0000 (12:46 +0200)]
Fix leak in foreach with by-ref iteration of ref array
Florian MARGAINE [Sat, 20 Sep 2014 08:09:21 +0000 (10:09 +0200)]
Merge branch 'master' into issue-67910
Conflicts:
README.PARAMETER_PARSING_API
ext/gmp/tests/001.phpt
Florian MARGAINE [Sat, 20 Sep 2014 08:03:54 +0000 (10:03 +0200)]
Deletes patch leftovers
Florian MARGAINE [Sat, 20 Sep 2014 08:01:44 +0000 (10:01 +0200)]
Replaces php5 with php7, without whitespace changes.
Xinchen Hui [Sat, 20 Sep 2014 07:22:12 +0000 (15:22 +0800)]
Avoid strlen usage
Xinchen Hui [Sat, 20 Sep 2014 07:16:09 +0000 (15:16 +0800)]
folder marks
Xinchen Hui [Sat, 20 Sep 2014 07:12:08 +0000 (15:12 +0800)]
Added missed mod str
Xinchen Hui [Sat, 20 Sep 2014 05:51:58 +0000 (13:51 +0800)]
Fixed built on OSX
Johannes Schlüter [Sat, 20 Sep 2014 01:27:40 +0000 (03:27 +0200)]
s,PHP 5,PHP 7,
Johannes Schlüter [Sat, 20 Sep 2014 01:05:32 +0000 (03:05 +0200)]
Update README.PARAMETER_PARSING_API
Anatol Belski [Sat, 20 Sep 2014 00:14:35 +0000 (02:14 +0200)]
make the return value more logic
as if clz() were returning 32 on empty size
Anatol Belski [Fri, 19 Sep 2014 23:36:51 +0000 (01:36 +0200)]
make use of intrinsics available with VS for bitset lookups
Anatol Belski [Fri, 19 Sep 2014 21:21:03 +0000 (23:21 +0200)]
add the missing src file
Anatol Belski [Fri, 19 Sep 2014 20:53:51 +0000 (22:53 +0200)]
reduce the struct size by 8 byte on 64 bit
Nikita Popov [Fri, 19 Sep 2014 21:54:58 +0000 (23:54 +0200)]
Make header C++ compatible
Nikita Popov [Fri, 19 Sep 2014 21:22:26 +0000 (23:22 +0200)]
Make number printing functions less generic
Now that zend_ulong is 64bit on 64bit platforms, it should be
sufficient to always use it, rather than supporting multiple
types.
API changes:
* _zend_print_unsigned_to_buf and _zend_print_signed_to_buf
no longer exist.
* smart_str(ing)_print_long and smart_str(ing)_print_unsigned
no longer exist.
* Instead of all these, zend_print_ulong_to_buf and
zend_print_long_to_buf should be used.
* smart_str_append_generic_ex no longer exists.
* smart_str(ing)_append_off_t(_ex) no longer exists, use
smart_str(ing)_append_long(_ex) instead.
Nikita Popov [Fri, 19 Sep 2014 20:59:58 +0000 (22:59 +0200)]
Use append_unsigned instead of append_long where appropriate
Nikita Popov [Fri, 19 Sep 2014 20:16:01 +0000 (22:16 +0200)]
Use inline functions for most of smart_str
smart_str_free_ex no longer exists, always use smart_str_free instead.
smart_str_alloc no longer requires a newlen variable to be in scope,
instead it returns the new length.
Nikita Popov [Fri, 19 Sep 2014 19:34:05 +0000 (21:34 +0200)]
Remove SMART_STR_USE_REALLOC
Nikita Popov [Fri, 19 Sep 2014 17:57:36 +0000 (19:57 +0200)]
Remove superfluous Z_REFCOUNTED_P check
The string is never interned and IS_CONSTANT_EX is always refcounted.
Anatol Belski [Fri, 19 Sep 2014 18:15:56 +0000 (20:15 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix possible array underflow
Conflicts:
ext/standard/image.c
Anatol Belski [Fri, 19 Sep 2014 18:13:46 +0000 (20:13 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix possible array underflow
Anatol Belski [Fri, 19 Sep 2014 18:12:24 +0000 (20:12 +0200)]
fix possible array underflow
there are multiple issues with this code
- php_stream_read() returns an unsigned val, so is >= 0
- if it read less than sizeof(a) bytes, the function operates on garbage
- result->channels is an unsigned val, so >= 0
Nikita Popov [Thu, 18 Sep 2014 22:01:05 +0000 (00:01 +0200)]
Split inheritance into separate file
This moves handling of inheritance and interface implementation
from zend_compile.c into a separate zend_inheritance.c file, as
this is not really related to compilation.
Anatol Belski [Fri, 19 Sep 2014 17:35:29 +0000 (19:35 +0200)]
updated the comment to charset_hint
Johannes Schlüter [Fri, 19 Sep 2014 16:33:14 +0000 (18:33 +0200)]
s/PHP 5/PHP 7/
Anatol Belski [Fri, 19 Sep 2014 14:26:32 +0000 (16:26 +0200)]
reverted too much
Anatol Belski [Fri, 19 Sep 2014 13:59:55 +0000 (15:59 +0200)]
reverted some previous IS_ABSOLUTE_PATH related changes
It's fine with strlen usage now, only one call
Anatol Belski [Fri, 19 Sep 2014 13:44:04 +0000 (15:44 +0200)]
expand IS_ABSOLUTE_PATH on Windows, so then strlen() isn't called twice
Anatol Belski [Fri, 19 Sep 2014 13:04:06 +0000 (15:04 +0200)]
simplify condition
Dmitry Stogov [Fri, 19 Sep 2014 13:32:50 +0000 (17:32 +0400)]
Avoid double IS_INTERNED() check
Dmitry Stogov [Fri, 19 Sep 2014 13:05:03 +0000 (17:05 +0400)]
Reverted incorrect chunk
Dmitry Stogov [Fri, 19 Sep 2014 11:41:01 +0000 (15:41 +0400)]
Fixed useless or duplicated IS_INTERNED() checks
Anatol Belski [Fri, 19 Sep 2014 11:14:16 +0000 (13:14 +0200)]
forgot to replace the strlen call
Anatol Belski [Fri, 19 Sep 2014 10:39:17 +0000 (12:39 +0200)]
avoid multiple strlen calls for the same buffer
Anatol Belski [Fri, 19 Sep 2014 10:36:23 +0000 (12:36 +0200)]
avoid unnecessary strlen calls in loop
Anatol Belski [Fri, 19 Sep 2014 10:14:46 +0000 (12:14 +0200)]
fix length data types
Anatol Belski [Fri, 19 Sep 2014 10:00:41 +0000 (12:00 +0200)]
fix signed/unsigned warning and add a note
Anatol Belski [Fri, 19 Sep 2014 09:42:44 +0000 (11:42 +0200)]
fix condition
Anatol Belski [Fri, 19 Sep 2014 09:23:23 +0000 (11:23 +0200)]
fix empty string check
Anatol Belski [Fri, 19 Sep 2014 08:33:01 +0000 (10:33 +0200)]
fix an always true condition and improve the error check
Anatol Belski [Fri, 19 Sep 2014 08:09:37 +0000 (10:09 +0200)]
remove useless condition
Anatol Belski [Fri, 19 Sep 2014 08:04:12 +0000 (10:04 +0200)]
fix printf format
Anatol Belski [Fri, 19 Sep 2014 07:49:32 +0000 (09:49 +0200)]
fix conditions
Anatol Belski [Fri, 19 Sep 2014 07:26:07 +0000 (09:26 +0200)]
there can be only one ... of the identical expressions
Anatol Belski [Fri, 19 Sep 2014 07:09:20 +0000 (09:09 +0200)]
fix condition
Anatol Belski [Fri, 19 Sep 2014 06:44:35 +0000 (08:44 +0200)]
fix printf format
Anatol Belski [Fri, 19 Sep 2014 06:35:01 +0000 (08:35 +0200)]
remove useless check
Anatol Belski [Thu, 18 Sep 2014 23:59:55 +0000 (01:59 +0200)]
more usages for ZEND_SECURE_ZERO()
Anatol Belski [Thu, 18 Sep 2014 23:46:14 +0000 (01:46 +0200)]
generalized the case with secure memory zeroing
Anatol Belski [Thu, 18 Sep 2014 20:25:00 +0000 (22:25 +0200)]
remove useless condition 0 > unsigned
Anatol Belski [Thu, 18 Sep 2014 20:18:27 +0000 (22:18 +0200)]
zero sensitive data more secure way
Anatol Belski [Thu, 18 Sep 2014 20:13:30 +0000 (22:13 +0200)]
zero sensitive data more secure way
Anatol Belski [Thu, 18 Sep 2014 20:06:38 +0000 (22:06 +0200)]
fix sprintf format
Anatol Belski [Thu, 18 Sep 2014 20:02:04 +0000 (22:02 +0200)]
zero sensitive data more secure way
Anatol Belski [Thu, 18 Sep 2014 19:49:08 +0000 (21:49 +0200)]
remove useless check
Anatol Belski [Thu, 18 Sep 2014 19:28:02 +0000 (21:28 +0200)]
avoid repeated strlen usage