fix swift crash in ZXMultiFormatWriter.m

amichnia · Mar 20, 2019 · 6324769 · 6324769
1 parent ca04898
commit 6324769
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/ZXingObjC/ZXMultiFormatWriter.m b/ZXingObjC/ZXMultiFormatWriter.m
@@ -121,7 +121,15 @@ - (ZXBitMatrix *)encode:(NSString *)contents format:(ZXBarcodeFormat)format widt
       if (error) *error = [NSError errorWithDomain:ZXErrorDomain code:ZXWriterError userInfo:@{NSLocalizedDescriptionKey: @"No encoder available for format"}];
       return nil;
   }
-  return [writer encode:contents format:format width:width height:height hints:hints error:error];
+
+  @try {
+    return [writer encode:contents format:format width:width height:height hints:hints error:error];
+  } @catch (NSException *exception) {
+    if (error) {
+        *error = [NSError errorWithDomain:ZXErrorDomain code:ZXWriterError userInfo:@{NSLocalizedDescriptionKey: exception.reason}];
+    }
+    return nil;
+  }
 }
 
 @end