RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-18 04:51:52 +00:00
Code Issues Releases Wiki Activity

vo_x11: check allocation errors

Browse Source 
Avoids a crash if allocation fails.
This commit is contained in:
wm4 2014-12-14 22:00:21 +01:00
parent 91b8a7f994
commit 399e2fec6b
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
video/out/vo_x11.c
View File

@ -152,7 +152,7 @@ static int find_depth_from_visuals(struct vo *vo, Visual ** visual_return)
return bestvisual_depth;
}
static void getMyXImage(struct priv *p, int foo)
static bool getMyXImage(struct priv *p, int foo)
{
struct vo *vo = p->vo;
#if HAVE_SHM && HAVE_XEXT
@ -210,6 +210,10 @@ shmemerror:
p->myximage[foo] =
XCreateImage(vo->x11->display, p->vinfo.visual, p->depth, ZPixmap,
0, NULL, p->image_width, p->image_height, 8, 0);
if (!p->myximage[foo]) {
MP_WARN(vo, "could not allocate image");
return false;
}
size_t sz = p->myximage[foo]->bytes_per_line * p->image_height + 32;
p->ImageDataOrig[foo] = calloc(1, sz);
p->myximage[foo]->data = p->ImageDataOrig[foo] + 16
@ -218,6 +222,7 @@ shmemerror:
#if HAVE_SHM && HAVE_XEXT
}
#endif
return true;
}
static void freeMyXImage(struct priv *p, int foo)
@ -340,8 +345,10 @@ static bool resize(struct vo *vo)
p->image_height = p->dst_h;
p->num_buffers = 2;
for (int i = 0; i < p->num_buffers; i++)
getMyXImage(p, i);
for (int i = 0; i < p->num_buffers; i++) {
if (!getMyXImage(p, i))
return -1;
}
const struct fmt2Xfmtentry_s *fmte = fmt2Xfmt;
while (fmte->mpfmt) {