forked from enlightenment/efl
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
This commit is contained in:
parent
2942212cb3
commit
16f687b87a
|
@ -1606,7 +1606,7 @@ _elm_multibuttonentry_smart_focus_next(Eo *obj, void *_pd, va_list *list)
|
|||
items = eina_list_append(items, sd->box);
|
||||
}
|
||||
|
||||
if (int_ret)
|
||||
if (int_ret && ret)
|
||||
*ret = elm_widget_focus_list_next_get
|
||||
(obj, items, eina_list_data_get, dir, next);
|
||||
}
|
||||
|
|
|
@ -5947,7 +5947,7 @@ _realized_items_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
|
|||
done = EINA_TRUE;
|
||||
EINA_LIST_FOREACH(itb->items, l, it)
|
||||
{
|
||||
if (it->realized) *ret = eina_list_append(*ret, it);
|
||||
if (it->realized && ret) *ret = eina_list_append(*ret, it);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
|
@ -1192,7 +1192,7 @@ _elm_layout_smart_content_swallow_list_get(Eo *obj EINA_UNUSED, void *_pd, va_li
|
|||
|
||||
EINA_LIST_FOREACH(sd->subs, l, sub_d)
|
||||
{
|
||||
if (sub_d->type == SWALLOW)
|
||||
if ((sub_d->type == SWALLOW) && ret)
|
||||
*ret = eina_list_append(*ret, sub_d->obj);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2951,7 +2951,7 @@ _item_insert_after(Eo *obj, void *_pd, va_list *list)
|
|||
_sizing_eval(obj);
|
||||
sd->item_count++;
|
||||
|
||||
*ret = (Elm_Object_Item *)it;
|
||||
if (ret) *ret = (Elm_Object_Item *)it;
|
||||
}
|
||||
|
||||
EAPI Elm_Object_Item *
|
||||
|
|
Loading…
Reference in New Issue