From 27acbcf4df1ddac593f37fc4f9bb30fdfb456377 Mon Sep 17 00:00:00 2001
From: Jakub Zelenka <bukka@php.net>
Date: Sun, 28 Aug 2016 13:00:49 +0100
Subject: [PATCH] Add test for fixed bug #68992

---
 ext/json/tests/bug68992.phpt | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 ext/json/tests/bug68992.phpt

diff --git a/ext/json/tests/bug68992.phpt b/ext/json/tests/bug68992.phpt
new file mode 100644
index 0000000000..0fc41eca49
--- /dev/null
+++ b/ext/json/tests/bug68992.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Bug #68992 (json_encode stacks exceptions thrown by JsonSerializable classes)
+--SKIPIF--
+<?php
+if (!extension_loaded('json')) die('skip');
+?>
+--FILE--
+<?php
+
+class MyClass implements JsonSerializable {
+    public function jsonSerialize() {
+	    throw new Exception('Not implemented!');
+	}
+}
+$classes = [];
+for($i = 0; $i < 5; $i++) {
+    $classes[] = new MyClass();
+}
+
+try {
+    json_encode($classes);
+} catch(Exception $e) {
+    do {
+	    printf("%s (%d) [%s]\n", $e->getMessage(), $e->getCode(), get_class($e));
+	} while ($e = $e->getPrevious());
+}
+?>
+--EXPECT--
+Failed calling MyClass::jsonSerialize() (0) [Exception]
+Not implemented! (0) [Exception]
-- 
2.50.1