RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

wayland: fix unchecked malloc usage 

Found by cppcheck.

Actually untested. (This is the file drag&drop code, I don't even know
which wayland clients support this.)
This commit is contained in:
wm4 2014-05-11 16:19:05 +02:00
parent 3d530af8ef
commit 342298fd1a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
video/out/wayland_common.c
View File

@ -1006,26 +1006,32 @@ static int vo_wayland_check_events (struct vo *vo)
size_t str_len = 0;
int has_read = 0;
if (!buffer)
goto fail;
while (0 < (has_read = read(fd.fd, buffer+str_len, to_read))) {
if (buffer_len + to_read < buffer_len) {
MP_ERR(wl, "Integer overflow while reading from fd\n");
free(buffer);
break;
}
str_len += has_read;
buffer_len += to_read;
buffer = realloc(buffer, buffer_len);
void *ptr = realloc(buffer, buffer_len);
if (!ptr)
break;
buffer = ptr;
if (has_read < to_read) {
buffer[str_len] = 0;
struct bstr file_list = bstr0(buffer);
mp_event_drop_mime_data(vo->input_ctx, "text/uri-list",
file_list);
free(buffer);
break;
}
}
fail:
free(buffer);
}
if (fd.revents & POLLHUP) {