mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed #4412: XImage must be freed with XDestroyImage

Browse Source
This commit is contained in:
Armin Novak 2018-02-12 10:02:35 +01:00
parent 2bc9869c86
commit 7c0a33632b
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/X11/xf_gdi.c
View File

@ -245,7 +245,7 @@ static Pixmap xf_brush_new(xfContext* xfc, UINT32 width, UINT32 height,
image->bitmap_bit_order = LSBFirst; image->bitmap_bit_order = LSBFirst;
gc = XCreateGC(xfc->display, xfc->drawable, 0, NULL); gc = XCreateGC(xfc->display, xfc->drawable, 0, NULL);
XPutImage(xfc->display, bitmap, gc, image, 0, 0, 0, 0, width, height); XPutImage(xfc->display, bitmap, gc, image, 0, 0, 0, 0, width, height);
XFree(image); XDestroyImage(image);
if (cdata != data) if (cdata != data)
_aligned_free(cdata); _aligned_free(cdata);
@ -269,7 +269,7 @@ static Pixmap xf_mono_bitmap_new(xfContext* xfc, int width, int height,
image->byte_order = LSBFirst; image->byte_order = LSBFirst;
image->bitmap_bit_order = LSBFirst; image->bitmap_bit_order = LSBFirst;
XPutImage(xfc->display, bitmap, xfc->gc_mono, image, 0, 0, 0, 0, width, height); XPutImage(xfc->display, bitmap, xfc->gc_mono, image, 0, 0, 0, 0, width, height);
XFree(image); XDestroyImage(image);
return bitmap; return bitmap;
} }
@ -1028,7 +1028,7 @@ static BOOL xf_gdi_update_screen(xfContext* xfc, const BYTE* pSrcData,
image->bitmap_bit_order = LSBFirst; image->bitmap_bit_order = LSBFirst;
XPutImage(xfc->display, xfc->primary, xfc->gc, image, 0, 0, left, top, width, height); XPutImage(xfc->display, xfc->primary, xfc->gc, image, 0, 0, left, top, width, height);
XFree(image); XDestroyImage(image);
ret = xf_gdi_surface_update_frame(xfc, left, top, width, height); ret = xf_gdi_surface_update_frame(xfc, left, top, width, height);
} }

4
client/X11/xf_gfx.c
View File

@ -310,7 +310,7 @@ static UINT xf_CreateSurface(RdpgfxClientContext* context,
return CHANNEL_RC_OK; return CHANNEL_RC_OK;
error_set_surface_data: error_set_surface_data:
XFree(surface->image); XDestroyImage(surface->image);
error_surface_image: error_surface_image:
_aligned_free(surface->stage); _aligned_free(surface->stage);
out_free_gdidata: out_free_gdidata:
@ -338,7 +338,7 @@ static UINT xf_DeleteSurface(RdpgfxClientContext* context,
#ifdef WITH_GFX_H264 #ifdef WITH_GFX_H264
h264_context_free(surface->gdi.h264); h264_context_free(surface->gdi.h264);
#endif #endif
XFree(surface->image); XDestroyImage(surface->image);
_aligned_free(surface->gdi.data); _aligned_free(surface->gdi.data);
_aligned_free(surface->stage); _aligned_free(surface->stage);
region16_uninit(&surface->gdi.invalidRegion); region16_uninit(&surface->gdi.invalidRegion);

4
client/X11/xf_graphics.c
View File

@ -174,7 +174,7 @@ static void xf_Bitmap_Free(rdpContext* context, rdpBitmap* bitmap)
XFreePixmap(xfc->display, xbitmap->pixmap); XFreePixmap(xfc->display, xbitmap->pixmap);
if (xbitmap->image) if (xbitmap->image)
XFree(xbitmap->image); XDestroyImage(xbitmap->image);
xf_unlock_x11(xfc, FALSE); xf_unlock_x11(xfc, FALSE);
} }
@ -397,7 +397,7 @@ static BOOL xf_Glyph_New(rdpContext* context, const rdpGlyph* glyph)
XInitImage(image); XInitImage(image);
XPutImage(xfc->display, xf_glyph->pixmap, xfc->gc_mono, image, 0, 0, 0, 0, XPutImage(xfc->display, xf_glyph->pixmap, xfc->gc_mono, image, 0, 0, 0, 0,
glyph->cx, glyph->cy); glyph->cx, glyph->cy);
XFree(image); XDestroyImage(image);
xf_unlock_x11(xfc, FALSE); xf_unlock_x11(xfc, FALSE);
return TRUE; return TRUE;
} }

4
rdtk/sample/rdtk_x11.c
View File

@ -142,7 +142,9 @@ int main(int argc, char** argv)
} }
XFlush(display); XFlush(display);
XDestroyImage(image);
XFreePixmap(display, pixmap);
XCloseDisplay(display); XCloseDisplay(display);
rdtk_surface_free(surface); rdtk_surface_free(surface);