enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Fix memory alignment and remove dead/useless code. 

* those write to stderr were legacy from development, some of them
   were even wrongly accessing out-of-buffer memory;

 * some platforms cannot access non-aligned memory, like integers that
   are not aligned to sizeof(int) and do on. Change the generated
   message using memcpy to aligned memory before using them. Add
   comment to explain that;



SVN revision: 50135
This commit is contained in:
Gustavo Sverzut Barbieri 2010-07-08 22:37:04 +00:00
parent b07f70b85c
commit a2a0ab8d4c
1 changed files with 22 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
legacy/ethumb/src/bin/ethumbd.c
View File

@ -357,57 +357,39 @@ _generated_cb(struct _Ethumbd *ed, Eina_Bool success, const char *thumb_path, co
ed->processing = NULL;
}
static Eina_Bool
_write_safe(int fd, void *data, size_t size)
{
unsigned char *buf = data;
size_t todo = size;
while (todo > 0)
{
size_t r = write(fd, buf, todo);
if (r > 0)
{
todo -= r;
buf += r;
}
else if ((r < 0) && (errno != EINTR))
{
ERR("could not write to fd=%d: %s", fd, strerror(errno));
return EINA_FALSE;
}
}
return EINA_TRUE;
}
static void
_ethumbd_slave_cmd_ready(struct _Ethumbd *ed)
{
char *bufcmd = ed->slave.bufcmd;
Eina_Bool *success;
const char *bufcmd = ed->slave.bufcmd;
Eina_Bool success;
const char *thumb_path = NULL;
const char *thumb_key = NULL;
int *size_path, *size_key;
int size_path, size_key;
success = (Eina_Bool *)bufcmd;
bufcmd += sizeof(*success);
/* NOTE: accessing values directly on bufcmd breaks alignment
* as the first item is an Eina_Bool (size 1) and second is
* an integer (size 4, alignment 4).
* Thus copy to stack values before using them, to have proper alignment.
*/
#define READVAL(dst) \
memcpy(&dst, bufcmd, sizeof(dst)); \
bufcmd += sizeof(dst);
size_path = (int *)bufcmd;
bufcmd += sizeof(*size_path);
READVAL(success);
_write_safe(STDERR_FILENO, bufcmd, ed->slave.scmd);
if (*size_path)
READVAL(size_path);
if (size_path)
{
thumb_path = bufcmd;
bufcmd += *size_path;
bufcmd += size_path;
}
size_key = (int *)bufcmd;
bufcmd += sizeof(*size_key);
READVAL(size_key);
if (size_key) thumb_key = bufcmd;
if (*size_key) thumb_key = bufcmd;
#undef READVAL
_generated_cb(ed, *success, thumb_path, thumb_key);
_generated_cb(ed, success, thumb_path, thumb_key);
free(ed->slave.bufcmd);
ed->slave.bufcmd = NULL;
@ -423,7 +405,7 @@ _ethumbd_slave_alloc_cmd(struct _Ethumbd *ed, int ssize, char *sdata)
return 0;
scmd = (int *)sdata;
if (ssize < sizeof(*scmd)) {
if (ssize < (int)sizeof(*scmd)) {
ERR("could not read size of command.");
return 0;
}
@ -435,7 +417,7 @@ _ethumbd_slave_alloc_cmd(struct _Ethumbd *ed, int ssize, char *sdata)
}
static Eina_Bool
_ethumbd_slave_data_read_cb(void *data, int type, void *event)
_ethumbd_slave_data_read_cb(void *data, int type __UNUSED__, void *event)
{
struct _Ethumbd *ed = data;
Ecore_Exe_Event_Data *ev = event;
@ -451,9 +433,6 @@ _ethumbd_slave_data_read_cb(void *data, int type, void *event)
ssize = ev->size;
sdata = ev->data;
if (!_write_safe(STDERR_FILENO, sdata, ssize))
return 0;
while (ssize > 0)
{
if (!ed->slave.bufcmd)
@ -484,7 +463,7 @@ _ethumbd_slave_data_read_cb(void *data, int type, void *event)
}
static Eina_Bool
_ethumbd_slave_del_cb(void *data, int type, void *event)
_ethumbd_slave_del_cb(void *data, int type __UNUSED__, void *event)
{
struct _Ethumbd *ed = data;
Ecore_Exe_Event_Del *ev = event;