From 566947cd02fde8a079878a861f7d0c7d5b666d64 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Wed, 26 Aug 2020 19:44:12 +0200
Subject: [PATCH] Fix #79976: anonymous class instanceof error in cli

We add a static counter to the names of anonymous classes when compiled
via the interactive shell, to prevent RTD key collisions.
---
 Zend/zend_compile.c              | 14 ++++++++------
 ext/readline/tests/bug79976.phpt | 27 +++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 ext/readline/tests/bug79976.phpt

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 776ad6ba9ef7d..429b62789368a 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -6328,20 +6328,22 @@ void zend_compile_implements(znode *class_node, zend_ast *ast) /* {{{ */
 
 static zend_string *zend_generate_anon_class_name(unsigned char *lex_pos) /* {{{ */
 {
+	static uint32_t counter = 0;
 	zend_string *result;
-	char char_pos_buf[32];
-	size_t char_pos_len = zend_sprintf(char_pos_buf, "%p", lex_pos);
 	zend_string *filename = CG(active_op_array)->filename;
 
-	/* NULL, name length, filename length, last accepting char position length */
-	result = zend_string_alloc(sizeof("class@anonymous") + ZSTR_LEN(filename) + char_pos_len, 0);
-	sprintf(ZSTR_VAL(result), "class@anonymous%c%s%s", '\0', ZSTR_VAL(filename), char_pos_buf);
+	if (!zend_string_equals_literal(filename, "php shell code")) {
+		result = zend_strpprintf(0, "class@anonymous%c%s%p", '\0', ZSTR_VAL(filename), lex_pos);
+	} else {
+		/* increasing counter is not thread safe, but this is only for the interactive shell */
+		result = zend_strpprintf(0, "class@anonymous%c%s%p$%" PRIx32, '\0', ZSTR_VAL(filename), lex_pos, counter++);
+	}
 	return zend_new_interned_string(result);
 }
 /* }}} */
 
 void zend_compile_class_decl(zend_ast *ast) /* {{{ */
-{
+{ 
 	zend_ast_decl *decl = (zend_ast_decl *) ast;
 	zend_ast *extends_ast = decl->child[0];
 	zend_ast *implements_ast = decl->child[1];
diff --git a/ext/readline/tests/bug79976.phpt b/ext/readline/tests/bug79976.phpt
new file mode 100644
index 0000000000000..2b06a838bca1e
--- /dev/null
+++ b/ext/readline/tests/bug79976.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Bug #79976 (anonymous class instanceof error in cli)
+--SKIPIF--
+<?php
+if (!extension_loaded('readline')) die('skip readline extension not available');
+if (!function_exists('proc_open')) die('skip proc_open() not available');
+?>
+--FILE--
+<?php
+$php = getenv('TEST_PHP_EXECUTABLE');
+$ini = getenv('TEST_PHP_EXTRA_ARGS');
+$descriptorspec = [['pipe', 'r'], STDOUT, STDERR];
+$proc = proc_open("$php $ini -a", $descriptorspec, $pipes);
+var_dump($proc);
+fwrite($pipes[0], "class A {}\n");
+fwrite($pipes[0], "class B {}\n");
+fwrite($pipes[0], "var_dump((new class() extends A {}) instanceof A);\n");
+fwrite($pipes[0], "var_dump((new class() extends B {}) instanceof B);\n");
+fclose($pipes[0]);
+proc_close($proc);
+?>
+--EXPECT--
+resource(5) of type (process)
+Interactive shell
+
+bool(true)
+bool(true)