[TIMOB-26007] Handle more exceptions

tidev · May 3, 2018 · 5a0b51e · 5a0b51e
1 parent 6c861d6
commit 5a0b51e
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 19 deletions.
diff --git a/iphone/Classes/KrollBridge.m b/iphone/Classes/KrollBridge.m
@@ -434,9 +434,8 @@ - (void)evalFileOnThread:(NSString *)path context:(KrollContext *)context_
     }
   }
   if (exception != NULL) {
-    id excm = [KrollObject toID:context value:exception];
     evaluationError = YES;
-    [[TiExceptionHandler defaultExceptionHandler] reportScriptError:[TiUtils scriptErrorValue:excm]];
+    [[TiExceptionHandler defaultExceptionHandler] reportScriptError:[TiUtils scriptErrorValue:jsContext exception:exception]];
   }
 
   TiStringRelease(jsCode);
@@ -734,8 +733,7 @@ - (KrollWrapper *)loadCommonJSModule:(NSString *)code withSourceURL:(NSURL *)sou
   [eval release];
 
   if (exception != NULL) {
-    id excm = [KrollObject toID:context value:exception];
-    [[TiExceptionHandler defaultExceptionHandler] reportScriptError:[TiUtils scriptErrorValue:excm]];
+    [[TiExceptionHandler defaultExceptionHandler] reportScriptError:[TiUtils scriptErrorValue:[context context] exception:exception]];
     return nil;
   }
   /*

diff --git a/iphone/Classes/KrollCallback.m b/iphone/Classes/KrollCallback.m
@@ -146,8 +146,7 @@ - (id)call:(NSArray *)args thisObject:(id)thisObject_
   TiValueRef exception = NULL;
   TiValueRef retVal = TiObjectCallAsFunction(jsContext, function, tp, [args count], _args, &exception);
   if (exception != NULL) {
-    id excm = [KrollObject toID:context value:exception];
-    [[TiExceptionHandler defaultExceptionHandler] reportScriptError:[TiUtils scriptErrorValue:excm]];
+    [[TiExceptionHandler defaultExceptionHandler] reportScriptError:[TiUtils scriptErrorValue:jsContext exception:exception]];
   }
   if (top != NULL) {
     TiValueUnprotect(jsContext, tp);

diff --git a/iphone/Classes/KrollContext.m b/iphone/Classes/KrollContext.m
@@ -656,8 +656,7 @@ - (void)invoke:(KrollContext *)context
   [self jsInvokeInContext:context exception:&exception];
 
   if (exception != NULL) {
-    id excm = [KrollObject toID:context value:exception];
-    [[TiExceptionHandler defaultExceptionHandler] reportScriptError:[TiUtils scriptErrorValue:excm]];
+    [[TiExceptionHandler defaultExceptionHandler] reportScriptError:[TiUtils scriptErrorValue:[context context] exception:exception]];
     pthread_mutex_unlock(&KrollEntryLock);
     @throw excm;
   }
@@ -671,8 +670,7 @@ - (id)invokeWithResult:(KrollContext *)context
   TiValueRef result = [self jsInvokeInContext:context exception:&exception];
 
   if (exception != NULL) {
-    id excm = [KrollObject toID:context value:exception];
-    [[TiExceptionHandler defaultExceptionHandler] reportScriptError:[TiUtils scriptErrorValue:excm]];
+    [[TiExceptionHandler defaultExceptionHandler] reportScriptError:[TiUtils scriptErrorValue:[context context] exception:exception]];
     pthread_mutex_unlock(&KrollEntryLock);
     @throw excm;
   }

diff --git a/iphone/Classes/KrollObject.m b/iphone/Classes/KrollObject.m
@@ -1100,8 +1100,7 @@ - (void)invokeCallbackForKey:(NSString *)key withObject:(NSDictionary *)eventDat
   TiValueRef jsEventData = ConvertIdTiValue(context, eventData);
   TiValueRef result = TiObjectCallAsFunction(jsContext, jsCallback, [_thisObject jsobject], 1, &jsEventData, &exception);
   if (exception != NULL) {
-    id excm = [KrollObject toID:context value:exception];
-    [[TiExceptionHandler defaultExceptionHandler] reportScriptError:[TiUtils scriptErrorValue:excm]];
+    [[TiExceptionHandler defaultExceptionHandler] reportScriptError:[TiUtils scriptErrorValue:jsContext exception:exception]];
   }
 
   if (block != nil) {
@@ -1361,8 +1360,7 @@ - (void)triggerEvent:(NSString *)eventName withObject:(NSDictionary *)eventData
     TiValueRef exception = NULL;
     TiObjectCallAsFunction(jsContext, (TiObjectRef)currentCallback, [thisObject jsobject], 1, &jsEventData, &exception);
     if (exception != NULL) {
-      id excm = [KrollObject toID:context value:exception];
-      [[TiExceptionHandler defaultExceptionHandler] reportScriptError:[TiUtils scriptErrorValue:excm]];
+      [[TiExceptionHandler defaultExceptionHandler] reportScriptError:[TiUtils scriptErrorValue:jsContext exception:exception]];
     }
   }
 }

diff --git a/iphone/Classes/KrollTimer.m b/iphone/Classes/KrollTimer.m
@@ -62,8 +62,7 @@ - (void)invokeWithCondition:(NSConditionLock *)invokeCond
   TiValueRef exception = NULL;
   TiObjectCallAsFunction(context, function, jsThis, 0, NULL, &exception);
   if (exception != NULL) {
-    id excm = [KrollObject toID:kroll value:exception];
-    [[TiExceptionHandler defaultExceptionHandler] reportScriptError:[TiUtils scriptErrorValue:excm]];
+    [[TiExceptionHandler defaultExceptionHandler] reportScriptError:[TiUtils scriptErrorValue:context exception:exception]];
   }
   [invokeCond unlockWithCondition:1];
 }

diff --git a/iphone/Classes/TiBindingEvent.m b/iphone/Classes/TiBindingEvent.m
@@ -265,9 +265,7 @@ void TiBindingEventProcess(TiBindingRunLoop runloop, void *payload)
         TiValueRef exception = NULL;
         TiObjectCallAsFunction(context, (TiObjectRef)currentCallback, (TiObjectRef)eventTargetRef, 1, (TiValueRef *)&eventObjectRef, &exception);
         if (exception != NULL) {
-          id excm = TiBindingTiValueToNSObject(context, exception);
-          [excm setValue:[TiUtils stackFromException:context exception:exception] forKey:@"backtrace"];
-          [[TiExceptionHandler defaultExceptionHandler] reportScriptError:[TiUtils scriptErrorValue:excm]];
+          [[TiExceptionHandler defaultExceptionHandler] reportScriptError:[TiUtils scriptErrorValue:context exception:exception]];
         }
 #ifndef TI_USE_KROLL_THREAD
       },

diff --git a/iphone/Classes/TiUtils.h b/iphone/Classes/TiUtils.h
@@ -483,6 +483,7 @@ typedef enum {
 
 + (WebFont *)fontValue:(id)value;
 
++ (TiScriptError *)scriptErrorValue:(TiContextRef)context exception:(TiValueRef)exception;
 + (TiScriptError *)scriptErrorValue:(id)value;
 
 + (NSTextAlignment)textAlignmentValue:(id)alignment;

diff --git a/iphone/Classes/TiUtils.m b/iphone/Classes/TiUtils.m
@@ -20,6 +20,7 @@
 #import "TiProxy.h"
 #import "TiUtils.h"
 #import "WebFont.h"
+#import "TiBindingTiValue.h"
 
 // for checking version
 #import <sys/utsname.h>
@@ -1252,6 +1253,13 @@ + (WebFont *)fontValue:(id)value
   return [self fontValue:value def:[WebFont defaultFont]];
 }
 
++ (TiScriptError *)scriptErrorValue:(TiContextRef)context exception:(TiValueRef)exception;
+{
+  id excm = TiBindingTiValueToNSObject(context, exception);
+  [excm setValue:[TiUtils stackFromException:context exception:exception] forKey:@"backtrace"];
+  return [self scriptErrorValue: excm];
+}
+
 + (TiScriptError *)scriptErrorValue:(id)value;
 {
   if ((value == nil) || (value == [NSNull null])) {