Check that CFStringCreateWithCString succeeded

Addresses #9
jakewilliami · Aug 29, 2022 · ddcbd9b · ddcbd9b
1 parent 750cca4
commit ddcbd9b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/utils/darwin.jl b/src/utils/darwin.jl
@@ -19,10 +19,11 @@ const K_CF_STRING_ENCODING_UTF8 = UInt32(65001)
 
 # https://developer.apple.com/documentation/corefoundation/1542942-cfstringcreatewithcstring        
 function _cfstring_create_with_cstring(s::AbstractString, encoding::Unsigned = K_CFSTRING_ENCODING_MACROMAN)
-    return ccall(:CFStringCreateWithCString, Cstring, 
-                 (Ptr{Cvoid}, Cstring, UInt32),
-                 C_NULL, s, encoding)
-    # TODO: check if result is null (if so, there was a problem creating the string)
+    cfstr = ccall(:CFStringCreateWithCString, Cstring, 
+                  (Ptr{Cvoid}, Cstring, UInt32),
+                  C_NULL, s, encoding)
+    cfstr == C_NULL && error("Cannot create CF String for $(repr(s)) using encoding $(repr(encoding))")
+    return cfstr
 end
 
 # https://developer.apple.com/documentation/coreservices/1426917-mditemcreate

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -34,6 +34,7 @@ using Test
                 f = String(rand(Char, 32))  # this path shouldn't exist
                 cfstr = HiddenFiles._cfstring_create_with_cstring(f)
                 @test_throws Exception HiddenFiles._mditem_create(cfstr)
+                @test_throws Exception HiddenFiles._cfstring_create_with_cstring("Julia", 0x1c000101)  # this encoding mode should not exist
             end
         else
             @testset "HiddenFiles.jl—UNIX excluding macOS" begin