Fix objects in mixed in light runtime (#1075)

Fix UB with reaching unreachable builtin when do var_dump() when mixed stores object and some fixes
VKCOM · Aug 21, 2024 · a5ae8f4 · a5ae8f4
1 parent 081ee6b
commit a5ae8f4
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 6 deletions.
diff --git a/builtin-functions/kphp-light/functions.txt b/builtin-functions/kphp-light/functions.txt
@@ -205,7 +205,7 @@ function json_decode ($v ::: string, $assoc ::: bool = false) ::: mixed;
 // === Misc =======================================================================================
 
 /** @kphp-extern-func-info cpp_template_call */
-function instance_cast(object $instance, $to_type ::: string) ::: instance<^2>;
+function instance_cast(any $instance, $to_type ::: string) ::: instance<^2>;
 
 function make_clone ($x ::: any) ::: ^1;
 

diff --git a/runtime-core/runtime-core.cmake b/runtime-core/runtime-core.cmake
@@ -29,3 +29,4 @@ endif()
 
 prepend(KPHP_CORE_SRC ${RUNTIME_CORE_DIR}/ "${KPHP_CORE_SRC}")
 vk_add_library(runtime-core OBJECT ${KPHP_CORE_SRC})
+target_compile_options(runtime-core PUBLIC -fPIC)
diff --git a/runtime-light/runtime-light.cmake b/runtime-light/runtime-light.cmake
@@ -34,6 +34,7 @@ set_target_properties(runtime-light PROPERTIES LIBRARY_OUTPUT_DIRECTORY
                                                ${BASE_DIR}/objs)
 target_compile_options(runtime-light PUBLIC -stdlib=libc++)
 target_link_options(runtime-light PUBLIC -stdlib=libc++ -static-libstdc++)
+target_compile_options(runtime-light PUBLIC -fPIC)
 
 vk_add_library(kphp-light-runtime STATIC)
 target_link_libraries(

diff --git a/runtime-light/stdlib/variable-handling.cpp b/runtime-light/stdlib/variable-handling.cpp
@@ -49,6 +49,11 @@ void do_print_r(const mixed &v, int depth) {
       *coub << shift << ")\n";
       break;
     }
+    case mixed::type::OBJECT: {
+      php_warning("print_r used on object");
+      *coub << v.as_object()->get_class();
+      break;
+    }
     default:
       __builtin_unreachable();
   }
@@ -97,6 +102,12 @@ static void do_var_dump(const mixed &v, int depth) {
       *coub << shift << "}";
       break;
     }
+    case mixed::type::OBJECT: {
+      php_warning("var_dump used on object");
+      auto s = string(v.as_object()->get_class(), static_cast<string::size_type>(strlen(v.as_object()->get_class())));
+      *coub << shift << "string(" << static_cast<int>(s.size()) << ") \"" << s << '"';
+      break;
+    }
     default:
       __builtin_unreachable();
   }
@@ -176,6 +187,10 @@ static void do_var_export(const mixed &v, int depth, char endc = 0) {
       *coub << shift << ")";
       break;
     }
+    case mixed::type::OBJECT: {
+      *coub << shift << v.get_type_or_class_name();
+      break;
+    }
     default:
       __builtin_unreachable();
   }

diff --git a/tests/kphp_tester.py b/tests/kphp_tester.py
@@ -63,12 +63,12 @@ def make_kphp_once_runner(self, use_nocc, cxx_name, k2_bin):
             k2_bin=k2_bin
         )
 
-    def set_up_env_for_k2(self):
+    def set_up_env_for_k2(self, cxx_name="clang++"):
         self.env_vars["KPHP_MODE"] = "k2-component"
         self.env_vars["KPHP_USER_BINARY_PATH"] = "component.so"
         self.env_vars["KPHP_ENABLE_GLOBAL_VARS_MEMORY_STATS"] = "0"
         self.env_vars["KPHP_PROFILER"] = "0"
-        self.env_vars["KPHP_CXX"] = "clang++"
+        self.env_vars["KPHP_CXX"] = cxx_name
         self.env_vars["KPHP_K2_COMPONENT_IS_ONESHOT"] = "1"
         self.env_vars["KPHP_FORCE_LINK_RUNTIME"] = "1"
 
@@ -352,7 +352,7 @@ def run_test(use_nocc, cxx_name, k2_bin, test: TestFile):
     runner = test.make_kphp_once_runner(use_nocc, cxx_name, k2_bin)
     runner.remove_artifacts_dir()
     if k2_bin is not None:
-        test.set_up_env_for_k2()
+        test.set_up_env_for_k2(cxx_name)
 
     if k2_bin is not None and not test.is_available_for_k2():
         test_result = TestResult.k2_skipped(test)

diff --git a/tests/phpt/mixed/non_primitive/008_forks.php b/tests/phpt/mixed/non_primitive/008_forks.php
@@ -1,4 +1,4 @@
-@ok
+@ok k2_skip
 <?php
 require_once 'kphp_tester_include.php';
 

diff --git a/tests/phpt/mixed/non_primitive/014_class_as_int.php b/tests/phpt/mixed/non_primitive/014_class_as_int.php
@@ -1,4 +1,4 @@
-@ok
+@ok k2_skip
 <?php
 require_once 'kphp_tester_include.php';
 

diff --git a/tests/phpt/mixed/non_primitive/016_var_dump.php b/tests/phpt/mixed/non_primitive/016_var_dump.php
@@ -0,0 +1,21 @@
+@ok
+<?php
+require_once 'kphp_tester_include.php';
+
+class A {
+public int $field;
+}
+
+/** @param $x mixed */
+function print_mixed($x) {
+#ifndef KPHP
+  echo "string(1) \"A\"\n";
+  return;
+#endif
+  var_dump($x);
+}
+
+/** @var mixed */
+$x = to_mixed(new A);
+
+print_mixed($x);