--- a/unix/x0vncserver/Image.cxx Wed Oct 22 10:30:27 2014

+++ b/unix/x0vncserver/Image.cxx Wed Oct 22 10:46:12 2014

@@ -79,6 +79,13 @@

xim = XCreateImage(dpy, vis, DefaultDepth(dpy, DefaultScreen(dpy)),

ZPixmap, 0, 0, width, height, BitmapPad(dpy), 0);

+ if (xim->bytes_per_line <= 0 ||

+ xim->height <= 0 ||

+ xim->height >= INT_MAX / xim->bytes_per_line) {

+ vlog.error("Invalid display size");

+ XDestroyImage(xim);

+ exit(1);

+ }

xim->data = (char *)malloc(xim->bytes_per_line * xim->height);

if (xim->data == NULL) {

@@ -256,6 +263,17 @@

return;

}

+ if (xim->bytes_per_line <= 0 ||

+ xim->height <= 0 ||

+ xim->height >= INT_MAX / xim->bytes_per_line) {

+ vlog.error("Invalid display size");

+ XDestroyImage(xim);

+ xim = NULL;

+ delete shminfo;

+ shminfo = NULL;

+ return;

+ }

+

shminfo->shmid = shmget(IPC_PRIVATE,

xim->bytes_per_line * xim->height,

IPC_CREAT|0777);