From: Damiano Galassi Date: Sun, 15 Apr 2018 07:07:21 +0000 (+0200) Subject: MacGui: do not crash if the presets file is not a valid utf8 file. X-Git-Tag: 1.1.2~10 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0a9ee89d9f7cb25a7cc8cf0787692e98b9b835d;p=handbrake 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 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;