Fix a crash when pathToLocalResource fails and a leak

         Reviewed by Darin.

         * DumpRenderTree/LayoutTestController.cpp:
         (pathToLocalResourceCallback): Dont leak the JSStringRef, and make
         sure not to pass null to JSValueMakeString.
         * DumpRenderTree/win/LayoutTestControllerWin.cpp:
         (LayoutTestController::pathToLocalResource): Print an error message if
         the conversion fails so it's clear what happened.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29406 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 37c396752e1ecf3b4598412fbddb6d4b0ae5e27c..f272fdaef818f9062c363bfe0ba97ebb3ec52c86 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2008-01-11  Adam Roben  <aroben@apple.com>
+
+        Fix a crash when pathToLocalResource fails and a leak
+
+        Reviewed by Darin.
+
+        * DumpRenderTree/LayoutTestController.cpp:
+        (pathToLocalResourceCallback): Dont leak the JSStringRef, and make
+        sure not to pass null to JSValueMakeString.
+        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
+        (LayoutTestController::pathToLocalResource): Print an error message if
+        the conversion fails so it's clear what happened.
+
 2008-01-11  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by John Sullivan.

diff --git a/WebKitTools/DumpRenderTree/LayoutTestController.cpp b/WebKitTools/DumpRenderTree/LayoutTestController.cpp
index 276728544211f4e20a69c0ba622c737c1911a22e..303efe39468787bed29447697610f3826053315f 100644 (file)
--- a/WebKitTools/DumpRenderTree/LayoutTestController.cpp
+++ b/WebKitTools/DumpRenderTree/LayoutTestController.cpp
@@ -145,7 +145,11 @@ static JSValueRef pathToLocalResourceCallback(JSContextRef context, JSObjectRef
     JSRetainPtr<JSStringRef> localPath(Adopt, JSValueToStringCopy(context, arguments[0], exception));
     ASSERT(!*exception);
 
-    return JSValueMakeString(context, controller->pathToLocalResource(context, localPath.get()));
+    JSRetainPtr<JSStringRef> convertedPath(Adopt, controller->pathToLocalResource(context, localPath.get()));
+    if (!convertedPath)
+        return JSValueMakeUndefined(context);
+
+    return JSValueMakeString(context, convertedPath.get());
 }
 
 static JSValueRef repaintSweepHorizontallyCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)

diff --git a/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp b/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
index 589e33a3460be6032273d6d297d8a41e9e3380eb..2d8b4f94aa7f630833e2e679d5720fbea788430d 100644 (file)
--- a/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
+++ b/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
@@ -149,9 +149,13 @@ void LayoutTestController::notifyDone()
 
 JSStringRef LayoutTestController::pathToLocalResource(JSContextRef context, JSStringRef url)
 {
+    wstring input(JSStringGetCharactersPtr(url), JSStringGetLength(url));
+
     wstring localPath;
-    if (!resolveCygwinPath(wstring(JSStringGetCharactersPtr(url), JSStringGetLength(url)), localPath))
+    if (!resolveCygwinPath(input, localPath)) {
+        printf("ERROR: Failed to resolve Cygwin path %S\n", input.c_str());
         return 0;
+    }
 
     return JSStringCreateWithCharacters(localPath.c_str(), localPath.length());
 }