granicus.if.org Git

Remove effectless --enable-gd-native-ttf and USE_GD_IMGSTRTTF

--enable-gd-native-ttf did set USE_GD_IMGSTRTTF, which is otherwise unused
as of commit 8a90aad3 (i.e. PHP 5.5.0), at least.

commit | commitdiff | tree

Adam Baratz [Tue, 13 Sep 2016 21:16:46 +0000 (17:16 -0400)]

Merge branch 'PHP-7.1'

* PHP-7.1:
  Add special case for earlier versions of TDS
  Adjust error formatting so ext/pdo/tests/bug_43130.phpt passes with pdo_dblib
  Free error and message strings when cleaning up PDO instances that use pdo_dblib
  Add common suite

commit | commitdiff | tree

Adam Baratz [Tue, 13 Sep 2016 21:02:53 +0000 (17:02 -0400)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Add special case for earlier versions of TDS
  Adjust error formatting so ext/pdo/tests/bug_43130.phpt passes with pdo_dblib
  Free error and message strings when cleaning up PDO instances that use pdo_dblib
  Add common suite

commit | commitdiff | tree

Adam Baratz [Tue, 13 Sep 2016 21:01:51 +0000 (17:01 -0400)]

Add special case for earlier versions of TDS

commit | commitdiff | tree

Adam Baratz [Tue, 13 Sep 2016 20:43:33 +0000 (16:43 -0400)]

Adjust error formatting so ext/pdo/tests/bug_43130.phpt passes with pdo_dblib

commit | commitdiff | tree

Adam Baratz [Tue, 13 Sep 2016 20:43:30 +0000 (16:43 -0400)]

Free error and message strings when cleaning up PDO instances that use pdo_dblib

commit | commitdiff | tree

Adam Baratz [Tue, 13 Sep 2016 20:43:25 +0000 (16:43 -0400)]

Add common suite

commit | commitdiff | tree

Adam Baratz [Tue, 13 Sep 2016 20:39:29 +0000 (16:39 -0400)]

Merge branch 'PHP-7.1'

* PHP-7.1:
  Explicitly allow NULL values for dblib compatibility
  Add dblib-specific query
  Remove test cases don't test distinct behavior

commit | commitdiff | tree

Adam Baratz [Tue, 13 Sep 2016 20:38:56 +0000 (16:38 -0400)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Explicitly allow NULL values for dblib compatibility
  Add dblib-specific query
  Remove test cases don't test distinct behavior

commit | commitdiff | tree

Adam Baratz [Tue, 13 Sep 2016 17:15:06 +0000 (13:15 -0400)]

Explicitly allow NULL values for dblib compatibility

MSSQL won't necessarily default columns to NULL, see:
https://msdn.microsoft.com/en-us/library/ms174979.aspx

commit | commitdiff | tree

Adam Baratz [Tue, 13 Sep 2016 17:11:34 +0000 (13:11 -0400)]

Add dblib-specific query

commit | commitdiff | tree

Adam Baratz [Tue, 13 Sep 2016 17:09:41 +0000 (13:09 -0400)]

Remove test cases don't test distinct behavior

These cases are also incompatible with pdo_dblib. Removing is easier.

commit | commitdiff | tree

Adam Baratz [Tue, 13 Sep 2016 20:34:27 +0000 (16:34 -0400)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Handle SQLDECIMAL/SQLNUMERIC types, which are used by later TDS versions

commit | commitdiff | tree

Adam Baratz [Tue, 13 Sep 2016 20:33:18 +0000 (16:33 -0400)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Handle SQLDECIMAL/SQLNUMERIC types, which are used by later TDS versions

commit | commitdiff | tree

Adam Baratz [Tue, 13 Sep 2016 20:26:38 +0000 (16:26 -0400)]

Handle SQLDECIMAL/SQLNUMERIC types, which are used by later TDS versions

commit | commitdiff | tree

Adam Baratz [Tue, 13 Sep 2016 20:19:25 +0000 (16:19 -0400)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Allow \PDO::setAttribute() to set pdo_dblib query timeouts

commit | commitdiff | tree

Adam Baratz [Tue, 13 Sep 2016 20:14:55 +0000 (16:14 -0400)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Allow \PDO::setAttribute() to set pdo_dblib query timeouts

commit | commitdiff | tree

Adam Baratz [Tue, 13 Sep 2016 19:24:28 +0000 (15:24 -0400)]

Allow \PDO::setAttribute() to set pdo_dblib query timeouts

commit | commitdiff | tree

Jakub Zelenka [Tue, 13 Sep 2016 17:28:56 +0000 (18:28 +0100)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Jakub Zelenka [Tue, 13 Sep 2016 17:27:55 +0000 (18:27 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Jakub Zelenka [Tue, 13 Sep 2016 17:17:04 +0000 (18:17 +0100)]

Merge branch 'PHP-5.6' into PHP-7.0

commit | commitdiff | tree

Jakub Zelenka [Tue, 13 Sep 2016 17:15:34 +0000 (18:15 +0100)]

Fix bug #73072 (Invalid path SNI_server_certs causes segfault)

commit | commitdiff | tree

Dmitry Stogov [Tue, 13 Sep 2016 14:10:30 +0000 (17:10 +0300)]

Micro-optimization

commit | commitdiff | tree

Christoph M. Becker [Tue, 13 Sep 2016 14:00:36 +0000 (16:00 +0200)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Christoph M. Becker [Tue, 13 Sep 2016 14:00:01 +0000 (16:00 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Christoph M. Becker [Tue, 13 Sep 2016 13:59:12 +0000 (15:59 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

commit | commitdiff | tree

Christoph M. Becker [Tue, 13 Sep 2016 13:57:39 +0000 (15:57 +0200)]

Merge branch 'pull-request/2126' into PHP-5.6

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 13:56:37 +0000 (15:56 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
update NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 13:56:16 +0000 (15:56 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
update NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 13:55:31 +0000 (15:55 +0200)]

update NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 13:47:21 +0000 (15:47 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
update NEWS
upgrade bundled sqlite to 3.14.2

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 13:46:55 +0000 (15:46 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
update NEWS
upgrade bundled sqlite to 3.14.2

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 13:45:18 +0000 (15:45 +0200)]

update NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 13:42:33 +0000 (15:42 +0200)]

upgrade bundled sqlite to 3.14.2

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 13:31:02 +0000 (15:31 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
add test for bug #73068

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 13:30:35 +0000 (15:30 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
add test for bug #73068

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 13:29:46 +0000 (15:29 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
add test for bug #73068

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 13:28:28 +0000 (15:28 +0200)]

add test for bug #73068

commit | commitdiff | tree

Christoph M. Becker [Tue, 13 Sep 2016 11:40:48 +0000 (13:40 +0200)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Christoph M. Becker [Tue, 13 Sep 2016 11:30:11 +0000 (13:30 +0200)]

Update to SQLite 3.14.2

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 10:35:22 +0000 (12:35 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
update NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 10:34:55 +0000 (12:34 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
update NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 10:34:03 +0000 (12:34 +0200)]

update NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 10:11:11 +0000 (12:11 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
fix test portability

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 10:09:50 +0000 (12:09 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
fix test portability

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 10:02:05 +0000 (12:02 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
fix test portability

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 10:00:29 +0000 (12:00 +0200)]

fix test portability

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 09:51:43 +0000 (11:51 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
pick up the safe alloc pieces from 19866fb76cf4c95d904ebb0e08592cf38303fae9

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 09:51:17 +0000 (11:51 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
pick up the safe alloc pieces from 19866fb76cf4c95d904ebb0e08592cf38303fae9

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 09:50:18 +0000 (11:50 +0200)]

pick up the safe alloc pieces from
19866fb76cf4c95d904ebb0e08592cf38303fae9

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 08:58:22 +0000 (10:58 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
  missed semicolon
  fix C89 conformity
  Fix bug #72293 - Heap overflow in mysqlnd related to BIT fields
  Fix test
  Fix bug #73065: Out-Of-Bounds Read in php_wddx_push_element of wddx.c
  Fix bug #73035 (Out of bound when verify signature of tar phar in phar_parse_tarfile)
  Fix bug #73052 - Memory Corruption in During Deserialized-object Destruction
  Add check in fgetcsv in case sizeof(unit) != sizeof(size_t)
  Fix bug #73029 - Missing type check when unserializing SplArray
  Fix bug #72860: wddx_deserialize use-after-free
  Also fix overflow in wordwrap
  Fix bug #73007: add locale length check
  Add more checks for int overflow
  Fix bug #72928 - Out of bound when verify signature of zip phar in phar_parse_zipfile
  Fix various int size overflows.

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 08:57:03 +0000 (10:57 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  missed semicolon
  fix C89 conformity
  Fix bug #72293 - Heap overflow in mysqlnd related to BIT fields
  Fix test
  Fix bug #73065: Out-Of-Bounds Read in php_wddx_push_element of wddx.c
  Fix bug #73035 (Out of bound when verify signature of tar phar in phar_parse_tarfile)
  Fix bug #73052 - Memory Corruption in During Deserialized-object Destruction
  Add check in fgetcsv in case sizeof(unit) != sizeof(size_t)
  Fix bug #73029 - Missing type check when unserializing SplArray
  Fix bug #72860: wddx_deserialize use-after-free
  Also fix overflow in wordwrap
  Fix bug #73007: add locale length check
  Add more checks for int overflow
  Fix bug #72928 - Out of bound when verify signature of zip phar in phar_parse_zipfile
  Fix various int size overflows.

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 08:54:54 +0000 (10:54 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  missed semicolon
  fix C89 conformity
  Fix bug #72293 - Heap overflow in mysqlnd related to BIT fields
  Fix test
  Fix bug #73065: Out-Of-Bounds Read in php_wddx_push_element of wddx.c
  Fix bug #73035 (Out of bound when verify signature of tar phar in phar_parse_tarfile)
  Fix bug #73052 - Memory Corruption in During Deserialized-object Destruction
  Add check in fgetcsv in case sizeof(unit) != sizeof(size_t)
  Fix bug #73029 - Missing type check when unserializing SplArray
  Fix bug #72860: wddx_deserialize use-after-free
  Also fix overflow in wordwrap
  Fix bug #73007: add locale length check
  Add more checks for int overflow
  Fix bug #72928 - Out of bound when verify signature of zip phar in phar_parse_zipfile
  Fix various int size overflows.

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 08:50:44 +0000 (10:50 +0200)]

missed semicolon

commit | commitdiff | tree

Anatol Belski [Tue, 13 Sep 2016 08:43:51 +0000 (10:43 +0200)]

fix C89 conformity

commit | commitdiff | tree

Stanislav Malyshev [Tue, 13 Sep 2016 04:11:01 +0000 (21:11 -0700)]

Merge branch 'PHP-7.1'

* PHP-7.1: (23 commits)
  Fix bug #72293 - Heap overflow in mysqlnd related to BIT fields
  Fix bug #72293 - Heap overflow in mysqlnd related to BIT fields
  I don't think 8cceb012a7aabf3c36ab7c2724a436f976cdd165 is needed
  Fix test
  Add check in fgetcsv in case sizeof(unit) != sizeof(size_t)
  Fix bug #73065: Out-Of-Bounds Read in php_wddx_push_element of wddx.c
  Fix bug #73035 (Out of bound when verify signature of tar phar in phar_parse_tarfile)
  Fix bug #73052 - Memory Corruption in During Deserialized-object Destruction
  Fix bug #73029 - Missing type check when unserializing SplArray
  Fix bug #72860: wddx_deserialize use-after-free
  Fix bug #73007: add locale length check
  Fix bug #72928 - Out of bound when verify signature of zip phar in phar_parse_zipfile
  sync NEWS
  Revert "Merge branch 'PHP-5.6' into PHP-7.0"
  Merge branch 'PHP-5.6' into PHP-7.0
  Merge branch 'PHP-5.6' into PHP-7.0
  Revert "Revert "Merge branch 'PHP-5.6' into PHP-7.0""
  fix version
  sync NEWS
  Fix bug #72957
  ...

commit | commitdiff | tree

Stanislav Malyshev [Tue, 13 Sep 2016 04:10:34 +0000 (21:10 -0700)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0: (22 commits)
  Fix bug #72293 - Heap overflow in mysqlnd related to BIT fields
  I don't think 8cceb012a7aabf3c36ab7c2724a436f976cdd165 is needed
  Fix test
  Add check in fgetcsv in case sizeof(unit) != sizeof(size_t)
  Fix bug #73065: Out-Of-Bounds Read in php_wddx_push_element of wddx.c
  Fix bug #73035 (Out of bound when verify signature of tar phar in phar_parse_tarfile)
  Fix bug #73052 - Memory Corruption in During Deserialized-object Destruction
  Fix bug #73029 - Missing type check when unserializing SplArray
  Fix bug #72860: wddx_deserialize use-after-free
  Fix bug #73007: add locale length check
  Fix bug #72928 - Out of bound when verify signature of zip phar in phar_parse_zipfile
  sync NEWS
  Revert "Merge branch 'PHP-5.6' into PHP-7.0"
  Merge branch 'PHP-5.6' into PHP-7.0
  Merge branch 'PHP-5.6' into PHP-7.0
  Revert "Revert "Merge branch 'PHP-5.6' into PHP-7.0""
  fix version
  sync NEWS
  Fix bug #72957
  set versions
  ...

commit | commitdiff | tree

Stanislav Malyshev [Tue, 13 Sep 2016 04:09:30 +0000 (21:09 -0700)]

Merge branch 'PHP-7.0.11' into PHP-7.0

* PHP-7.0.11: (22 commits)
  Fix bug #72293 - Heap overflow in mysqlnd related to BIT fields
  I don't think 8cceb012a7aabf3c36ab7c2724a436f976cdd165 is needed
  Fix test
  Add check in fgetcsv in case sizeof(unit) != sizeof(size_t)
  Fix bug #73065: Out-Of-Bounds Read in php_wddx_push_element of wddx.c
  Fix bug #73035 (Out of bound when verify signature of tar phar in phar_parse_tarfile)
  Fix bug #73052 - Memory Corruption in During Deserialized-object Destruction
  Fix bug #73029 - Missing type check when unserializing SplArray
  Fix bug #72860: wddx_deserialize use-after-free
  Fix bug #73007: add locale length check
  Fix bug #72928 - Out of bound when verify signature of zip phar in phar_parse_zipfile
  sync NEWS
  Revert "Merge branch 'PHP-5.6' into PHP-7.0"
  Merge branch 'PHP-5.6' into PHP-7.0
  Merge branch 'PHP-5.6' into PHP-7.0
  Revert "Revert "Merge branch 'PHP-5.6' into PHP-7.0""
  fix version
  sync NEWS
  Fix bug #72957
  set versions
  ...

commit | commitdiff | tree

Stanislav Malyshev [Tue, 13 Sep 2016 04:07:44 +0000 (21:07 -0700)]

Fix bug #72293 - Heap overflow in mysqlnd related to BIT fields

commit | commitdiff | tree

Stanislav Malyshev [Tue, 13 Sep 2016 03:25:08 +0000 (20:25 -0700)]

Fix bug #72293 - Heap overflow in mysqlnd related to BIT fields

commit | commitdiff | tree

Stanislav Malyshev [Tue, 13 Sep 2016 03:12:41 +0000 (20:12 -0700)]

Fix test

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 Sep 2016 07:35:01 +0000 (00:35 -0700)]

Fix bug #73065: Out-Of-Bounds Read in php_wddx_push_element of wddx.c

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 Sep 2016 04:37:44 +0000 (21:37 -0700)]

Fix bug #73035 (Out of bound when verify signature of tar phar in phar_parse_tarfile)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 Sep 2016 04:19:29 +0000 (21:19 -0700)]

Fix bug #73052 - Memory Corruption in During Deserialized-object Destruction

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 Sep 2016 03:58:55 +0000 (20:58 -0700)]

Add check in fgetcsv in case sizeof(unit) != sizeof(size_t)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 Sep 2016 03:24:13 +0000 (20:24 -0700)]

Fix bug #73029 - Missing type check when unserializing SplArray

commit | commitdiff | tree

Stanislav Malyshev [Tue, 6 Sep 2016 06:42:31 +0000 (23:42 -0700)]

Fix bug #72860: wddx_deserialize use-after-free

commit | commitdiff | tree

Stanislav Malyshev [Tue, 6 Sep 2016 01:10:51 +0000 (18:10 -0700)]

Also fix overflow in wordwrap

commit | commitdiff | tree

Stanislav Malyshev [Tue, 6 Sep 2016 01:01:35 +0000 (18:01 -0700)]

Fix bug #73007: add locale length check

commit | commitdiff | tree

Stanislav Malyshev [Mon, 5 Sep 2016 05:18:19 +0000 (22:18 -0700)]

Add more checks for int overflow

commit | commitdiff | tree

Stanislav Malyshev [Mon, 5 Sep 2016 05:07:35 +0000 (22:07 -0700)]

Fix bug #72928 - Out of bound when verify signature of zip phar in phar_parse_zipfile

commit | commitdiff | tree

Stanislav Malyshev [Fri, 2 Sep 2016 06:15:34 +0000 (23:15 -0700)]

Fix various int size overflows.

Add function for detection of string zvals with length that does not fit
INT_MAX.

commit | commitdiff | tree

Stanislav Malyshev [Tue, 13 Sep 2016 03:28:50 +0000 (20:28 -0700)]

Fix bug #72293 - Heap overflow in mysqlnd related to BIT fields

commit | commitdiff | tree

Stanislav Malyshev [Tue, 13 Sep 2016 03:15:22 +0000 (20:15 -0700)]

I don't think 8cceb012a7aabf3c36ab7c2724a436f976cdd165 is needed

commit | commitdiff | tree

Stanislav Malyshev [Tue, 13 Sep 2016 03:12:41 +0000 (20:12 -0700)]

Fix test

commit | commitdiff | tree

Xinchen Hui [Tue, 13 Sep 2016 02:59:41 +0000 (10:59 +0800)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Update NEWS
Fixed bug #73067 (__debugInfo crashes when throwing an exception)

commit | commitdiff | tree

Xinchen Hui [Tue, 13 Sep 2016 02:59:30 +0000 (10:59 +0800)]

Update NEWS

commit | commitdiff | tree

Xinchen Hui [Tue, 13 Sep 2016 02:59:09 +0000 (10:59 +0800)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed bug #73067 (__debugInfo crashes when throwing an exception)

commit | commitdiff | tree

Xinchen Hui [Tue, 13 Sep 2016 02:58:57 +0000 (10:58 +0800)]

Fixed bug #73067 (__debugInfo crashes when throwing an exception)

commit | commitdiff | tree

Adam Baratz [Mon, 12 Sep 2016 21:44:33 +0000 (17:44 -0400)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Never quote values as raw binary data

commit | commitdiff | tree

Adam Baratz [Mon, 12 Sep 2016 21:36:33 +0000 (17:36 -0400)]

Merge branch 'PHP-7.0'

* PHP-7.0:
Never quote values as raw binary data

commit | commitdiff | tree

Adam Baratz [Mon, 12 Sep 2016 21:32:50 +0000 (17:32 -0400)]

Never quote values as raw binary data

This reverts a1a18fca6e2a1690ea113dc2ebe0e7d22fdc71a0 which was intended to fix
bug #52885. That commit introduced a BC break which wasn't universally
desirable. The issue of quoting binary data (or NVARCHAR strings, or other
nonstandard types) will have to be addressed separately.

commit | commitdiff | tree

Christoph M. Becker [Mon, 12 Sep 2016 20:37:32 +0000 (22:37 +0200)]

Refactor according to libgd

Cf. <https://github.com/libgd/libgd/commit/a3016ad0>.

commit | commitdiff | tree

Anatol Belski [Mon, 12 Sep 2016 16:59:38 +0000 (18:59 +0200)]

Add check in fgetcsv in case sizeof(unit) != sizeof(size_t)

(cherry picked from commit 99ac11222cb2a4e9aa6a865f908b28def349c049)

Conflicts:
ext/standard/file.c

commit | commitdiff | tree

Adam Baratz [Fri, 9 Sep 2016 21:00:50 +0000 (17:00 -0400)]

Add myself as pdo_dblib maintainer

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 Sep 2016 07:35:01 +0000 (00:35 -0700)]

Fix bug #73065: Out-Of-Bounds Read in php_wddx_push_element of wddx.c

(cherry picked from commit bbaf784f8d213e201baf67e861f20b38c6e87d3b)

Conflicts:
ext/wddx/wddx.c

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 Sep 2016 04:37:44 +0000 (21:37 -0700)]

Fix bug #73035 (Out of bound when verify signature of tar phar in phar_parse_tarfile)

(cherry picked from commit 75ebf471ff46ec6e5ee279b3650c11d51ebaf9e3)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 Sep 2016 04:19:29 +0000 (21:19 -0700)]

Fix bug #73052 - Memory Corruption in During Deserialized-object Destruction

(cherry picked from commit b6e1e5e0b3e6221c7b14fa10cba30f5c5e719e1b)

Conflicts:
Zend/zend_objects_API.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 Sep 2016 03:24:13 +0000 (20:24 -0700)]

Fix bug #73029 - Missing type check when unserializing SplArray

(cherry picked from commit 6d16288150be33392a3249e417a0929881feb9a2)

Conflicts:
ext/spl/spl_array.c

commit | commitdiff | tree

Stanislav Malyshev [Tue, 6 Sep 2016 06:42:31 +0000 (23:42 -0700)]

Fix bug #72860: wddx_deserialize use-after-free

(cherry picked from commit ee552853ff4d72f626102025133e2cd1575043ee)

Conflicts:
ext/wddx/wddx.c

commit | commitdiff | tree

Stanislav Malyshev [Tue, 6 Sep 2016 01:01:35 +0000 (18:01 -0700)]

Fix bug #73007: add locale length check

(cherry picked from commit 9e07089626f373d0e7b24b7aeb8b8459aae5f5f8)

Conflicts:
ext/intl/msgformat/msgformat_format.c

commit | commitdiff | tree

Stanislav Malyshev [Mon, 5 Sep 2016 05:07:35 +0000 (22:07 -0700)]

Fix bug #72928 - Out of bound when verify signature of zip phar in phar_parse_zipfile

(cherry picked from commit 19484ab77466f99c78fc0e677f7e03da0584d6a2)

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom