From 279937a6b9d9838e98260f1946485d4acd78acc1 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Fri, 19 Oct 2012 01:29:19 +0000 Subject: eina: backport r78209. SVN revision: 78210 --- ChangeLog | 6 +++++- src/lib/eina_stringshare.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67c027e..2c85cbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -345,4 +345,8 @@ * Fix return value of eina_mmap_safety_enabled_set() and ensure future eina_mmap_safety_enabled_get() return right value on success. - + +2012-10-19 Patryk Kaczmarek + + * eina_stringshare_add_length return NULL when func args are wrong. + diff --git a/src/lib/eina_stringshare.c b/src/lib/eina_stringshare.c index 0e64214..6d236c5 100644 --- a/src/lib/eina_stringshare.c +++ b/src/lib/eina_stringshare.c @@ -612,7 +612,7 @@ EAPI Eina_Stringshare * eina_stringshare_add_length(const char *str, unsigned int slen) { if ((!str) || (slen <= 0)) - return ""; + return NULL; else if (slen == 1) return (Eina_Stringshare *) _eina_stringshare_single + ((*str) << 1); else if (slen < 4) -- cgit v1.2.1