MacGui: do not crash if the presets file is not a valid utf8 file.

(cherry picked from commit c4ab876310f5e8f7c4a3d7c75cc4bccd4030e525)

diff --git a/macosx/NSJSONSerialization+HBAdditions.m b/macosx/NSJSONSerialization+HBAdditions.m
index 0f18eb17c8f2d749f9b02409705bf428ed4e6698..e7b981ce9db754712f05176b06f0e02b4b189d14 100644 (file)
--- a/macosx/NSJSONSerialization+HBAdditions.m
+++ b/macosx/NSJSONSerialization+HBAdditions.m
@@ -10,6 +10,9 @@
 
 + (id)HB_JSONObjectWithUTF8String:(const char *)nullTerminatedCString options:(NSJSONReadingOptions)opt error:(NSError **)error;
 {
+    if (!nullTerminatedCString) {
+        return nil;
+    }
     NSData *data = [NSData dataWithBytes:nullTerminatedCString length:strlen(nullTerminatedCString)];
     id result = [NSJSONSerialization JSONObjectWithData:data options:opt error:error];
     return result;