mirrors/FreeRDP
0
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2024-11-27 20:04:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed accidental free of XImage data.

Browse Source
This commit is contained in:
Armin Novak 2018-02-12 11:14:54 +01:00
parent 3293b4247c
commit 62607e3b02
5 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/X11/xf_client.c
View File

@ -612,14 +612,12 @@ BOOL xf_create_window(xfContext* xfc)
settings->DesktopHeight, xfc->depth); settings->DesktopHeight, xfc->depth);
xfc->drawing = xfc->primary; xfc->drawing = xfc->primary;
if (!xfc->bitmap_mono) if (!xfc->bitmap_mono)
xfc->bitmap_mono = XCreatePixmap(xfc->display, xfc->drawable, 8, 8, 1); xfc->bitmap_mono = XCreatePixmap(xfc->display, xfc->drawable, 8, 8, 1);
if (!xfc->gc_mono) if (!xfc->gc_mono)
xfc->gc_mono = XCreateGC(xfc->display, xfc->bitmap_mono, GCGraphicsExposures, xfc->gc_mono = XCreateGC(xfc->display, xfc->bitmap_mono, GCGraphicsExposures,
&gcv); &gcv);
XSetFunction(xfc->display, xfc->gc, GXcopy); XSetFunction(xfc->display, xfc->gc, GXcopy);
XSetFillStyle(xfc->display, xfc->gc, FillSolid); XSetFillStyle(xfc->display, xfc->gc, FillSolid);
XSetForeground(xfc->display, xfc->gc, BlackPixelOfScreen(xfc->screen)); XSetForeground(xfc->display, xfc->gc, BlackPixelOfScreen(xfc->screen));

4
client/X11/xf_gdi.c
View File

@ -245,6 +245,8 @@ 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);
image->data = NULL;
XDestroyImage(image); XDestroyImage(image);
if (cdata != data) if (cdata != data)
@ -269,6 +271,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);
image->data = NULL;
XDestroyImage(image); XDestroyImage(image);
return bitmap; return bitmap;
} }
@ -1028,6 +1031,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);
image->data = NULL;
XDestroyImage(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

@ -26,6 +26,8 @@
#include <freerdp/log.h> #include <freerdp/log.h>
#include "xf_gfx.h" #include "xf_gfx.h"
#include <X11/Xutil.h>
#define TAG CLIENT_TAG("x11") #define TAG CLIENT_TAG("x11")
static UINT xf_OutputUpdate(xfContext* xfc, xfGfxSurface* surface) static UINT xf_OutputUpdate(xfContext* xfc, xfGfxSurface* surface)
@ -310,6 +312,7 @@ static UINT xf_CreateSurface(RdpgfxClientContext* context,
return CHANNEL_RC_OK; return CHANNEL_RC_OK;
error_set_surface_data: error_set_surface_data:
surface->image->data = NULL;
XDestroyImage(surface->image); XDestroyImage(surface->image);
error_surface_image: error_surface_image:
_aligned_free(surface->stage); _aligned_free(surface->stage);
@ -338,6 +341,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
surface->image->data = NULL;
XDestroyImage(surface->image); XDestroyImage(surface->image);
_aligned_free(surface->gdi.data); _aligned_free(surface->gdi.data);
_aligned_free(surface->stage); _aligned_free(surface->stage);

9
client/X11/xf_graphics.c
View File

@ -170,11 +170,17 @@ static void xf_Bitmap_Free(rdpContext* context, rdpBitmap* bitmap)
xf_lock_x11(xfc, FALSE); xf_lock_x11(xfc, FALSE);
if (xbitmap->pixmap != 0) if (xbitmap->pixmap != NULL)
{
XFreePixmap(xfc->display, xbitmap->pixmap); XFreePixmap(xfc->display, xbitmap->pixmap);
xbitmap->pixmap = NULL;
}
if (xbitmap->image) if (xbitmap->image)
{
XDestroyImage(xbitmap->image); XDestroyImage(xbitmap->image);
xbitmap->image = NULL;
}
xf_unlock_x11(xfc, FALSE); xf_unlock_x11(xfc, FALSE);
} }
@ -397,6 +403,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);
image->data = NULL;
XDestroyImage(image); XDestroyImage(image);
xf_unlock_x11(xfc, FALSE); xf_unlock_x11(xfc, FALSE);
return TRUE; return TRUE;

2
rdtk/sample/rdtk_x11.c
View File

@ -24,6 +24,7 @@
#include <rdtk/rdtk.h> #include <rdtk/rdtk.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h>
#define TAG "rdtk.sample" #define TAG "rdtk.sample"
@ -144,7 +145,6 @@ int main(int argc, char** argv)
XFlush(display); XFlush(display);
XDestroyImage(image); XDestroyImage(image);
XFreePixmap(display, pixmap);
XCloseDisplay(display); XCloseDisplay(display);
rdtk_surface_free(surface); rdtk_surface_free(surface);