summaryrefslogtreecommitdiff
path: root/legacy/elementary/src
diff options
context:
space:
mode:
authorDaniel Juyung Seo <juyung.seo@samsung.com>2014-01-06 23:26:46 +0900
committerDaniel Juyung Seo <juyung.seo@samsung.com>2014-01-06 23:26:46 +0900
commit16f687b87a6f838915b93d845af97af5e8369d71 (patch)
tree43ccd6b76ba60f121339f684a84b1f0dc46596f1 /legacy/elementary/src
parent2942212cb31c2b2fe70d8005b162ecb7dbe9745e (diff)
multibuttonentry, genlist, layout, toolbar: Fixed dereference of null
pointers which were reported by clang builg. https://build.enlightenment.org/job/nightly_elm_clang_x86_64/lastSuccessfulBuild/artifact/scan-build/build/2014-01-05-1/report-XZo1hW.html#EndPath https://build.enlightenment.org/job/nightly_elm_clang_x86_64/lastSuccessfulBuild/artifact/scan-build/build/2014-01-05-1/report-isAlRt.html#EndPath https://build.enlightenment.org/job/nightly_elm_clang_x86_64/lastSuccessfulBuild/artifact/scan-build/build/2014-01-05-1/report-8Ascv8.html#EndPath https://build.enlightenment.org/job/nightly_elm_clang_x86_64/lastSuccessfulBuild/artifact/scan-build/build/2014-01-05-1/report-gBkVuE.html#EndPath
Diffstat (limited to 'legacy/elementary/src')
-rw-r--r--legacy/elementary/src/lib/elc_multibuttonentry.c2
-rw-r--r--legacy/elementary/src/lib/elm_genlist.c2
-rw-r--r--legacy/elementary/src/lib/elm_layout.c2
-rw-r--r--legacy/elementary/src/lib/elm_toolbar.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/legacy/elementary/src/lib/elc_multibuttonentry.c b/legacy/elementary/src/lib/elc_multibuttonentry.c
index 52903ca978..ac9ce37eea 100644
--- a/legacy/elementary/src/lib/elc_multibuttonentry.c
+++ b/legacy/elementary/src/lib/elc_multibuttonentry.c
@@ -1606,7 +1606,7 @@ _elm_multibuttonentry_smart_focus_next(Eo *obj, void *_pd, va_list *list)
1606 items = eina_list_append(items, sd->box); 1606 items = eina_list_append(items, sd->box);
1607 } 1607 }
1608 1608
1609 if (int_ret) 1609 if (int_ret && ret)
1610 *ret = elm_widget_focus_list_next_get 1610 *ret = elm_widget_focus_list_next_get
1611 (obj, items, eina_list_data_get, dir, next); 1611 (obj, items, eina_list_data_get, dir, next);
1612} 1612}
diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c
index 304318d2d8..c206eaa400 100644
--- a/legacy/elementary/src/lib/elm_genlist.c
+++ b/legacy/elementary/src/lib/elm_genlist.c
@@ -5947,7 +5947,7 @@ _realized_items_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
5947 done = EINA_TRUE; 5947 done = EINA_TRUE;
5948 EINA_LIST_FOREACH(itb->items, l, it) 5948 EINA_LIST_FOREACH(itb->items, l, it)
5949 { 5949 {
5950 if (it->realized) *ret = eina_list_append(*ret, it); 5950 if (it->realized && ret) *ret = eina_list_append(*ret, it);
5951 } 5951 }
5952 } 5952 }
5953 else 5953 else
diff --git a/legacy/elementary/src/lib/elm_layout.c b/legacy/elementary/src/lib/elm_layout.c
index 56b78b9671..c4d2846069 100644
--- a/legacy/elementary/src/lib/elm_layout.c
+++ b/legacy/elementary/src/lib/elm_layout.c
@@ -1192,7 +1192,7 @@ _elm_layout_smart_content_swallow_list_get(Eo *obj EINA_UNUSED, void *_pd, va_li
1192 1192
1193 EINA_LIST_FOREACH(sd->subs, l, sub_d) 1193 EINA_LIST_FOREACH(sd->subs, l, sub_d)
1194 { 1194 {
1195 if (sub_d->type == SWALLOW) 1195 if ((sub_d->type == SWALLOW) && ret)
1196 *ret = eina_list_append(*ret, sub_d->obj); 1196 *ret = eina_list_append(*ret, sub_d->obj);
1197 } 1197 }
1198} 1198}
diff --git a/legacy/elementary/src/lib/elm_toolbar.c b/legacy/elementary/src/lib/elm_toolbar.c
index 545e09d326..8bbbbada48 100644
--- a/legacy/elementary/src/lib/elm_toolbar.c
+++ b/legacy/elementary/src/lib/elm_toolbar.c
@@ -2951,7 +2951,7 @@ _item_insert_after(Eo *obj, void *_pd, va_list *list)
2951 _sizing_eval(obj); 2951 _sizing_eval(obj);
2952 sd->item_count++; 2952 sd->item_count++;
2953 2953
2954 *ret = (Elm_Object_Item *)it; 2954 if (ret) *ret = (Elm_Object_Item *)it;
2955} 2955}
2956 2956
2957EAPI Elm_Object_Item * 2957EAPI Elm_Object_Item *