netstar pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=11b291aabefd09230ca9e24bd87d9118e6a7bc91

commit 11b291aabefd09230ca9e24bd87d9118e6a7bc91
Author: Alastair Poole <[email protected]>
Date:   Thu Jun 21 14:58:25 2018 +0100

    ecore_cocoa_cnp: Check for nil object before adding.
    
    This is fixing a segfault. More work needs to be done in
    efl_selection_manager.c. Current status is broken.
---
 src/lib/ecore_cocoa/ecore_cocoa_cnp.m | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/lib/ecore_cocoa/ecore_cocoa_cnp.m 
b/src/lib/ecore_cocoa/ecore_cocoa_cnp.m
index da2db90aa0..03dcb22771 100644
--- a/src/lib/ecore_cocoa/ecore_cocoa_cnp.m
+++ b/src/lib/ecore_cocoa/ecore_cocoa_cnp.m
@@ -24,7 +24,8 @@ ecore_cocoa_clipboard_set(const void           *data,
         str = [[NSString alloc] initWithBytes: data
                                        length: size
                                      encoding: NSUTF8StringEncoding];
-        [objects addObject: str];
+        if (str)
+          [objects addObject: str];
      }
    if (type & ECORE_COCOA_CNP_TYPE_MARKUP)
      {
@@ -35,7 +36,8 @@ ecore_cocoa_clipboard_set(const void           *data,
                                        length: strlen(utf8) // XXX strlen() ?
                                      encoding: NSUTF8StringEncoding];
         free(utf8);
-        [objects addObject: str];
+        if (str)
+          [objects addObject: str];
      }
    if (type & ECORE_COCOA_CNP_TYPE_IMAGE)
      {

-- 


Reply via email to