diff options
| author | Marek Chalupa <mchqwerty@gmail.com> | 2014-12-10 11:50:46 +0100 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2014-12-12 14:52:29 +0200 |
| commit | ab9285bf8a7a866daa7b4efc9f27181ea4fdc719 (patch) | |
| tree | 521daf8fe8ff997e06c7cec63999bff59ad31dfa /src/screenshooter.c | |
| parent | a519d06a53962704f81030967fc0b892376356e9 (diff) | |
| download | weston-ab9285bf8a7a866daa7b4efc9f27181ea4fdc719.tar.gz | |
screenshooter: fix various memory handling
There were unchecked malloc and no free for this memory.
Also simplify error handling in one function.
v2. remove check if memory is NULL, according to man pages,
free(NULL) is a no-op
Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'src/screenshooter.c')
| -rw-r--r-- | src/screenshooter.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/src/screenshooter.c b/src/screenshooter.c index 6246cda4..c98e2f91 100644 --- a/src/screenshooter.c +++ b/src/screenshooter.c @@ -464,8 +464,9 @@ weston_recorder_free(struct weston_recorder *recorder) { if (recorder == NULL) return; - free(recorder->rect); + free(recorder->tmpbuf); + free(recorder->rect); free(recorder->frame); free(recorder); } @@ -495,12 +496,16 @@ weston_recorder_create(struct weston_output *output, const char *filename) if ((recorder->frame == NULL) || (recorder->rect == NULL)) { weston_log("%s: out of memory\n", __func__); - weston_recorder_free(recorder); - return; + goto err_recorder; } - if (!do_yflip) + if (!do_yflip) { recorder->tmpbuf = malloc(size); + if (recorder->tmpbuf == NULL) { + weston_log("%s: out of memory\n", __func__); + goto err_recorder; + } + } header.magic = WCAP_HEADER_MAGIC; @@ -514,8 +519,7 @@ weston_recorder_create(struct weston_output *output, const char *filename) break; default: weston_log("unknown recorder format\n"); - weston_recorder_free(recorder); - return; + goto err_recorder; } recorder->fd = open(filename, @@ -523,8 +527,7 @@ weston_recorder_create(struct weston_output *output, const char *filename) if (recorder->fd < 0) { weston_log("problem opening output file %s: %m\n", filename); - weston_recorder_free(recorder); - return; + goto err_recorder; } header.width = output->current_mode->width; @@ -535,6 +538,12 @@ weston_recorder_create(struct weston_output *output, const char *filename) wl_signal_add(&output->frame_signal, &recorder->frame_listener); output->disable_planes++; weston_output_damage(output); + + return; + +err_recorder: + weston_recorder_free(recorder); + return; } static void |