Ensure you can safely call ZVal.ToPhp on a non-empty ZVal without lea…

…king.
cscott · Nov 1, 2015 · e0b7a99 · e0b7a99
1 parent 4a2ec02
commit e0b7a99
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/values.h b/src/values.h
@@ -604,6 +604,7 @@ class Value {
   }
   // Caller owns the ZVal, and is responsible for freeing it.
   inline void ToPhp(PhpObjectMapper *m, ZVal &z TSRMLS_DC) const {
+    if (!z.IsNull()) { z.SetNull(); /* deallocate previous value */ }
     ToPhp(m, z.Ptr(), z.PtrPtr() TSRMLS_CC);
   }
   inline bool IsEmpty() const {