forked from enlightenment/enlightenment
e: Cleanup
Fixes potential invalid memory reads. Patch by Igor Murzov SVN revision: 77491
This commit is contained in:
parent
427b6c34df
commit
80b0b615b8
|
@ -158,15 +158,13 @@ e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec,
|
|||
|
||||
EINA_LIST_FOREACH(e_border_client_list(), l, bd)
|
||||
{
|
||||
if (bd->desktop == desktop)
|
||||
if (bd && bd->desktop == desktop)
|
||||
{
|
||||
if (bd)
|
||||
{
|
||||
if (!bd->focused)
|
||||
e_border_activate(bd, EINA_TRUE);
|
||||
else e_border_raise(bd);
|
||||
return NULL;
|
||||
}
|
||||
if (!bd->focused)
|
||||
e_border_activate(bd, EINA_TRUE);
|
||||
else
|
||||
e_border_raise(bd);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -532,9 +532,10 @@ _e_fm_main_eeze_volume_find(const char *syspath)
|
|||
void
|
||||
_e_fm_main_eeze_volume_unmount(E_Volume *v)
|
||||
{
|
||||
INF("unmount %s %s", v->udi, v->mount_point);
|
||||
if (!v || v->guard) return;
|
||||
|
||||
INF("unmount %s %s", v->udi, v->mount_point);
|
||||
|
||||
if (!eeze_disk_mount_wrapper_get(v->disk))
|
||||
{
|
||||
char buf[PATH_MAX];
|
||||
|
|
|
@ -113,7 +113,7 @@ e_module_new(const char *name)
|
|||
E_Module *m;
|
||||
char buf[PATH_MAX];
|
||||
char body[4096], title[1024];
|
||||
const char *modpath;
|
||||
const char *modpath = NULL;
|
||||
char *s;
|
||||
Eina_List *l;
|
||||
E_Config_Module *em;
|
||||
|
|
|
@ -2582,15 +2582,9 @@ _evry_state_clear(Evry_Window *win)
|
|||
static void
|
||||
_evry_view_hide(Evry_Window *win, Evry_View *v, int slide)
|
||||
{
|
||||
if (v->state->delete_me)
|
||||
{
|
||||
_evry_state_clear(win);
|
||||
return;
|
||||
}
|
||||
|
||||
_evry_state_clear(win);
|
||||
|
||||
if (!v) return;
|
||||
if (!v || v->state->delete_me) return;
|
||||
|
||||
if (slide && v->o_list)
|
||||
{
|
||||
|
|
|
@ -698,12 +698,12 @@ _fetch(Evry_Plugin *plugin, const char *input)
|
|||
|
||||
_folder_item_add(p, p->directory, prio++);
|
||||
|
||||
buf[sizeof buf - 1] = 0;
|
||||
while (strlen(buf) > 1)
|
||||
{
|
||||
buf[sizeof buf - 1] = 0;
|
||||
dir = dirname(buf);
|
||||
_folder_item_add(p, dir, prio++);
|
||||
strncpy(buf, dir, sizeof buf - 1);
|
||||
strcpy(buf, dir);
|
||||
}
|
||||
|
||||
p->command = CMD_SHOW_PARENT;
|
||||
|
|
|
@ -1234,10 +1234,10 @@ _policy_border_activate(E_Border *bd)
|
|||
{
|
||||
E_Border *sft;
|
||||
|
||||
printf("Border Activate: %s\n", bd->client.icccm.name);
|
||||
|
||||
if (!bd) return;
|
||||
|
||||
printf("Border Activate: %s\n", bd->client.icccm.name);
|
||||
|
||||
/* NB: stolen borders may or may not need focus call...have to test */
|
||||
if (bd->stolen) return;
|
||||
|
||||
|
|
Loading…
Reference in New Issue