Fix #1340

(cherry picked from commit 2c7c1f8) Conflicts: ext/kernel/memory.h
phalcon · Oct 9, 2013 · f903d98 · f903d98
1 parent 4a5da47
commit f903d98
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/ext/kernel/memory.h b/ext/kernel/memory.h
@@ -139,17 +139,15 @@ extern void PHALCON_FASTCALL phalcon_copy_ctor(zval *destiny, zval *origin);
 	}
 
 #define PHALCON_SEPARATE_PARAM(z) \
-	{\
+	do { \
 		zval *orig_ptr = z;\
-		if (Z_REFCOUNT_P(orig_ptr) > 1) {\
-			phalcon_memory_observe(&z TSRMLS_CC);\
-			ALLOC_ZVAL(z);\
-			*z = *orig_ptr;\
-			zval_copy_ctor(z);\
-			Z_SET_REFCOUNT_P(z, 1);\
-			Z_UNSET_ISREF_P(z);\
-		}\
-	}
+		phalcon_memory_observe(&z TSRMLS_CC);\
+		ALLOC_ZVAL(z);\
+		*z = *orig_ptr;\
+		zval_copy_ctor(z);\
+		Z_SET_REFCOUNT_P(z, 1);\
+		Z_UNSET_ISREF_P(z);\
+	} while (0)
 
 #define PHALCON_SEPARATE_PARAM_NMO(z) { \
 		zval *orig_ptr = z; \
@@ -168,3 +166,4 @@ extern void PHALCON_FASTCALL phalcon_copy_ctor(zval *destiny, zval *origin);
 	} else { \
 		zval_ptr_dtor(&var); \
 	}
+