|
 |
8a5eb05 |
From 6ee2028996ee9d8802201e95f3cec56e2b307ddb Mon Sep 17 00:00:00 2001
|
|
|
8a5eb05 |
From: Jean-Louis Dupond <jean-louis@dupond.be>
|
|
|
8a5eb05 |
Date: Sat, 5 May 2012 16:54:18 +0200
|
|
|
8a5eb05 |
Subject: [PATCH] Fix crashes in some cases
|
|
|
8a5eb05 |
|
|
|
8a5eb05 |
---
|
|
|
8a5eb05 |
remmina-plugins/rdp/rdp_cliprdr.c | 19 +++++++++++++------
|
|
|
8a5eb05 |
1 file changed, 13 insertions(+), 6 deletions(-)
|
|
|
8a5eb05 |
|
|
|
8a5eb05 |
diff --git a/remmina-plugins/rdp/rdp_cliprdr.c b/remmina-plugins/rdp/rdp_cliprdr.c
|
|
|
8a5eb05 |
index d84374e..772709c 100644
|
|
|
8a5eb05 |
--- a/remmina-plugins/rdp/rdp_cliprdr.c
|
|
|
8a5eb05 |
+++ b/remmina-plugins/rdp/rdp_cliprdr.c
|
|
|
8a5eb05 |
@@ -204,7 +204,7 @@ uint8* remmina_rdp_cliprdr_get_data(RemminaProtocolWidget* gp, uint32 format, in
|
|
|
8a5eb05 |
g_printf("GetData: Requested Format: %#X\n", format);
|
|
|
8a5eb05 |
rfContext* rfi = GET_DATA(gp);
|
|
|
8a5eb05 |
GtkClipboard* clipboard;
|
|
|
8a5eb05 |
- uint8* inbuf = (uint8*)"";
|
|
|
8a5eb05 |
+ uint8* inbuf = NULL;
|
|
|
8a5eb05 |
uint8* outbuf = NULL;
|
|
|
8a5eb05 |
GdkPixbuf *image = NULL;
|
|
|
8a5eb05 |
|
|
|
8a5eb05 |
@@ -223,10 +223,18 @@ uint8* remmina_rdp_cliprdr_get_data(RemminaProtocolWidget* gp, uint32 format, in
|
|
|
8a5eb05 |
}
|
|
|
8a5eb05 |
THREADS_LEAVE
|
|
|
8a5eb05 |
|
|
|
8a5eb05 |
+ /* No data received, send nothing */
|
|
|
8a5eb05 |
+ if (inbuf == NULL && image == NULL)
|
|
|
8a5eb05 |
+ {
|
|
|
8a5eb05 |
+ g_printf("NO DATA RECEIVED\n");
|
|
|
8a5eb05 |
+ *size = 0;
|
|
|
8a5eb05 |
+ return NULL;
|
|
|
8a5eb05 |
+ }
|
|
|
8a5eb05 |
+
|
|
|
8a5eb05 |
+
|
|
|
8a5eb05 |
if (format == CB_FORMAT_TEXT || format == CB_FORMAT_HTML || format == CB_FORMAT_UNICODETEXT)
|
|
|
8a5eb05 |
{
|
|
|
8a5eb05 |
- if (inbuf == NULL)
|
|
|
8a5eb05 |
- inbuf = (uint8*)"";
|
|
|
8a5eb05 |
+ *size = strlen((char*)inbuf);
|
|
|
8a5eb05 |
inbuf = lf2crlf(inbuf, size);
|
|
|
8a5eb05 |
if (format == CB_FORMAT_TEXT)
|
|
|
8a5eb05 |
{
|
|
|
8a5eb05 |
@@ -258,12 +266,14 @@ uint8* remmina_rdp_cliprdr_get_data(RemminaProtocolWidget* gp, uint32 format, in
|
|
|
8a5eb05 |
gdk_pixbuf_save_to_buffer(image, &data, &buffersize, "png", NULL, NULL);
|
|
|
8a5eb05 |
outbuf = (uint8*) xmalloc(buffersize);
|
|
|
8a5eb05 |
memcpy(outbuf, data, buffersize);
|
|
|
8a5eb05 |
+ *size = buffersize;
|
|
|
8a5eb05 |
}
|
|
|
8a5eb05 |
if (format == CB_FORMAT_JPEG)
|
|
|
8a5eb05 |
{
|
|
|
8a5eb05 |
gdk_pixbuf_save_to_buffer(image, &data, &buffersize, "jpeg", NULL, NULL);
|
|
|
8a5eb05 |
outbuf = (uint8*) xmalloc(buffersize);
|
|
|
8a5eb05 |
memcpy(outbuf, data, buffersize);
|
|
|
8a5eb05 |
+ *size = buffersize;
|
|
|
8a5eb05 |
}
|
|
|
8a5eb05 |
if (format == CB_FORMAT_DIB)
|
|
|
8a5eb05 |
{
|
|
|
8a5eb05 |
@@ -276,9 +286,6 @@ uint8* remmina_rdp_cliprdr_get_data(RemminaProtocolWidget* gp, uint32 format, in
|
|
|
8a5eb05 |
g_object_unref(image);
|
|
|
8a5eb05 |
}
|
|
|
8a5eb05 |
|
|
|
8a5eb05 |
- if (!outbuf)
|
|
|
8a5eb05 |
- outbuf = (uint8*)"";
|
|
|
8a5eb05 |
-
|
|
|
8a5eb05 |
return outbuf;
|
|
|
8a5eb05 |
}
|
|
|
8a5eb05 |
|
|
|
8a5eb05 |
--
|
|
|
8a5eb05 |
1.7.10
|
|
|
8a5eb05 |
|