Changeset 55392 in webkit

Timestamp:

Mar 1, 2010 5:35:58 PM (14 years ago)

Author:

kov@webkit.org

Message:

WebKitTools

2010-03-01 Gustavo Noronha Silva <​gustavo.noronha@collabora.co.uk>

Reviewed by Eric Seidel.

[GTK] plugins/setProperty.html fails on 64bit Release
​https://bugs.webkit.org/show_bug.cgi?id=35425

Check invoke's return code before releasing the variant, since
there's a chance it won't be properly initialized, leading to
memory corruption, in some cases.

• DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp: (testCallback): (testEnumerate): (testDocumentOpen): (testWindowOpen): (handleCallback):

LayoutTests

2010-03-01 Gustavo Noronha Silva <​gustavo.noronha@collabora.co.uk>

Reviewed by Eric Seidel.

[GTK] plugins/setProperty.html fails on 64bit Release
​https://bugs.webkit.org/show_bug.cgi?id=35425

Unskip the tests that failed as a consequence of the memory
corruption.

• platform/gtk/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp (modified) (6 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-03-01  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Eric Seidel.
+
+        [GTK] plugins/setProperty.html fails on 64bit Release
+        https://bugs.webkit.org/show_bug.cgi?id=35425
+
+        Unskip the tests that failed as a consequence of the memory
+        corruption.
+
+        * platform/gtk/Skipped:
+
 2010-03-01  Chris Fleizach  <cfleizach@apple.com>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -3589 +3589 @@
 plugins/private-browsing-mode.html
 
-# https://bugs.webkit.org/show_bug.cgi?id=35425
-plugins/setProperty.html
-plugins/return-error-from-new-stream-doesnt-invoke-destroy-stream.html
-
 # https://bugs.webkit.org/show_bug.cgi?id=30561
 plugins/private-browsing-mode.html

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-01  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Eric Seidel.
+
+        [GTK] plugins/setProperty.html fails on 64bit Release
+        https://bugs.webkit.org/show_bug.cgi?id=35425
+
+        Check invoke's return code before releasing the variant, since
+        there's a chance it won't be properly initialized, leading to
+        memory corruption, in some cases.
+
+        * DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp:
+        (testCallback):
+        (testEnumerate):
+        (testDocumentOpen):
+        (testWindowOpen):
+        (handleCallback):
+
 2010-03-01  Dirk Pranke  <dpranke@chromium.org>
 

trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp

@@ -2 +2 @@
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Holger Hans Peter Freyther
+ * Copyright (C) 2010 Collabora Ltd.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -406 +407 @@
 
     NPVariant browserResult;
-    browser->invoke(obj->npp, windowScriptObject, callbackIdentifier, 0, 0, &browserResult);
-    browser->releasevariantvalue(&browserResult);
+    if (browser->invoke(obj->npp, windowScriptObject, callbackIdentifier, 0, 0, &browserResult))
+        browser->releasevariantvalue(&browserResult);
 
     browser->releaseobject(windowScriptObject);
@@ -520 +521 @@
             STRINGZ_TO_NPVARIANT(string, args[0]);
             NPVariant browserResult;
-            browser->invoke(obj->npp, outArray, pushIdentifier, args, 1, &browserResult);
-            browser->releasevariantvalue(&browserResult);
+            if (browser->invoke(obj->npp, outArray, pushIdentifier, args, 1, &browserResult))
+                browser->releasevariantvalue(&browserResult);
             browser->memfree(string);
         }
@@ -721 +722 @@
 
     NPVariant result;
-    browser->invoke(npp, documentObject, openId, openArgs, 2, &result);
-    browser->releaseobject(documentObject);
+    if (browser->invoke(npp, documentObject, openId, openArgs, 2, &result))
+        browser->releaseobject(documentObject);
 
     if (result.type == NPVariantType_Object) {
@@ -748 +749 @@
 
     NPVariant result;
-    browser->invoke(npp, windowObject, openId, openArgs, 2, &result);
-    if (result.type == NPVariantType_Object) {
+    bool didSucceed = browser->invoke(npp, windowObject, openId, openArgs, 2, &result);
+    if (didSucceed && (result.type == NPVariantType_Object)) {
         pluginLogWithWindowObjectVariableArgs(windowObject, npp, "WINDOW OPEN SUCCESS");
         notifyTestCompletion(npp, result.value.objectValue);
@@ -948 +949 @@
 
     NPVariant browserResult;
-    browser->invoke(object->npp, windowScriptObject, callbackIdentifier, args, 2, &browserResult);
-    browser->releasevariantvalue(&browserResult);
+    if (browser->invoke(object->npp, windowScriptObject, callbackIdentifier, args, 2, &browserResult))
+        browser->releasevariantvalue(&browserResult);
 
     free(strHdr);