From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 9 Jan 2018 12:08:18 +0000 (+0300)
Subject: Allow commas in specializer conditions
X-Git-Tag: php-7.3.0alpha1~678
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09b1bfecee631f5c17660ce6abb05e290ce76c85;p=php

Allow commas in specializer conditions
---

diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index 13ff061a50..33c761b98f 100644
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -2173,7 +2173,7 @@ function gen_vm($def, $skel) {
 		           strpos($line,"ZEND_VM_HOT_TYPE_SPEC_HANDLER(") === 0) {
 		  // Parsing opcode handler's definition
 			if (preg_match(
-					"/^ZEND_VM_(HOT_)?TYPE_SPEC_HANDLER\(\s*([A-Z_]+)\s*,\s*([^,]+),\s*([A-Za-z_]+)\s*,\s*([A-Z_|]+)\s*,\s*([A-Z_|]+)\s*(,\s*([A-Z_|]+)\s*)?(,\s*SPEC\(([A-Z_|=,]+)\)\s*)?\)/",
+					"/^ZEND_VM_(HOT_)?TYPE_SPEC_HANDLER\(\s*([A-Z_]+)\s*,\s*((?:[^(,]|\([^()]*|(?R)*\))*),\s*([A-Za-z_]+)\s*,\s*([A-Z_|]+)\s*,\s*([A-Z_|]+)\s*(,\s*([A-Z_|]+)\s*)?(,\s*SPEC\(([A-Z_|=,]+)\)\s*)?\)/",
 					$line,
 					$m) == 0) {
 				die("ERROR ($def:$lineno): Invalid ZEND_VM_TYPE_HANDLER_HANDLER definition.\n");