summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <m.blumenkran@samsung.com>2013-03-19 14:05:14 +0000
committerMike Blumenkrantz <m.blumenkran@samsung.com>2013-03-19 14:05:14 +0000
commit05c7ed6bcb60212bbe638495c5b8442b2d297255 (patch)
treeae1d529db03ed32bd670d8bee41c8d5b06d9c92f
parent6e7c5296fc7d155abbfbe7cb185dc684de8b56d2 (diff)
fix magic failure in eina_value_array_count when array is NULL
-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 @@
4102013-02-16 Cedric Bail 4102013-02-16 Cedric Bail
411 411
412 * Fix portability issue on 64bits system for Eina_CList. 412 * Fix portability issue on 64bits system for Eina_CList.
413
4142013-03-19 Mike Blumenkrantz
415
416 * 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:
10 * Prevent denial of service on Eina_Hash function. 10 * Prevent denial of service on Eina_Hash function.
11 * Fix map leak in Eina_File infrastructure. 11 * Fix map leak in Eina_File infrastructure.
12 * Fix portability issue on 64bits system for Eina_CList. 12 * Fix portability issue on 64bits system for Eina_CList.
13 * Fix magic failure in eina_value_array_count when array has not been allocated
13 14
14Changes since Eina 1.7.4: 15Changes since Eina 1.7.4:
15------------------------- 16-------------------------
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)
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