summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/include/eina_inline_value.x2
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ee76c5..5f64264 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -410,3 +410,7 @@
2013-02-16 Cedric Bail
* Fix portability issue on 64bits system for Eina_CList.
+
+2013-03-19 Mike Blumenkrantz
+
+ * Fix magic failure in eina_value_array_count when array has not been allocated
diff --git a/NEWS b/NEWS
index f764385..c08e1bc 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ Fixes:
* Prevent denial of service on Eina_Hash function.
* Fix map leak in Eina_File infrastructure.
* Fix portability issue on 64bits system for Eina_CList.
+ * Fix magic failure in eina_value_array_count when array has not been allocated
Changes since Eina 1.7.4:
-------------------------
diff --git a/src/include/eina_inline_value.x b/src/include/eina_inline_value.x
index 4ca10e0..3b17093 100644
--- a/src/include/eina_inline_value.x
+++ b/src/include/eina_inline_value.x
@@ -579,7 +579,7 @@ eina_value_array_count(const Eina_Value *value)
EINA_VALUE_TYPE_ARRAY_CHECK_RETURN_VAL(value, 0);
if (!eina_value_pget(value, &desc))
return 0;
- return eina_inarray_count(desc.array);
+ return desc.array ? eina_inarray_count(desc.array) : 0;
}
static inline Eina_Bool