fix: prevent crashes during onuncaughterror (#141)

NativeScript · Mar 7, 2022 · 65be29b · 65be29b
1 parent c580098
commit 65be29b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/NativeScript/runtime/NativeScriptException.mm b/NativeScript/runtime/NativeScriptException.mm
@@ -43,7 +43,12 @@
         Local<Object> thiz = Object::New(isolate);
         Local<Value> args[] = { error };
         Local<Value> result;
+        TryCatch tc(isolate);
         success = errorHandlerFunc->Call(context, thiz, 1, args).ToLocal(&result);
+        if (tc.HasCaught()) {
+            tns::LogError(isolate, tc);
+        }
+
         tns::Assert(success, isolate);
     }
 

diff --git a/NativeScript/runtime/Runtime.mm b/NativeScript/runtime/Runtime.mm
@@ -159,10 +159,10 @@
     if (AppPackageJson == nil) {
         NSString* packageJsonPath = [[NSString stringWithUTF8String:RuntimeConfig.ApplicationPath.c_str()] stringByAppendingPathComponent:@"package.json"];
         NSData* data = [NSData dataWithContentsOfFile:packageJsonPath];
-        AppPackageJson = @{};
         if (data) {
             NSError* error = nil;
-            AppPackageJson = [NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:&error];
+            NSDictionary* dict = [NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:&error];
+            AppPackageJson = [[NSDictionary alloc] initWithDictionary:dict];
         }
     }