elm_cnp: modify data_ret value in _wl_general_conveter() to return NULL when input...
authorTaehyub Kim <taehyub.kim@samsung.com>
Mon, 19 Dec 2016 09:24:16 +0000 (18:24 +0900)
committerWonki Kim <wonki_.kim@samsung.com>
Mon, 2 Jan 2017 05:37:10 +0000 (14:37 +0900)
Change-Id: I76d302220ccebd6b897197c8465fba28d2f9d14c

src/lib/elm_cnp.c

index 20deaec..3a53289 100644 (file)
@@ -2554,14 +2554,22 @@ _wl_general_converter(char *target, Wl_Cnp_Selection *sel EINA_UNUSED, void *dat
      formats = atom->formats;
    if (formats == ELM_SEL_FORMAT_NONE)
      {
-        if (data_ret)
+        if (data)
           {
-             *data_ret = malloc(size * sizeof(char) + 1);
-             if (!*data_ret) return EINA_FALSE;
-             memcpy(*data_ret, data, size);
-             ((char**)(data_ret))[0][size] = 0;
+             if (data_ret)
+               {
+                  *data_ret = malloc(size * sizeof(char) + 1);
+                  if (!*data_ret) return EINA_FALSE;
+                  memcpy(*data_ret, data, size);
+                  ((char**)(data_ret))[0][size] = 0;
+               }
+             if (size_ret) *size_ret = size;
+          }
+        else
+          {
+             if (data_ret) *data_ret = NULL;
+             if (size_ret) *size_ret = 0;
           }
-        if (size_ret) *size_ret = size;
      }
    else
      {