archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
83560 commits 526 branches 1434 tags 877 MiB
Commit graph

47 commits

Author SHA1 Message Date
Stanislav Malyshev
7dde353ee7 Merge branch 'PHP-5.5' into PHP-5.6.23 
* PHP-5.5:
  Fixed bug #72446 - Integer Overflow in gdImagePaletteToTrueColor() resulting in heap overflow
  update NEWS
  fix tests
  fix build
  Fix bug #72455:  Heap Overflow due to integer overflows
  Fix bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm and unserialize
  Fixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and unserialize
  Fix bug #72407: NULL Pointer Dereference at _gdScaleVert
  Fix bug #72402: _php_mb_regex_ereg_replace_exec - double free
  Fix bug #72298	pass2_no_dither out-of-bounds access
  Fixed #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow
  Fix bug #72262 - do not overflow int
  Fix bug #72400 and #72403 - prevent signed int overflows for string lengths
  Fix bug #72275: don't allow smart_str to overflow int
  Fix bug #72340: Double Free Courruption in wddx_deserialize
  update NEWS
  Fix #66387: Stack overflow with imagefilltoborder
  Skip test which is 64bits only
  5.5.37 now

Conflicts:
	configure.in
	ext/mcrypt/mcrypt.c
	ext/spl/spl_directory.c
	main/php_version.h
 2016-06-21 00:01:48 -07:00
Stanislav Malyshev
489fd56fe3 Fix bug #72275: don't allow smart_str to overflow int 2016-06-14 00:02:17 -07:00
Lior Kaplan
49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02: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
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08: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
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Sebastian Bergmann
4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00
Ilia Alshanetsky
fd2726641b Revert previous optimization if preparation for 5.1.4 2006-05-03 13:32:10 +00:00
Ilia Alshanetsky
e95addcbfa Attempt to increase smart_str performance through the use of larger 
default buffers. Biased micro benchmarks show it makes sense :P
 2006-05-02 13:52:24 +00:00
foobar
5bd93221a8 bump year and license version 2006-01-01 12:51:34 +00:00
foobar
23e671a51e - Bumber up year 2005-08-03 14:08:58 +00:00
foobar
71ea389f74 Missing $Id$ tag 2005-01-10 15:20:53 +00:00
foobar
ccfc46b0aa - Happy new year and PHP 5 for rest of the files too.. 
# Should the LICENSE and Zend/LICENSE dates be updated too?
 2004-01-08 17:33:29 +00:00
Sascha Schumann
be4947b0e6 Use a smaller default size to accomodate the engine 
Submitted by: Stanislav Malyshev, with some massaging by me
 2003-06-18 16:15:47 +00:00
James Cox
f68c7ff249 updating license information in the headers. 2003-06-10 20:04:29 +00:00
Sascha Schumann
0bda867fe7 Simplify use of this header in external apps 2003-04-16 09:14:32 +00:00
Sascha Schumann
d0debaf45c Merge macro changes 2003-03-16 23:02:19 +00:00
Sebastian Bergmann
b506f5c8f8 Bump year. 2002-12-31 16:08:15 +00:00
Sascha Schumann
71a603ea32 Fix some 8bit issues with IRCG nickname encoding and 
Change the underlying interface of smart_str to accept unsigned char.
 2002-06-29 18:46:49 +00:00
Frank M. Kromann
c75e794ebe Kill a compiler warning on Win32 2002-05-08 03:56:43 +00:00
Sascha Schumann
303a784822 remove unnecessary casts 
# if you mind the bogus warnings, you can either switch the compiler
# or decrease the warning level
 2002-04-22 20:42:01 +00:00
Harald Radi
b29604fefc fixes a warning when compiling under win32 2002-04-22 18:02:01 +00:00
Sascha Schumann
d30fc27e5a simplify and improve speed of smart_str_print_long. 
also add a variant for unsigned numbers.
 2002-04-21 01:17:49 +00:00
Sascha Schumann
3757a81367 Remove trailing ; 
The macro can now safely be used in constructs such as

if (..) foo() else bar();
 2002-03-19 12:11:46 +00:00
Thies C. Arntzen
3550d75d0f fix #12793 - serialize will now spit a notice if the return value of __sleep is 
bogus.
 2002-03-19 11:25:21 +00:00
Sebastian Bergmann
90613d2282 Maintain headers. 2002-02-28 08:29:35 +00:00
Sebastian Bergmann
38933514e1 Update headers. 2001-12-11 15:32:16 +00:00
Sascha Schumann
01672af8f0 Improved fix 2001-08-20 15:27:45 +00:00
Stanislav Malyshev
902100a692 Fix long printing in smart_str_print_long 2001-08-20 15:26:10 +00:00
Zeev Suraski
c0404f4631 Whitespace 2001-08-11 17:03:37 +00:00
Sascha Schumann
d6dc2ba6bc Treat trailing zeroes correctly 2001-08-03 11:09:13 +00:00
Sascha Schumann
4dfa91543c Convert serializer to smart_str.. avoids lots of sprintf's and 
copying of data.
 2001-08-03 07:25:27 +00:00
Sascha Schumann
87d99aa93c Allow extensions to define custom prealloc sizes 2001-07-11 23:13:55 +00:00
Andi Gutmans
eb6ba01d1c - Fix copyright notices with 2001 2001-02-26 06:11:02 +00:00
Sascha Schumann
7911be587b Add all necessary includes for these header files. 2001-02-16 18:55:58 +00:00
Sascha Schumann
008d23bb5c Fix allocation 2000-11-14 20:34:14 +00:00
Sascha Schumann
c509dc6dc7 Add persistent memory handling to smart_str API 2000-11-14 15:36:18 +00:00
Sascha Schumann
8ef0d01baf Make the API more leaner (sp?) and get rid of *copy*. 2000-10-26 18:01:51 +00:00
Sascha Schumann
82d199b639 Move structure definition into its own file, so that public header 
files don't need to include the complete source code.
 2000-10-12 00:48:12 +00:00
Sascha Schumann
3823ad3ec0 Recognize single quotes around cdata. 
Move smart_str functions to an extra file.
 2000-09-27 15:26:39 +00:00