granicus.if.org Git

Fixed Bug #66815 imagecrop(): insufficient fix for NULL defer CVE-2013-7327

This amends commit 8f4a537, which aimed to correct NULL dereference because of
missing check of gdImageCreateTrueColor() / gdImageCreate() return value.  That
commit checks for negative crop rectangle width and height, but
gdImageCreate*() can also return NULL when width * height overflows.  Hence
NULL deref is still possible, as gdImageSaveAlpha() and gdImagePaletteCopy()
is called before dst == NULL check.

This moves NULL check to happen right after gdImageCreate*().  It also removes
width and height check before gdImageCreate*(), as the same check is done by
image create functions (with an extra warning).

From thoger redhat com

commit | commitdiff | tree

Remi Collet [Tue, 4 Mar 2014 19:39:11 +0000 (20:39 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  Fixed Bug #66820 out-of-bounds memory access in fileinfo

commit | commitdiff | tree

Remi Collet [Tue, 4 Mar 2014 19:39:00 +0000 (20:39 +0100)]

fix merge

commit | commitdiff | tree

Remi Collet [Tue, 4 Mar 2014 19:36:31 +0000 (20:36 +0100)]

NEWS

commit | commitdiff | tree

Remi Collet [Tue, 4 Mar 2014 19:36:08 +0000 (20:36 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
NEWS
Fixed Bug #66820 out-of-bounds memory access in fileinfo

commit | commitdiff | tree

Remi Collet [Tue, 4 Mar 2014 19:35:56 +0000 (20:35 +0100)]

NEWS

commit | commitdiff | tree

Remi Collet [Tue, 4 Mar 2014 19:32:52 +0000 (20:32 +0100)]

Fixed Bug #66820 out-of-bounds memory access in fileinfo

Upstream fix:
https://github.com/glensc/file/commit/447558595a3650db2886cd2f416ad0beba965801

Notice, test changed, with upstream agreement:
-define OFFSET_OOB(n, o, i) ((n) < (o) || (i) >= ((n) - (o)))
+define OFFSET_OOB(n, o, i) ((n) < (o) || (i) > ((n) - (o)))

commit | commitdiff | tree

Remi Collet [Tue, 4 Mar 2014 12:46:33 +0000 (13:46 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Improves fix for memory leak, keep in sync with upstream.

commit | commitdiff | tree

Remi Collet [Tue, 4 Mar 2014 12:46:21 +0000 (13:46 +0100)]

fix merge

commit | commitdiff | tree

Remi Collet [Tue, 4 Mar 2014 12:43:42 +0000 (13:43 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Improves fix for memory leak, keep in sync with upstream.

commit | commitdiff | tree

Remi Collet [Tue, 4 Mar 2014 12:41:37 +0000 (13:41 +0100)]

Improves fix for memory leak, keep in sync with upstream.

Previous fix:
http://git.php.net/?p=php-src.git;a=commitdiff;h=10eb0070700382f966bf260e44135e1f724a15d2

Upstream fix:
https://github.com/glensc/file/commit/c0c0032b9e9eb57b91fefef905a3b018bab492d9

commit | commitdiff | tree

Remi Collet [Mon, 3 Mar 2014 14:34:02 +0000 (15:34 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Add notice about tsrm_virtual_cwd.h moved to zend_virtual_cwd.h as this introduce need for awfull hacks...

commit | commitdiff | tree

Remi Collet [Mon, 3 Mar 2014 14:33:11 +0000 (15:33 +0100)]

Add notice about tsrm_virtual_cwd.h moved to zend_virtual_cwd.h
as this introduce need for awfull hacks...

commit | commitdiff | tree

Tjerk Meesters [Sun, 2 Mar 2014 22:00:01 +0000 (06:00 +0800)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Tjerk Meesters [Sun, 2 Mar 2014 21:59:07 +0000 (05:59 +0800)]

Fixed NEWS for #60602

commit | commitdiff | tree

Tjerk Meesters [Sun, 2 Mar 2014 21:58:03 +0000 (05:58 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Tjerk Meesters [Sun, 2 Mar 2014 21:57:36 +0000 (05:57 +0800)]

Fixed news for #60602

commit | commitdiff | tree

Tjerk Meesters [Sun, 2 Mar 2014 21:56:22 +0000 (05:56 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Tjerk Meesters [Sun, 2 Mar 2014 21:54:09 +0000 (05:54 +0800)]

Updated news for #60602

commit | commitdiff | tree

Tjerk Meesters [Thu, 10 Oct 2013 12:21:14 +0000 (20:21 +0800)]

proc_open(): separate environment values that aren't strings

Added a test case

commit | commitdiff | tree

Derick Rethans [Sun, 2 Mar 2014 19:18:58 +0000 (14:18 -0500)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Derick Rethans [Sun, 2 Mar 2014 19:17:16 +0000 (14:17 -0500)]

Added DateTimeImmutable::createFromMutable.

commit | commitdiff | tree

Derick Rethans [Sun, 2 Mar 2014 19:13:26 +0000 (14:13 -0500)]

Sort alphabetically

commit | commitdiff | tree

Derick Rethans [Sun, 2 Mar 2014 18:27:35 +0000 (13:27 -0500)]

Fixed NEWS.

commit | commitdiff | tree

Daniel Lowrey [Sun, 2 Mar 2014 17:39:03 +0000 (10:39 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Capture peer cert even if verify fails
Windows cert verify improvements + leak fixes

commit | commitdiff | tree

Daniel Lowrey [Sun, 2 Mar 2014 14:03:39 +0000 (07:03 -0700)]

Capture peer cert even if verify fails

Previously the "capture_peer_cert" SSL context option only
captured the peer's certificate if the verification routine
succeeded.

By also capturing the on verify failure applications have the
ability to parse the cert and ask users whether they wish to
proceed given the information presented by the peer.

commit | commitdiff | tree

Chris Wright [Sun, 2 Mar 2014 01:57:20 +0000 (01:57 +0000)]

Windows cert verify improvements + leak fixes

- Clean up properly at all fail points in native Windows peer
verification routine
- Bring certificate usages and chain flags into line with chromium
implementation in windows environments

commit | commitdiff | tree

Anatol Belski [Sun, 2 Mar 2014 11:49:58 +0000 (12:49 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
turn off some false positives

commit | commitdiff | tree

Anatol Belski [Sun, 2 Mar 2014 11:49:30 +0000 (12:49 +0100)]

turn off some false positives

commit | commitdiff | tree

Anatol Belski [Sat, 1 Mar 2014 19:18:44 +0000 (20:18 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
support for static analyzers other than visual studio

commit | commitdiff | tree

Anatol Belski [Sat, 1 Mar 2014 19:15:10 +0000 (20:15 +0100)]

support for static analyzers other than visual studio

commit | commitdiff | tree

Anatol Belski [Sat, 1 Mar 2014 12:28:24 +0000 (13:28 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix wording
Updated news for #66535 and #66109

commit | commitdiff | tree

Anatol Belski [Sat, 1 Mar 2014 12:28:02 +0000 (13:28 +0100)]

fix wording

commit | commitdiff | tree

Anatol Belski [Sat, 1 Mar 2014 12:16:16 +0000 (13:16 +0100)]

Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

commit | commitdiff | tree

Anatol Belski [Sat, 1 Mar 2014 12:12:08 +0000 (13:12 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
reveal more info on the configure options

commit | commitdiff | tree

Anatol Belski [Sat, 1 Mar 2014 12:11:35 +0000 (13:11 +0100)]

reveal more info on the configure options

commit | commitdiff | tree

Tjerk Meesters [Sat, 1 Mar 2014 04:27:36 +0000 (12:27 +0800)]

Updated news for #66535 and #66109

commit | commitdiff | tree

Tjerk Meesters [Sat, 1 Mar 2014 04:27:22 +0000 (12:27 +0800)]

Updated news for #66535 and #66109

commit | commitdiff | tree

Tjerk Meesters [Sat, 1 Mar 2014 00:47:32 +0000 (08:47 +0800)]

Updated NEWS for #66535

commit | commitdiff | tree

Anatol Belski [Fri, 28 Feb 2014 18:39:50 +0000 (19:39 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
don't compare constants on run time

commit | commitdiff | tree

Anatol Belski [Fri, 28 Feb 2014 18:39:34 +0000 (19:39 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
don't compare constants on run time

commit | commitdiff | tree

Anatol Belski [Fri, 28 Feb 2014 18:38:32 +0000 (19:38 +0100)]

don't compare constants on run time

commit | commitdiff | tree

Tjerk Meesters [Fri, 28 Feb 2014 15:50:27 +0000 (23:50 +0800)]

Merge branch 'PHP-5.6'

* PHP-5.6:
substr_compare(): Allow zero length comparison

commit | commitdiff | tree

Tjerk Meesters [Fri, 28 Feb 2014 15:48:34 +0000 (23:48 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
substr_compare(): Allow zero length comparison

commit | commitdiff | tree

datibbaw [Fri, 21 Feb 2014 02:24:52 +0000 (10:24 +0800)]

substr_compare(): Allow zero length comparison

Treat zero length comparison as always equal.

commit | commitdiff | tree

Tjerk Meesters [Fri, 28 Feb 2014 14:33:08 +0000 (22:33 +0800)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed test case title
[bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given

commit | commitdiff | tree

Tjerk Meesters [Fri, 28 Feb 2014 14:31:16 +0000 (22:31 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed test case title
[bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given

commit | commitdiff | tree

Tjerk Meesters [Fri, 28 Feb 2014 14:30:21 +0000 (22:30 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed test case title
[bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given

commit | commitdiff | tree

Tjerk Meesters [Fri, 28 Feb 2014 14:27:32 +0000 (22:27 +0800)]

Fixed test case title

commit | commitdiff | tree

Tjerk Meesters [Fri, 28 Feb 2014 14:22:07 +0000 (22:22 +0800)]

[bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given

A newline is added to the mail headers when mail.add_x_header is used and no other headers are passed to mail().

The scenario in which custom headers are used was already fixed in #48620, back in 2009.

commit | commitdiff | tree

Tjerk Meesters [Fri, 28 Feb 2014 11:14:18 +0000 (19:14 +0800)]

Merge branch '5.6'

* 5.6:
Fixed expected output of a few cURL test cases
Allow NULL as value for CURLOPT_CUSTOMREQUEST option.

commit | commitdiff | tree

Tjerk Meesters [Fri, 28 Feb 2014 11:01:17 +0000 (19:01 +0800)]

Merge branch '5.5' into 5.6

* 5.5:
Fixed expected output of a few cURL test cases
Allow NULL as value for CURLOPT_CUSTOMREQUEST option.

commit | commitdiff | tree

Tjerk Meesters [Fri, 28 Feb 2014 10:59:06 +0000 (18:59 +0800)]

Fixed expected output of a few cURL test cases

commit | commitdiff | tree

datibbaw [Mon, 18 Nov 2013 04:06:27 +0000 (12:06 +0800)]

Allow NULL as value for CURLOPT_CUSTOMREQUEST option.

Added test case.

Refactored the code to isolate the string handling. Fixed return values to use SUCCESS and FAILURE.

Removed unused error variable.

Indentation fix.
Removed the ugly goto.

commit | commitdiff | tree

Anatol Belski [Fri, 28 Feb 2014 08:45:02 +0000 (09:45 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
primitive test fixes

commit | commitdiff | tree

Anatol Belski [Fri, 28 Feb 2014 08:43:57 +0000 (09:43 +0100)]

primitive test fixes

commit | commitdiff | tree

Remi Collet [Fri, 28 Feb 2014 07:12:38 +0000 (08:12 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
man page: long option name is --strip, not --stripped
--global have be removed in 5.2

commit | commitdiff | tree

Remi Collet [Fri, 28 Feb 2014 07:12:26 +0000 (08:12 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
man page: long option name is --strip, not --stripped
--global have be removed in 5.2

commit | commitdiff | tree

Remi Collet [Fri, 28 Feb 2014 07:12:16 +0000 (08:12 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
man page: long option name is --strip, not --stripped
--global have be removed in 5.2

commit | commitdiff | tree

Remi Collet [Fri, 28 Feb 2014 07:12:03 +0000 (08:12 +0100)]

man page: long option name is --strip, not --stripped

commit | commitdiff | tree

Remi Collet [Fri, 28 Feb 2014 07:10:01 +0000 (08:10 +0100)]

--global have be removed in 5.2

commit | commitdiff | tree

Anatol Belski [Thu, 27 Feb 2014 14:51:28 +0000 (15:51 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
remove pcntl leftover from the test code

commit | commitdiff | tree

Anatol Belski [Thu, 27 Feb 2014 14:50:17 +0000 (15:50 +0100)]

remove pcntl leftover from the test code

commit | commitdiff | tree

Ferenc Kovacs [Thu, 27 Feb 2014 11:54:53 +0000 (12:54 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
list the fpm change hat rfc in UPGRADING

commit | commitdiff | tree

Ferenc Kovacs [Thu, 27 Feb 2014 11:54:07 +0000 (12:54 +0100)]

list the fpm change hat rfc in UPGRADING

commit | commitdiff | tree

Ferenc Kovacs [Thu, 27 Feb 2014 11:43:58 +0000 (12:43 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
mention the apparmor support in fpm

commit | commitdiff | tree

Ferenc Kovacs [Thu, 27 Feb 2014 11:43:42 +0000 (12:43 +0100)]

mention the apparmor support in fpm

commit | commitdiff | tree

Ferenc Kovacs [Thu, 27 Feb 2014 10:31:04 +0000 (11:31 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
typo spotted by Lajos Veres

commit | commitdiff | tree

Ferenc Kovacs [Thu, 27 Feb 2014 10:30:23 +0000 (11:30 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
typo spotted by Lajos Veres

commit | commitdiff | tree

Ferenc Kovacs [Thu, 27 Feb 2014 10:28:46 +0000 (11:28 +0100)]

typo spotted by Lajos Veres

commit | commitdiff | tree

Anatol Belski [Thu, 27 Feb 2014 08:27:06 +0000 (09:27 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
update libs_version.txt
update libs_version.txt

commit | commitdiff | tree

Anatol Belski [Thu, 27 Feb 2014 08:26:48 +0000 (09:26 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
update libs_version.txt

Conflicts:
win32/build/libs_version.txt

commit | commitdiff | tree

Anatol Belski [Thu, 27 Feb 2014 08:25:15 +0000 (09:25 +0100)]

update libs_version.txt

commit | commitdiff | tree

Anatol Belski [Thu, 27 Feb 2014 08:23:48 +0000 (09:23 +0100)]

update libs_version.txt

commit | commitdiff | tree

Remi Collet [Thu, 27 Feb 2014 07:50:41 +0000 (08:50 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  NEWS
  test for bug #66762
  Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed

commit | commitdiff | tree

Remi Collet [Thu, 27 Feb 2014 07:50:29 +0000 (08:50 +0100)]

NEWS

commit | commitdiff | tree

Remi Collet [Thu, 27 Feb 2014 07:50:07 +0000 (08:50 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  test for bug #66762
  Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed

commit | commitdiff | tree

Remi Collet [Thu, 27 Feb 2014 07:49:56 +0000 (08:49 +0100)]

NEWS

commit | commitdiff | tree

Remi Collet [Thu, 27 Feb 2014 07:49:33 +0000 (08:49 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS
  test for bug #66762
  Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed

commit | commitdiff | tree

Remi Collet [Thu, 27 Feb 2014 07:49:08 +0000 (08:49 +0100)]

NEWS

commit | commitdiff | tree

Remi Collet [Thu, 27 Feb 2014 07:48:01 +0000 (08:48 +0100)]

test for bug #66762

commit | commitdiff | tree

Remi Collet [Thu, 27 Feb 2014 07:45:16 +0000 (08:45 +0100)]

Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed

Each new mysqli_stmt now increase the refcount of the link object.
So the link is really destroy after all statements.

Only implemented with libmysqlclient, as mysqlnd already implement
this internally.

So, libmysqlclient and mysqlnd have the same behavior.

commit | commitdiff | tree

Ferenc Kovacs [Thu, 27 Feb 2014 01:33:20 +0000 (02:33 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627

commit | commitdiff | tree

Ferenc Kovacs [Thu, 27 Feb 2014 01:32:47 +0000 (02:32 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627

commit | commitdiff | tree

Ferenc Kovacs [Thu, 27 Feb 2014 01:32:07 +0000 (02:32 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627

commit | commitdiff | tree

Ferenc Kovacs [Thu, 27 Feb 2014 01:31:42 +0000 (02:31 +0100)]

fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627

commit | commitdiff | tree

Ferenc Kovacs [Thu, 27 Feb 2014 00:29:21 +0000 (01:29 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  add missing NEWS entry
  add missing NEWS entry
  add missing NEWS entry
  add missing NEWS entry
  add missing NEWS entry
  add missing NEWS entry

commit | commitdiff | tree

Ferenc Kovacs [Thu, 27 Feb 2014 00:28:57 +0000 (01:28 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
add missing NEWS entry

commit | commitdiff | tree

Ferenc Kovacs [Thu, 27 Feb 2014 00:26:23 +0000 (01:26 +0100)]

add missing NEWS entry

commit | commitdiff | tree

Ferenc Kovacs [Thu, 27 Feb 2014 00:23:58 +0000 (01:23 +0100)]

add missing NEWS entry

commit | commitdiff | tree

Ferenc Kovacs [Thu, 27 Feb 2014 00:22:15 +0000 (01:22 +0100)]

add missing NEWS entry