Fix invalid memory reads when GC is on

phalcon · Jul 25, 2013 · 46f3955 · 46f3955
1 parent 6fdc9c0
commit 46f3955
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/ext/config.c b/ext/config.c
@@ -265,11 +265,15 @@ static void phalcon_config_unset_dimension(zval *object, zval *offset TSRMLS_DC)
  */
 static HashTable* phalcon_config_get_properties(zval* object TSRMLS_DC)
 {
-	phalcon_config_object* obj = fetchPhalconConfigObject(object TSRMLS_CC);
-	HashTable* props           = zend_std_get_properties(object TSRMLS_CC);
-	zval *tmp;
+	HashTable* props = zend_std_get_properties(object TSRMLS_CC);
+
+	if (!GC_G(gc_active)) {
+		phalcon_config_object* obj = fetchPhalconConfigObject(object TSRMLS_CC);
+		zval *tmp;
+
+		zend_hash_copy(props, obj->props, (copy_ctor_func_t)zval_add_ref, (void*)&tmp, sizeof(zval*));
+	}
 
-	zend_hash_copy(props, obj->props, (copy_ctor_func_t)zval_add_ref, (void*)&tmp, sizeof(zval*));
 	return props;
 }
 

diff --git a/unit-tests/ConfigTest.php b/unit-tests/ConfigTest.php
@@ -284,5 +284,11 @@ public function testIniConfigDirective()
 
 		$this->assertEquals($actual, $expected);
 	}
-}
 
+	public function testConfigWithMergeAndGarbageCollection()
+	{
+		$config = new Phalcon\Config(array('test1' => 1, 'test2' => 2));
+		$config->merge(new Phalcon\Config(array('test2')));
+		gc_collect_cycles();
+	}
+}