Value objects allocated with a const char * that is set to null, will…

… not create NULL php values
CopernicaMarketingSoftware · Aug 26, 2014 · a286c34 · a286c34
1 parent 0e24f71
commit a286c34
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/include/value.h b/include/value.h
@@ -441,8 +441,6 @@ class Value : private HashParent
     template <typename T>
     std::vector<T> vectorValue() const
     {
-
-
         // only works for arrays, other types return an empty vector
         if (!isArray()) return std::vector<T>();
 

diff --git a/zend/value.cpp b/zend/value.cpp
@@ -124,9 +124,19 @@ Value::Value(const std::string &value)
  */
 Value::Value(const char *value, int size)
 {
-    // create a string zval
-    MAKE_STD_ZVAL(_val);
-    ZVAL_STRINGL(_val, value, size < 0 ? ::strlen(value) : size, 1);
+    // is there a value?
+    if (value)
+    {
+        // create a string zval
+        MAKE_STD_ZVAL(_val);
+        ZVAL_STRINGL(_val, value, size < 0 ? ::strlen(value) : size, 1);
+    }
+    else
+    {
+        // create a null zval
+        MAKE_STD_ZVAL(_val);
+        ZVAL_NULL(_val);
+    }
 }
 
 /**