Merge pull request #1394 from sjinks/issue-1392

[1.3.0] Fix #1392
phalcon · Oct 19, 2013 · d3ed354 · d3ed354
2 parents 192aa60 + 19bdefe
commit d3ed354
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/ext/mvc/view/engine/volt/compiler.c b/ext/mvc/view/engine/volt/compiler.c
@@ -1556,11 +1556,11 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression){
 		/** 
 		 * Left part of expression is always resolved
 		 */
+		PHALCON_INIT_NVAR(left_code);
 		if (phalcon_array_isset_string(expr, SS("left"))) {
 			PHALCON_OBS_NVAR(left);
 			phalcon_array_fetch_string(&left, expr, SL("left"), PH_NOISY);
 
-			PHALCON_INIT_NVAR(left_code);
 			phalcon_call_method_p1(left_code, this_ptr, "expression", left);
 		}
 
@@ -1591,11 +1591,11 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression){
 		/** 
 		 * From here, right part of expression is always resolved
 		 */
+		PHALCON_INIT_NVAR(right_code);
 		if (phalcon_array_isset_string(expr, SS("right"))) {
 			PHALCON_OBS_NVAR(right);
 			phalcon_array_fetch_string(&right, expr, SL("right"), PH_NOISY);
 
-			PHALCON_INIT_NVAR(right_code);
 			phalcon_call_method_p1(right_code, this_ptr, "expression", right);
 		}
 

diff --git a/ext/tests/issue-1392.phpt b/ext/tests/issue-1392.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Segmentation fault in \Phalcon\Mvc\View\Engine\Volt\Compiler::expression() - https://github.com/phalcon/cphalcon/issues/1392
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--FILE--
+<?php
+error_reporting(error_reporting() & ~E_NOTICE);
+
+$c      = new \Phalcon\Mvc\View\Engine\Volt\Compiler();
+$types  = array(311, 124, 33, 42, 43, 45, 47, 37, 60, 61, 62, 126, 278, 266, 267, 270, 271, 272, 273, 274, 275, 276, 356, 361, 365, 362, 363, 309, 369, 366, 367, 368);
+$passed = 0;
+
+foreach ($types as $type) {
+	try {
+		$c->expression(array('type' => $type));
+	}
+	catch (Exception $e) {
+	}
+
+	++$passed;
+}
+
+assert($passed == count($types));
+?>
+--EXPECT--