summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-04-12 13:21:56 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-04-12 13:26:46 +0100
commitdcfb8bb580b70966911792588f06ab463fdc0f80 (patch)
tree8e5496c9919600efc172a016bb1dc42db78efbd5
parent90cc0c465cd7ea4085170b2bfeb8ba7ebf29eee2 (diff)
ecore-evas - x dnd/cnp - handle null data content and not segv
-rw-r--r--src/modules/ecore_evas/engines/x/ecore_evas_x.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index 9d95ede114..68f437c4a2 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -3862,6 +3862,11 @@ _deliver_content(Ecore_Evas *ee, Ecore_Evas_Engine_Data_X11 *edata, Ecore_Evas_S
3862 Eina_Content *result = NULL; 3862 Eina_Content *result = NULL;
3863 Eina_Stringshare *mime_type = _decrypt_type(edata->selection_data[selection].requested_type); 3863 Eina_Stringshare *mime_type = _decrypt_type(edata->selection_data[selection].requested_type);
3864 3864
3865 if (!x11_data->data)
3866 {
3867 ERR("delivering NULL content");
3868 return;
3869 }
3865 if (eina_str_has_prefix(mime_type,"text")) 3870 if (eina_str_has_prefix(mime_type,"text"))
3866 { 3871 {
3867 //ensure that we always have a \0 at the end, there is no assertion that \0 is included here. 3872 //ensure that we always have a \0 at the end, there is no assertion that \0 is included here.