RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-22 06:46:59 +00:00
Code Issues Projects Releases Wiki Activity

avdevice/xcbgrab: Fix/remove unneeded NULL checks

Browse Source 
Fixes CID1254664

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-16 19:01:10 +01:00
parent 374c907fb3
commit 62eca2f827
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavdevice/xcbgrab.c
View File

@ -596,21 +596,19 @@ static av_cold int xcbgrab_read_header(AVFormatContext *s)
const xcb_setup_t *setup; const xcb_setup_t *setup;
char *display_name = av_strdup(s->filename); char *display_name = av_strdup(s->filename);
if (s->filename) { if (!display_name)
if (!display_name) return AVERROR(ENOMEM);
return AVERROR(ENOMEM);
if (!sscanf(s->filename, "%[^+]+%d,%d", display_name, &c->x, &c->y)) { if (!sscanf(s->filename, "%[^+]+%d,%d", display_name, &c->x, &c->y)) {
*display_name = 0; *display_name = 0;
sscanf(s->filename, "+%d,%d", &c->x, &c->y); sscanf(s->filename, "+%d,%d", &c->x, &c->y);
}
} }
c->conn = xcb_connect(display_name, &screen_num); c->conn = xcb_connect(display_name, &screen_num);
av_freep(&display_name); av_freep(&display_name);
if ((ret = xcb_connection_has_error(c->conn))) { if ((ret = xcb_connection_has_error(c->conn))) {
av_log(s, AV_LOG_ERROR, "Cannot open display %s, error %d.\n", av_log(s, AV_LOG_ERROR, "Cannot open display %s, error %d.\n",
s->filename ? s->filename : "default", ret); (*s->filename) ? s->filename : "default", ret);
return AVERROR(EIO); return AVERROR(EIO);
} }
setup = xcb_get_setup(c->conn); setup = xcb_get_setup(c->conn);