Fix #1775

zephir-lang · Feb 21, 2019 · 6e53b86 · 6e53b86
1 parent ce5176e
commit 6e53b86
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/Library/Backends/ZendEngine3/Backend.php b/Library/Backends/ZendEngine3/Backend.php
@@ -61,7 +61,6 @@ public function getFcallManager()
     public function getVariableCode(Variable $variable)
     {
         if ($variable->isDoublePointer() ||
-            $variable->isSuperGlobal() ||
             \in_array($variable->getName(), ['this_ptr', 'return_value']) ||
             \in_array($variable->getType(), ['int', 'long'])) {
             return $variable->getName();
@@ -217,7 +216,7 @@ public function generateInitCode(&$groupVariables, $type, $pointer, Variable $va
     {
         $isComplex = ('variable' == $type || 'string' == $type || 'array' == $type || 'resource' == $type || 'callable' == $type || 'object' == $type);
 
-        if ($isComplex && !$variable->isDoublePointer() && !$variable->isSuperGlobal()) { /* && $variable->mustInitNull() */
+        if ($isComplex && !$variable->isDoublePointer()) { /* && $variable->mustInitNull() */
             $groupVariables[] = $variable->getName();
             switch ($variable->getRealname()) {
                 case '__$null':
@@ -237,7 +236,12 @@ public function generateInitCode(&$groupVariables, $type, $pointer, Variable $va
             return;
         }
 
-        if ($variable->isDoublePointer() || $variable->isSuperGlobal()) {
+        if ($variable->isSuperGlobal()) {
+            $groupVariables[] = $variable->getName();
+            return;
+        }
+
+        if ($variable->isDoublePointer()) {
             /* Double pointers for ZE3 are used as zval * */
             $ptr = $isComplex ? $pointer : $pointer.$pointer;
             if ($variable->mustInitNull()) {

diff --git a/kernels/ZendEngine3/main.c b/kernels/ZendEngine3/main.c
@@ -82,7 +82,7 @@ int zephir_fetch_parameters(int num_args, int required_args, int optional_args,
 /**
  * Gets the global zval into PG macro
  */
-int zephir_get_global(zval **arr, const char *global, unsigned int global_length)
+int zephir_get_global(zval *arr, const char *global, unsigned int global_length)
 {
 	zval *gv;
 	zend_bool jit_initialization = PG(auto_globals_jit);
@@ -96,14 +96,15 @@ int zephir_get_global(zval **arr, const char *global, unsigned int global_length
 		if ((gv = zend_hash_find_ind(&EG(symbol_table), str)) != NULL) {
 			ZVAL_DEREF(gv);
 			if (Z_TYPE_P(gv) == IS_ARRAY) {
-				*arr = gv;
+				ZVAL_COPY_VALUE(arr, gv);
 				zend_string_release(str);
 				return SUCCESS;
 			}
 		}
 	}
 
-	*arr = NULL;
+	ZEPHIR_INIT_NVAR(arr);
+	array_init(arr);
 	zend_string_release(str);
 	return FAILURE;
 }

diff --git a/kernels/ZendEngine3/main.h b/kernels/ZendEngine3/main.h
@@ -206,7 +206,7 @@ extern zend_string* i_self;
 #define RETURN_MM_NULL()            { RETVAL_NULL(); ZEPHIR_MM_RESTORE(); return; }
 
 /* Globals functions */
-int zephir_get_global(zval **arr, const char *global, unsigned int global_length);
+int zephir_get_global(zval *arr, const char *global, unsigned int global_length);
 
 /* Count */
 void zephir_fast_count(zval *result, zval *array);