summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <m.blumenkran@samsung.com>2013-03-19 14:07:28 +0000
committerChris Michael <cp.michael@samsung.com>2013-03-26 08:53:33 +0000
commit6fc742eb043f848f1c0506477e965712c8e7a6a0 (patch)
tree571366c43c78d19f159071784df34a391671551a
parent9c14f5d9e4f580465aaf201be9d088f7191a627d (diff)
fix magic failure in eina_value_array_count when array has not been allocated
-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 @@
12013-03-19 Mike Blumenkrantz
2
3 * Fix magic failure in eina_value_array_count when array has not been allocated
4
12013-03-16 Cedric Bail 52013-03-16 Cedric Bail
2 6
3 * Remove Glew and Direct3d code from Ecore_Evas module. 7 * 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:
203 * fix use of ecore_con_*_flush functions with unconnected objects 203 * fix use of ecore_con_*_flush functions with unconnected objects
204 * fix setting of write flags on ecore-con servers during connect 204 * fix setting of write flags on ecore-con servers during connect
205 * fix gles support to only use GL_UNPACK_ROW_LENGTH if extension exists 205 * fix gles support to only use GL_UNPACK_ROW_LENGTH if extension exists
206 * 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)
579 EINA_VALUE_TYPE_ARRAY_CHECK_RETURN_VAL(value, 0); 579 EINA_VALUE_TYPE_ARRAY_CHECK_RETURN_VAL(value, 0);
580 if (!eina_value_pget(value, &desc)) 580 if (!eina_value_pget(value, &desc))
581 return 0; 581 return 0;
582 return eina_inarray_count(desc.array); 582 return desc.array ? eina_inarray_count(desc.array) : 0;
583} 583}
584 584
585static inline Eina_Bool 585static inline Eina_Bool