From c4ab876310f5e8f7c4a3d7c75cc4bccd4030e525 Mon Sep 17 00:00:00 2001 From: Damiano Galassi Date: Sun, 15 Apr 2018 09:07:21 +0200 Subject: [PATCH] MacGui: do not crash if the presets file is not a valid utf8 file. --- macosx/NSJSONSerialization+HBAdditions.m | 3 +++ 1 file changed, 3 insertions(+) diff --git a/macosx/NSJSONSerialization+HBAdditions.m b/macosx/NSJSONSerialization+HBAdditions.m index 0f18eb17c..e7b981ce9 100644 --- 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; -- 2.40.0