Merge pull request #3949 from akallabeth/gdi_surface_crash_fix

Check arguments for Bitmap_SetSurface
2017-05-11 13:59:00 +02:00 · 2017-05-11 13:59:00 +02:00 · 1e3d4d62a4
commit 1e3d4d62a4
parent 12dbc06b1a 3eb882dd53
1 changed files with 8 additions and 1 deletions
--- a/libfreerdp/gdi/graphics.c
+++ b/libfreerdp/gdi/graphics.c
@ -183,7 +183,14 @@ static BOOL gdi_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap,
 static BOOL gdi_Bitmap_SetSurface(rdpContext* context, rdpBitmap* bitmap,
                                  BOOL primary)
 {
-	rdpGdi* gdi = context->gdi;
+	rdpGdi* gdi;
+
+	if (!context)
+		return FALSE;
+
+	gdi = context->gdi;
+	if (!gdi)
+		return FALSE;

 	if (primary)
 		gdi->drawing = gdi->primary;