nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2014-03-08 20:59:18 +01:00
parent d5cf494ba2 89be6cb509
commit b28ddca96d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ipc.c
View File

@ -894,14 +894,16 @@ handler_t handlers[8] = {
static void ipc_receive_message(EV_P_ struct ev_io *w, int revents) { static void ipc_receive_message(EV_P_ struct ev_io *w, int revents) {
uint32_t message_type; uint32_t message_type;
uint32_t message_length; uint32_t message_length;
uint8_t *message; uint8_t *message = NULL;
int ret = ipc_recv_message(w->fd, &message_type, &message_length, &message); int ret = ipc_recv_message(w->fd, &message_type, &message_length, &message);
/* EOF or other error */ /* EOF or other error */
if (ret < 0) { if (ret < 0) {
/* Was this a spurious read? See ev(3) */ /* Was this a spurious read? See ev(3) */
if (ret == -1 && errno == EAGAIN) if (ret == -1 && errno == EAGAIN) {
FREE(message);
return; return;
}
/* If not, there was some kind of error. We don’t bother /* If not, there was some kind of error. We don’t bother
* and close the connection */ * and close the connection */
@ -924,6 +926,7 @@ static void ipc_receive_message(EV_P_ struct ev_io *w, int revents) {
ev_io_stop(EV_A_ w); ev_io_stop(EV_A_ w);
free(w); free(w);
FREE(message);
DLOG("IPC: client disconnected\n"); DLOG("IPC: client disconnected\n");
return; return;
@ -935,6 +938,8 @@ static void ipc_receive_message(EV_P_ struct ev_io *w, int revents) {
handler_t h = handlers[message_type]; handler_t h = handlers[message_type];
h(w->fd, message, 0, message_length, message_type); h(w->fd, message, 0, message_length, message_type);
} }
FREE(message);
} }
/* /*