system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-07-03 08:19:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

wcap: Check for mmap and malloc return value in wcap decode module

Browse Source 
Checking for return value in main.c for wcap_decoder_create function
and mmap, malloc return value in wcap_decoder_create function to avoid
crashes

Signed-off-by: vivek <vivek.ellur@samsung.com>
This commit is contained in:
vivek 2014-05-06 15:54:49 +05:30 committed by Kristian Høgsberg
parent 4779241516
commit 6f0907b6d8
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wcap/main.c
View File

@ -251,6 +251,10 @@ int main(int argc, char *argv[])
}
decoder = wcap_decoder_create(argv[1]);
if (decoder == NULL) {
fprintf(stderr, "Creating wcap decoder failed\n");
exit(EXIT_FAILURE);
}
if (yuv4mpeg2 && isatty(1)) {
fprintf(stderr, "Not dumping yuv4mpeg2 data to terminal. Pipe output to a file or a process.\n");

9
wcap/wcap-decode.c
View File

@ -126,6 +126,11 @@ wcap_decoder_create(const char *filename)
decoder->size = buf.st_size;
decoder->map = mmap(NULL, decoder->size,
PROT_READ, MAP_PRIVATE, decoder->fd, 0);
if (decoder->map == MAP_FAILED) {
fprintf(stderr, "mmap failed\n");
free(decoder);
return NULL;
}
header = decoder->map;
decoder->format = header->format;
@ -137,6 +142,10 @@ wcap_decoder_create(const char *filename)
frame_size = header->width * header->height * 4;
decoder->frame = malloc(frame_size);
if (decoder->frame == NULL) {
free(decoder);
return NULL;
}
memset(decoder->frame, 0, frame_size);
return decoder;