Clean elm of null pointers dereferences

SVN revision: 53399
This commit is contained in:
Bruno Dilly 2010-10-14 14:12:26 +00:00
parent 294fa1d974
commit fcccd7dd5a
4 changed files with 10 additions and 4 deletions

View File

@ -799,7 +799,7 @@ vcard_receive(struct _elm_cnp_selection *sel,
ecore_x_dnd_send_finished();
return 0;
}
dropable = l->data;
dropable = eina_list_data_get(l);
ddata.x = savedtypes.x;
ddata.y = savedtypes.y;
ddata.format = ELM_SEL_FORMAT_VCARD;
@ -1165,6 +1165,9 @@ _dnd_enter(void *data, int etype, void *ev)
savedtypes.ntypes = enter->num_types;
if (savedtypes.types) free(savedtypes.types);
savedtypes.types = malloc(sizeof(char *) * enter->num_types);
if (!savedtypes.types)
return EINA_FALSE;
for (i = 0 ; i < enter->num_types ; i ++)
{
savedtypes.types[i] = eina_stringshare_add(enter->types[i]);

View File

@ -1466,7 +1466,7 @@ _calc_job(void *data)
itb->h = itb->minh;
y += itb->h;
in += itb->count;
if (showme)
if (showme && wd->show_item)
{
wd->show_item->showme = 0;
if (wd->bring_in)

View File

@ -718,7 +718,7 @@ elm_slideshow_item_del(Elm_Slideshow_Item *item)
wd->items_built = eina_list_remove_list(wd->items_built, item->l_built);
if (item->base.view && item->itc->func.del)
item->itc->func.del((void*)item->base.data, wd->previous->base.view);
item->itc->func.del((void*)item->base.data, item->base.view);
if (item->base.view)
evas_object_del(item->base.view);
free(item);

View File

@ -1888,7 +1888,7 @@ _elm_widget_item_tooltip_content_cb_set(Elm_Widget_Item *item, Elm_Tooltip_Item_
{
Elm_Widget_Item_Tooltip *wit;
ELM_WIDGET_ITEM_CHECK_OR_GOTO(item, error);
ELM_WIDGET_ITEM_CHECK_OR_GOTO(item, error_noitem);
if (!func)
{
@ -1909,6 +1909,9 @@ _elm_widget_item_tooltip_content_cb_set(Elm_Widget_Item *item, Elm_Tooltip_Item_
return;
error_noitem:
if (del_cb) del_cb((void *)data, NULL, item);
return;
error:
if (del_cb) del_cb((void *)data, item->widget, item);
}