mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

screenshooter: check for NULL malloc and fix memleaks

Browse Source 
Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
This commit is contained in:
U. Artie Eoff
2014-01-15 09:36:00 -08:00
committed by Kristian Høgsberg
parent f05645b30e
commit 13708a4d67
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/screenshooter.c
+12 -1
View File
@@ -190,7 +190,7 @@ screenshooter_shoot(struct wl_client *client,
} }
if (!wl_shm_buffer_get(buffer->resource)) if (!wl_shm_buffer_get(buffer->resource))
return; return;
buffer->shm_buffer = wl_shm_buffer_get(buffer->resource); buffer->shm_buffer = wl_shm_buffer_get(buffer->resource);
buffer->width = wl_shm_buffer_get_width(buffer->shm_buffer); buffer->width = wl_shm_buffer_get_width(buffer->shm_buffer);
buffer->height = wl_shm_buffer_get_height(buffer->shm_buffer); buffer->height = wl_shm_buffer_get_height(buffer->shm_buffer);
@@ -428,6 +428,11 @@ weston_recorder_create(struct weston_output *output, const char *filename)
recorder = malloc(sizeof *recorder); recorder = malloc(sizeof *recorder);
if (recorder == NULL) {
weston_log("%s: out of memory\n", __func__);
return;
}
stride = output->current_mode->width; stride = output->current_mode->width;
size = stride * 4 * output->current_mode->height; size = stride * 4 * output->current_mode->height;
recorder->frame = zalloc(size); recorder->frame = zalloc(size);
@@ -454,6 +459,9 @@ weston_recorder_create(struct weston_output *output, const char *filename)
break; break;
default: default:
weston_log("unknown recorder format\n"); weston_log("unknown recorder format\n");
free(recorder->rect);
free(recorder->tmpbuf);
free(recorder->frame);
free(recorder); free(recorder);
return; return;
} }
@@ -463,6 +471,9 @@ weston_recorder_create(struct weston_output *output, const char *filename)
if (recorder->fd < 0) { if (recorder->fd < 0) {
weston_log("problem opening output file %s: %m\n", filename); weston_log("problem opening output file %s: %m\n", filename);
free(recorder->rect);
free(recorder->tmpbuf);
free(recorder->frame);
free(recorder); free(recorder);
return; return;
} }