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

Check malloc result

Browse Source 
This patch checks malloc was successfull and release resources if it
wasn't.
This commit is contained in:
Hardening 2014-04-11 09:06:58 +02:00 committed by Kristian Høgsberg
parent 791324cc06
commit e57d1f211d
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/screen-share.c
View File

@ -434,11 +434,12 @@ shared_output_get_shm_buffer(struct shared_output *so)
data = mmap(NULL, height * stride, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if (data == MAP_FAILED) {
weston_log("mmap: %m");
close(fd);
return NULL;
goto out_close;
}
sb = zalloc(sizeof *sb);
if (!sb)
goto out_unmap;
sb->output = so;
wl_list_init(&sb->free_link);
@ -457,14 +458,26 @@ shared_output_get_shm_buffer(struct shared_output *so)
wl_buffer_add_listener(sb->buffer, &buffer_listener, sb);
wl_shm_pool_destroy(pool);
close(fd);
fd = -1;
memset(data, 0, sb->size);
sb->pm_image =
pixman_image_create_bits(PIXMAN_a8r8g8b8, width, height,
(uint32_t *)data, stride);
if (!sb->pm_image)
goto out_pixman_error;
return sb;
out_pixman_error:
pixman_region32_fini(&sb->damage);
out_unmap:
munmap(data, height * stride);
out_close:
if (fd != -1)
close(fd);
return NULL;
}
static void