From fb3e21fbcc4d723098052e779b444e7ee1d27ae2 Mon Sep 17 00:00:00 2001
From: Pierre Joye <pierre.php@gmail.com>
Date: Mon, 4 Nov 2013 22:25:50 +0100
Subject: [PATCH 1/3] add vc12 (2013)

---
 win32/build/confutils.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index d9a0c1b5f1e..2575205e5e4 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -47,6 +47,7 @@ VC_VERSIONS[1400] = 'MSVC8 (Visual C++ 2005)';
 VC_VERSIONS[1500] = 'MSVC9 (Visual C++ 2008)';
 VC_VERSIONS[1600] = 'MSVC10 (Visual C++ 2010)';
 VC_VERSIONS[1700] = 'MSVC11 (Visual C++ 2012)';
+VC_VERSIONS[1800] = 'MSVC12 (Visual C++ 2013)';
 
 var VC_VERSIONS_SHORT = new Array();
 VC_VERSIONS_SHORT[1200] = 'VC6';
@@ -56,6 +57,7 @@ VC_VERSIONS_SHORT[1400] = 'VC8';
 VC_VERSIONS_SHORT[1500] = 'VC9';
 VC_VERSIONS_SHORT[1600] = 'VC10';
 VC_VERSIONS_SHORT[1700] = 'VC11';
+VC_VERSIONS[1800]       = 'VC12';
 
 if (PROGRAM_FILES == null) {
 	PROGRAM_FILES = "C:\\Program Files";

From 8e3c2015dc71271523f502bed7afdbb2aeb0acae Mon Sep 17 00:00:00 2001
From: Pierre Joye <pierre.php@gmail.com>
Date: Sun, 9 Mar 2014 21:12:19 +0100
Subject: [PATCH 2/3] - fix #66869, Invalid 2nd argument crashes
 imageaffinematrixget

---
 ext/gd/gd.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 0c4a0b36ff2..1058eaee5cd 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -5298,6 +5298,7 @@ PHP_FUNCTION(imageaffinematrixget)
 			double x, y;
 			if (Z_TYPE_P(options) != IS_ARRAY) {
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Array expected as options");
+				RETURN_FALSE;
 			}
 			if (zend_hash_find(HASH_OF(options), "x", sizeof("x"), (void **)&tmp) != FAILURE) {
 				if (Z_TYPE_PP(tmp) != IS_DOUBLE) {

From 1fdca8208f057ba48fc7efdae0056f7978120688 Mon Sep 17 00:00:00 2001
From: Pierre Joye <pierre.php@gmail.com>
Date: Sun, 9 Mar 2014 21:13:15 +0100
Subject: [PATCH 3/3] update news

---
 NEWS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS b/NEWS
index 447a703979a..091d75dead8 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ PHP                                                                        NEWS
 
 - GD:
   . Fixed bug #66714 ( imageconvolution breakage). (Brad Daily)
+  . Fixed #66869 (Invalid 2nd argument crashes imageaffinematrixget) (Pierre)
 
 - Mail:
   . Fixed bug #66535 (Don't add newline after X-PHP-Originating-Script) (Tjerk)