[FP] Dereference of null pointer

lantian · Oct 18, 2013 · d4fd9d9 · d4fd9d9
1 parent 2caf2ba
commit d4fd9d9
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/ext/mvc/model/resultset/complex.c b/ext/mvc/model/resultset/complex.c
@@ -180,7 +180,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, valid){
 		 * The result type=1 so we need to build every row
 		 */
 		if (zend_is_true(type)) {
-
+			int i_hydrate_mode;
 			/** 
 			 * Get current hydration mode
 			 */
@@ -196,8 +196,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, valid){
 			/** 
 			 * Each row in a complex result is a Phalcon\Mvc\Model\Row instance
 			 */
-
-			switch (phalcon_get_intval(hydrate_mode)) {
+			i_hydrate_mode = phalcon_get_intval(hydrate_mode);
+			switch (i_hydrate_mode) {
 
 				case 0:
 					PHALCON_INIT_VAR(active_row);
@@ -280,7 +280,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, valid){
 					 * Generate the column value according to the hydration type
 					 */
 
-					switch (phalcon_get_intval(hydrate_mode)) {
+					switch (i_hydrate_mode) {
 
 						case 0:
 							/** 
@@ -353,12 +353,15 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, valid){
 						PHALCON_CPY_WRT(attribute, n_alias);
 					}
 				}
+
+				if (!attribute) {
+					PHALCON_INIT_NVAR(attribute);
+				}
 
 				/** 
 				 * Assign the instance according to the hydration type
 				 */
-
-				switch (phalcon_get_intval(hydrate_mode)) {
+				switch (i_hydrate_mode) {
 
 					case 1:
 						phalcon_array_update_zval(&active_row, attribute, &value, PH_COPY | PH_SEPARATE);