diff --git a/src/lib/ecore/ecore_exe_posix.c b/src/lib/ecore/ecore_exe_posix.c index 46a97d1461..2a240a2d01 100644 --- a/src/lib/ecore/ecore_exe_posix.c +++ b/src/lib/ecore/ecore_exe_posix.c @@ -711,20 +711,24 @@ _impl_ecore_exe_event_data_get(Ecore_Exe *obj, exe->read_data_size = i - last; exe->read_data_buf = malloc(exe->read_data_size); if (exe->read_data_buf) + memcpy(exe->read_data_buf, c, exe->read_data_size); + else { - memcpy(exe->read_data_buf, c, exe->read_data_size); + exe->read_data_size = 0; + ERR("Out of memory in allocating exe pipe data"); } - else ERR("Out of memory in allocating exe pipe data"); } else { exe->error_data_size = i - last; exe->error_data_buf = malloc(exe->error_data_size); if (exe->error_data_buf) + memcpy(exe->error_data_buf, c, exe->error_data_size); + else { - memcpy(exe->error_data_buf, c, exe->error_data_size); + exe->error_data_size = 0; + ERR("Out of memory in allocating exe pipe data"); } - else ERR("Out of memory in allocating exe pipe data"); } } if (count == 0) /* No lines to send, cancel the event. */ diff --git a/src/lib/ecore/ecore_exe_win32.c b/src/lib/ecore/ecore_exe_win32.c index e437b5aff6..80a4e70487 100644 --- a/src/lib/ecore/ecore_exe_win32.c +++ b/src/lib/ecore/ecore_exe_win32.c @@ -664,23 +664,27 @@ _impl_ecore_exe_event_data_get(Ecore_Exe *obj, if (count != 0) e->size = last; if (flags & ECORE_EXE_PIPE_READ) { + exe->pipe_read.data_size = i - last; exe->pipe_read.data_buf = malloc(exe->pipe_read.data_size); if (exe->pipe_read.data_buf) + memcpy(exe->pipe_read.data_buf, c, exe->pipe_read.data_size); + else { - exe->pipe_read.data_size = i - last; - memcpy(exe->pipe_read.data_buf, c, exe->pipe_read.data_size); + exe->pipe_read.data_size = 0; + ERR("Out of memory in allocating exe pipe data"); } - else ERR("Out of memory in allocating exe pipe data"); } else { + exe->pipe_error.data_size = i - last; exe->pipe_error.data_buf = malloc(exe->pipe_error.data_size); if (exe->pipe_error.data_buf) + memcpy(exe->pipe_error.data_buf, c, exe->pipe_error.data_size); + else { - exe->pipe_error.data_size = i - last; - memcpy(exe->pipe_error.data_buf, c, exe->pipe_error.data_size); + exe->pipe_error.data_size = 0; + ERR("Out of memory in allocating exe pipe data"); } - else ERR("Out of memory in allocating exe pipe data"); } } if (count == 0) /* No lines to send, cancel the event. */