Changeset 27881 in webkit for trunk/JavaScriptCore/API

Timestamp:

Nov 17, 2007, 9:36:29 PM (18 years ago)

Author:

[email protected]

Message:

Prevent testapi from crashing if testapi.js can not be found by nil-checking the result of createStringWithContentsOfFile.

Reviewed by Sam Weinig.

File:

• trunk/JavaScriptCore/API/testapi.c (modified) (1 diff)

trunk/JavaScriptCore/API/testapi.c

@@ -810 +810 @@
     
     char* scriptUTF8 = createStringWithContentsOfFile("testapi.js");
-    JSStringRef script = JSStringCreateWithUTF8CString(scriptUTF8);
-    result = JSEvaluateScript(context, script, NULL, NULL, 1, &exception);
-    if (JSValueIsUndefined(context, result))
-        printf("PASS: Test script executed successfully.\n");
+    if (!scriptUTF8)
+        printf("FAIL: Test script could not be loaded.\n");
     else {
-        printf("FAIL: Test script returned unexcpected value:\n");
-        JSStringRef exceptionIString = JSValueToStringCopy(context, exception, NULL);
-        CFStringRef exceptionCF = JSStringCopyCFString(kCFAllocatorDefault, exceptionIString);
-        CFShow(exceptionCF);
-        CFRelease(exceptionCF);
-        JSStringRelease(exceptionIString);
-    }
-    JSStringRelease(script);
-    free(scriptUTF8);
+        JSStringRef script = JSStringCreateWithUTF8CString(scriptUTF8);
+        result = JSEvaluateScript(context, script, NULL, NULL, 1, &exception);
+        if (JSValueIsUndefined(context, result))
+            printf("PASS: Test script executed successfully.\n");
+        else {
+            printf("FAIL: Test script returned unexpected value:\n");
+            JSStringRef exceptionIString = JSValueToStringCopy(context, exception, NULL);
+            CFStringRef exceptionCF = JSStringCopyCFString(kCFAllocatorDefault, exceptionIString);
+            CFShow(exceptionCF);
+            CFRelease(exceptionCF);
+            JSStringRelease(exceptionIString);
+        }
+        JSStringRelease(script);
+        free(scriptUTF8);
+    }
 
     JSStringRelease(jsEmptyIString);