Fix V8\Tempalte::Set() to do not accept non-primitive values

Author: pinepain

php_v8.h

@@ -71,6 +71,10 @@ ZEND_END_MODULE_GLOBALS(v8)
         ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, NULL, allow_null)
 #endif
 
+#if PHP_VERSION_ID < 70100
+    #define zend_get_executed_scope() EG(scope)
+#endif
+
 
 /* Always refer to the globals in your function as PHP_V8_G(variable).
    You are encouraged to rename these macros something shorter, see

src/php_v8_function.cc

@@ -47,11 +47,7 @@ bool php_v8_function_unpack_args(zval *arguments_zv, int arg_position, v8::Isola
 
     char *exception_message;
 
-    #if PHP_VERSION_ID >= 70100
     zend_string *ce_name = zend_get_executed_scope()->name;
-    #else
-    zend_string *ce_name = EG(scope)->name;
-    #endif
 
     ZEND_HASH_FOREACH_VAL(myht, pzval) {
         if (Z_TYPE_P(pzval) != IS_OBJECT) {
@@ -136,11 +132,7 @@ bool php_v8_function_unpack_string_args(zval* arguments_zv, int arg_position, v8
 
     char *exception_message;
 
-    #if PHP_VERSION_ID >= 70100
-        zend_string *ce_name = zend_get_executed_scope()->name;
-    #else
-        zend_string *ce_name = EG(scope)->name;
-    #endif
+    zend_string *ce_name = zend_get_executed_scope()->name;
 
     ZEND_HASH_FOREACH_VAL(myht, pzval) {
                 if (Z_TYPE_P(pzval) != IS_OBJECT) {
@@ -225,11 +217,7 @@ bool php_v8_function_unpack_object_args(zval* arguments_zv, int arg_position, v8
 
     char *exception_message;
 
-    #if PHP_VERSION_ID >= 70100
     zend_string *ce_name = zend_get_executed_scope()->name;
-    #else
-    zend_string *ce_name = EG(scope)->name;
-    #endif
 
     ZEND_HASH_FOREACH_VAL(myht, pzval) {
                 if (Z_TYPE_P(pzval) != IS_OBJECT) {

src/php_v8_template.cc

@@ -140,7 +140,19 @@ void php_v8_template_Set(v8::Isolate *isolate, v8::Local<T> local_template, N* p
 
         PHP_V8_DATA_ISOLATES_CHECK(php_v8_template, php_v8_value_to_set);
 
-        local_template->Set(local_name, php_v8_value_get_local(php_v8_value_to_set), static_cast<v8::PropertyAttribute>(attributes));
+        v8::Local<v8::Value> local_value = php_v8_value_get_local(php_v8_value_to_set);
+
+        if (local_value->IsObject()) {
+            int arg_position = 3;
+            zend_string *ce_name = zend_get_executed_scope()->name;
+
+            zend_throw_error(zend_ce_type_error,
+                             "Argument %d passed to %s::%s() should be instance of \\V8\\PrimitiveValue or \\V8\\Template, instance of %s given",
+                             arg_position, ZSTR_VAL(ce_name), get_active_function_name(), ZSTR_VAL(Z_OBJCE_P(php_v8_value_zv)->name));
+            return;
+        }
+
+        local_template->Set(local_name, local_value, static_cast<v8::PropertyAttribute>(attributes));
     } else if (instanceof_function(Z_OBJCE_P(php_v8_value_zv), php_v8_object_template_class_entry)) {
         // set object template
         PHP_V8_FETCH_OBJECT_TEMPLATE_WITH_CHECK(php_v8_value_zv, php_v8_object_template_to_set);

stubs/src/Exception.php

@@ -66,7 +66,7 @@ public static function TypeError(Context $context, StringValue $message): Value
      * @param Context         $context
      * @param \V8\StringValue $message
      *
-     * @return Value
+     * @return Value | ObjectValue
      */
     public static function Error(Context $context, StringValue $message): Value
     {

stubs/src/Template.php

@@ -42,11 +42,13 @@ public function GetIsolate(): Isolate
     /**
      * Adds a property to each instance created by this template.
      *
-     * @param NameValue $name
-     * @param \V8\Data  $value
-     * @param int       $attributes One of \v8\PropertyAttribute constants
+     * @param NameValue               $name
+     * @param PrimitiveValue|Template $value
+     * @param int                     $attributes One of \v8\PropertyAttribute constants
+     *
+     * @return void
      */
-    public function Set(NameValue $name, Data $value, int $attributes = PropertyAttribute::None)
+    public function Set(NameValue $name, /*Data*/ $value, int $attributes = PropertyAttribute::None)
     {
     }
 

tests/V8FunctionTemplate_Set.phpt

@@ -0,0 +1,58 @@
+--TEST--
+V8\FunctionTemplate::Set()
+--SKIPIF--
+<?php if (!extension_loaded("v8")) {
+    print "skip";
+} ?>
+--FILE--
+<?php
+/** @var \Phpv8Testsuite $helper */
+$helper = require '.testsuite.php';
+
+require '.v8-helpers.php';
+$v8_helper = new PhpV8Helpers($helper);
+
+
+$isolate = new \V8\Isolate();
+$context = new V8\Context($isolate);
+$v8_helper->injectConsoleLog($context);
+
+// Tests:
+
+$ft = new \V8\FunctionTemplate($isolate);
+$ft->SetClassName(new \V8\StringValue($isolate, 'Test'));
+
+$proto = $ft->PrototypeTemplate();
+
+$f = new \V8\FunctionObject($context, function (\V8\FunctionCallbackInfo $args) {
+});
+
+try {
+    $proto->Set(new \V8\StringValue($isolate, 'foo'), $f);
+} catch (TypeError $e) {
+    $helper->exception_export($e);
+}
+
+$ftpl2 = new \V8\FunctionTemplate($isolate, function (\V8\FunctionCallbackInfo $args) {
+    var_dump($args->This(), $args->Holder(), $args->NewTarget());
+});
+
+$proto->Set(new \V8\StringValue($isolate, 'foo'), $ftpl2);
+
+$context->GlobalObject()->Set($context, new \V8\StringValue($isolate, 't'), $ft->GetFunction($context));
+
+
+$v8_helper->CompileRun($context, '
+console.log(t);
+let nt = new t();
+console.log(nt);
+console.log(nt.foo);
+');
+
+
+?>
+--EXPECT--
+TypeError: Argument 3 passed to V8\ObjectTemplate::Set() should be instance of \V8\PrimitiveValue or \V8\Template, instance of V8\FunctionObject given
+function Test() { [native code] }
+[object Test]
+function foo() { [native code] }