From e175587865ccd01f1771f61cc05735158c8ba6df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erkki=20Sepp=C3=A4l=C3=A4?= <erkki.seppala@vincit.fi>
Date: Thu, 27 Jan 2011 09:54:00 +0200
Subject: Dereferencing possibly NULL "str" in call to function "memcpy" (Deref
 assumed on the basis of 'nonnull' parameter attribute.)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If _XkbGetReadBufferPtr returns NULL, goto BAILOUT

Reviewed-by: Dirk Wallenstein <halsmit@t-online.de>
Reviewed-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com>
Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
---
 nx-X11/lib/X11/XKBList.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'nx-X11/lib')

diff --git a/nx-X11/lib/X11/XKBList.c b/nx-X11/lib/X11/XKBList.c
index 569e732b4..cdbb27063 100644
--- a/nx-X11/lib/X11/XKBList.c
+++ b/nx-X11/lib/X11/XKBList.c
@@ -79,6 +79,8 @@ char *			str;
 	if (!this->name)
 	    goto BAILOUT;
 	str= (char *)_XkbGetReadBufferPtr(buf,wlen);
+	if (!str)
+	    goto BAILOUT;
 	memcpy(this->name,str,slen);
     }
     return first;
-- 
cgit v1.2.3