enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

another efm_op leak, also wrong E_FREE usage 

SVN revision: 80824
This commit is contained in:
Mike Blumenkrantz 2012-12-13 11:34:09 +00:00
parent e0926014a1
commit 4a2837830b
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/bin/e_fm_op.c
View File

@ -1242,17 +1242,30 @@ _e_fm_op_copy_link(E_Fm_Op_Task *task)
if (symlink(lnk_path, task->dst.name) == -1) if (symlink(lnk_path, task->dst.name) == -1)
{ {
char buf[PATH_MAX];
if (errno == EEXIST) if (errno == EEXIST)
{ {
if (unlink(task->dst.name) == -1) if (unlink(task->dst.name) == -1)
_E_FM_OP_ERROR_SEND_WORK(task, E_FM_OP_ERROR, "Cannot unlink '%s': %s.", task->dst.name); {
free(lnk_path);
_E_FM_OP_ERROR_SEND_WORK(task, E_FM_OP_ERROR, "Cannot unlink '%s': %s.", task->dst.name);
}
if (symlink(lnk_path, task->dst.name) == -1) if (symlink(lnk_path, task->dst.name) == -1)
_E_FM_OP_ERROR_SEND_WORK(task, E_FM_OP_ERROR, "Cannot create link from '%s' to '%s': %s.", lnk_path, task->dst.name); {
strncat(buf, lnk_path, sizeof(buf));
free(lnk_path);
_E_FM_OP_ERROR_SEND_WORK(task, E_FM_OP_ERROR, "Cannot create link from '%s' to '%s': %s.", buf, task->dst.name);
}
} }
else else
_E_FM_OP_ERROR_SEND_WORK(task, E_FM_OP_ERROR, "Cannot create link from '%s' to '%s': %s.", lnk_path, task->dst.name); {
strncat(buf, lnk_path, sizeof(buf));
free(lnk_path);
_E_FM_OP_ERROR_SEND_WORK(task, E_FM_OP_ERROR, "Cannot create link from '%s' to '%s': %s.", buf, task->dst.name);
}
} }
E_FREE(lnk_path); free(lnk_path);
task->dst.done += task->src.st.st_size; task->dst.done += task->src.st.st_size;