Fix #4291: xfreerdp segfault when connecting freerdp-shadow-cli
authordaixj <daixj@shterm.com>
Wed, 29 Nov 2017 10:12:40 +0000 (05:12 -0500)
committerdaixj <daixj@shterm.com>
Wed, 29 Nov 2017 10:12:40 +0000 (05:12 -0500)
libfreerdp/gdi/gdi.c

index e099ecf..af6ac5a 100644 (file)
@@ -1149,11 +1149,11 @@ static BOOL gdi_init_primary(rdpGdi* gdi, UINT32 stride, UINT32 format,
                                       buffer, pfree);
        }
 
-       gdi->stride = gdi->primary->bitmap->scanline;
-
        if (!gdi->primary->bitmap)
                goto fail_bitmap;
 
+       gdi->stride = gdi->primary->bitmap->scanline;
+
        gdi_SelectObject(gdi->primary->hdc, (HGDIOBJECT) gdi->primary->bitmap);
        gdi->primary->org_bitmap = NULL;
        gdi->primary_buffer = gdi->primary->bitmap->data;