summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorРуслан Ижбулатов <lrn1986@gmail.com>2018-06-10 20:58:19 +0000
committerРуслан Ижбулатов <lrn1986@gmail.com>2018-06-10 21:21:12 +0000
commitcacdef8db73f8d87c2c88d77414fbd2b854a5ea3 (patch)
tree403f48834afb28f0362839eba0732122af3a7cf6
parent1e2ab40539801dd485636a79cb5e92937f0491ed (diff)
downloadgtk+-cacdef8db73f8d87c2c88d77414fbd2b854a5ea3.tar.gz
A quick and dirty fix for a circular allocation issue
query_targets() tried to write to struct that wasn't yet allocated. This code is going to change soon, so this is a temporary fix until then.
-rw-r--r--gdk/win32/gdkdrop-win32.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gdk/win32/gdkdrop-win32.c b/gdk/win32/gdkdrop-win32.c
index 2c15be42b6..23d95d1824 100644
--- a/gdk/win32/gdkdrop-win32.c
+++ b/gdk/win32/gdkdrop-win32.c
@@ -435,10 +435,11 @@ idroptarget_dragenter (LPDROPTARGET This,
*/
source_context ? source_context->source_surface : NULL,
ctx->dest_surface,
- query_targets (pDataObj, context_win32->droptarget_w32format_contentformat_map),
+ query_targets (pDataObj, NULL),
GDK_ACTION_DEFAULT | GDK_ACTION_COPY | GDK_ACTION_MOVE,
GDK_DRAG_PROTO_OLE2);
context_win32 = GDK_WIN32_DROP_CONTEXT (context);
+ gdk_content_formats_unref (query_targets (pDataObj, context_win32->droptarget_w32format_contentformat_map));
g_array_set_size (context_win32->droptarget_w32format_contentformat_map, 0);
g_set_object (&context_win32->local_source_context, GDK_WIN32_DRAG_CONTEXT (source_context));