it seems that this variable in e_exec does not actually need to be strdup()ed, and thus does not need to leak...

SVN revision: 80923
This commit is contained in:
Mike Blumenkrantz 2012-12-14 09:13:07 +00:00
parent 31b66a272e
commit 799e6b5a5e
1 changed files with 2 additions and 7 deletions

View File

@ -312,7 +312,7 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
E_Exec_Launch *launch;
Eina_List *l, *lnew;
Ecore_Exe *exe = NULL;
char *penv_display;
const char *penv_display;
char buf[4096];
launch = data;
@ -330,7 +330,6 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
if (++startup_id < 1) startup_id = 1;
/* save previous env vars we need to save */
penv_display = getenv("DISPLAY");
if (penv_display) penv_display = strdup(penv_display);
if ((penv_display) && (launch->zone))
{
const char *p1, *p2;
@ -347,7 +346,6 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
if (penv_display_length + 32 > 4096)
{
free(inst);
free(penv_display);
return NULL;
}
@ -463,10 +461,7 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
}
if (penv_display)
{
e_util_env_set("DISPLAY", penv_display);
free(penv_display);
}
e_util_env_set("DISPLAY", penv_display);
if (!exe)
{
free(inst);