aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/lib/eina/eina_inline_value.x2
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bc79778c6f..d3aaa09043 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-19 Mike Blumenkrantz
+
+ * Fix magic failure in eina_value_array_count when array has not been allocated
+
2013-03-16 Cedric Bail
* Remove Glew and Direct3d code from Ecore_Evas module.
diff --git a/NEWS b/NEWS
index 46738b43f6..db04703aca 100644
--- a/NEWS
+++ b/NEWS
@@ -203,3 +203,4 @@ Fixes:
* fix use of ecore_con_*_flush functions with unconnected objects
* fix setting of write flags on ecore-con servers during connect
* fix gles support to only use GL_UNPACK_ROW_LENGTH if extension exists
+ * Fix magic failure in eina_value_array_count when array has not been allocated
diff --git a/src/lib/eina/eina_inline_value.x b/src/lib/eina/eina_inline_value.x
index 4ca10e07ef..3b17093153 100644
--- a/src/lib/eina/eina_inline_value.x
+++ b/src/lib/eina/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