From d3958b32caf606a2710436f8c80df58152e3b160 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmb@php.net>
Date: Sun, 19 Jul 2015 21:51:35 +0200
Subject: [PATCH] fixed Fix #66590, which may segfault

---
 ext/gd/libgd/webpimg.c       |  1 +
 ext/gd/tests/bug66590_1.phpt | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 ext/gd/tests/bug66590_1.phpt

diff --git a/ext/gd/libgd/webpimg.c b/ext/gd/libgd/webpimg.c
index 1b160232f20..6ce991fbdd0 100644
--- a/ext/gd/libgd/webpimg.c
+++ b/ext/gd/libgd/webpimg.c
@@ -789,6 +789,7 @@ WebPResult WebPEncode(const uint8* Y,
 		  return webp_failure;
 		}
 		p[new_size - 1] = 0;
+        *p_out = p;
 		*p_out_size_bytes = new_size;
 	  }
 
diff --git a/ext/gd/tests/bug66590_1.phpt b/ext/gd/tests/bug66590_1.phpt
new file mode 100644
index 00000000000..9e598d1eae9
--- /dev/null
+++ b/ext/gd/tests/bug66590_1.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Bug #66590 (imagewebp() doesn't pad to even length) - segfault
+--SKIPIF--
+<?php
+if (!extension_loaded('gd')) die('skip gd extension not available');
+if (!function_exists('imagewebp')) die('skip WebP support not available');
+?>
+--FILE--
+<?php
+$im = imagecreatetruecolor(6, 6);
+ob_start();
+imagewebp($im);
+ob_end_clean();
+echo "ready\n";
+?>
+--EXPECT--
+ready