From: Taehyub Kim Date: Mon, 19 Dec 2016 09:24:16 +0000 (+0900) Subject: elm_cnp: modify data_ret value in _wl_general_conveter() to return NULL when input... X-Git-Tag: submit/tizen/20170102.091821~29 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=26c700f03bc2293b08fa91b48fa0bfcdc6af4f1f;p=platform%2Fupstream%2Felementary.git elm_cnp: modify data_ret value in _wl_general_conveter() to return NULL when input data is empty Change-Id: I76d302220ccebd6b897197c8465fba28d2f9d14c --- diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c index 20deaec12..3a5328908 100644 --- a/src/lib/elm_cnp.c +++ b/src/lib/elm_cnp.c @@ -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 {