Attachment 109753 Details for Bug 69403 – Proposed patch

[patch] Proposed patch

random_crashes.patch (text/plain), 3.44 KB, created by Alejandro G. Castro on 2011-10-05 00:30:05 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alejandro G. Castro

Created: 2011-10-05 00:30:05 PDT

Size: 3.44 KB

patch

obsolete

>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 51f9fec..b941e3a 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,20 @@
>+2011-10-05  Alejandro G. Castro  <alex@igalia.com>
>+
>+        [WK2] [GTK] WebKitTestRunner crashes with heap corruption
>+        https://bugs.webkit.org/show_bug.cgi?id=69403
>+
>+        We did not added autotoolsconfig.h to the config.h file and we
>+        were adding Platform.h without the config.h in the
>+        WebKitTestRunnerPrefix.h. Removed the includes in the Prefix file
>+        and added them to the required locations.
>+
>+        * WebKitTestRunner/PixelDumpSupport.cpp:
>+        * WebKitTestRunner/PixelDumpSupport.h:
>+        * WebKitTestRunner/PlatformWebView.h:
>+        * WebKitTestRunner/TestController.h:
>+        * WebKitTestRunner/WebKitTestRunnerPrefix.h:
>+        * WebKitTestRunner/config.h:
>+
> 2011-10-04  Kent Tamura  <tkent@chromium.org>
> 
>         Introduce feature flags for incomplete input types
>diff --git a/Tools/WebKitTestRunner/PixelDumpSupport.cpp b/Tools/WebKitTestRunner/PixelDumpSupport.cpp
>index 7697473..9ba6f1d 100644
>--- a/Tools/WebKitTestRunner/PixelDumpSupport.cpp
>+++ b/Tools/WebKitTestRunner/PixelDumpSupport.cpp
>@@ -30,6 +30,7 @@
> #include "PixelDumpSupport.h"
> 
> #include "CyclicRedundancyCheck.h"
>+#include <WebKit2/WebKit2.h>
> #include <cstdio>
> 
> static void appendIntToVector(unsigned number, Vector<unsigned char>& vector)
>diff --git a/Tools/WebKitTestRunner/PixelDumpSupport.h b/Tools/WebKitTestRunner/PixelDumpSupport.h
>index 41c6e38..024b8b9 100644
>--- a/Tools/WebKitTestRunner/PixelDumpSupport.h
>+++ b/Tools/WebKitTestRunner/PixelDumpSupport.h
>@@ -29,6 +29,8 @@
> #ifndef PixelDumpSupport_h
> #define PixelDumpSupport_h
> 
>+#include <stdlib.h>
>+
> void printPNG(const unsigned char* data, const size_t dataLength, const char* checksum);
> 
> #endif // PixelDumpSupport_h
>diff --git a/Tools/WebKitTestRunner/PlatformWebView.h b/Tools/WebKitTestRunner/PlatformWebView.h
>index 8886605..79bfc0d 100644
>--- a/Tools/WebKitTestRunner/PlatformWebView.h
>+++ b/Tools/WebKitTestRunner/PlatformWebView.h
>@@ -26,6 +26,8 @@
> #ifndef PlatformWebView_h
> #define PlatformWebView_h
> 
>+#include <WebKit2/WebKit2.h>
>+
> #if defined(BUILDING_QT__)
> class QDesktopWebView;
> typedef QDesktopWebView* PlatformWKView;
>diff --git a/Tools/WebKitTestRunner/TestController.h b/Tools/WebKitTestRunner/TestController.h
>index 6ab8981..b195955 100644
>--- a/Tools/WebKitTestRunner/TestController.h
>+++ b/Tools/WebKitTestRunner/TestController.h
>@@ -26,6 +26,7 @@
> #ifndef TestController_h
> #define TestController_h
> 
>+#include <WebKit2/WebKit2.h>
> #include <WebKit2/WKRetainPtr.h>
> #include <string>
> #include <vector>
>diff --git a/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h b/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h
>index 1e540cc..1c27a9e 100644
>--- a/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h
>+++ b/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h
>@@ -33,6 +33,3 @@
> #define max max
> #define min min
> #endif
>-
>-#include <wtf/Platform.h>
>-#include <WebKit2/WebKit2.h>
>diff --git a/Tools/WebKitTestRunner/config.h b/Tools/WebKitTestRunner/config.h
>index 38568ae..fee1473 100644
>--- a/Tools/WebKitTestRunner/config.h
>+++ b/Tools/WebKitTestRunner/config.h
>@@ -25,6 +25,10 @@
> #ifndef WebKitTestRunner_config_h
> #define WebKitTestRunner_config_h
> 
>+#if defined (BUILDING_GTK__)
>+#include "autotoolsconfig.h"
>+#endif /* defined (BUILDING_GTK__) */
>+
> #include <wtf/Platform.h>
> 
> /* See note in wtf/Platform.h for more info on EXPORT_MACROS. */

Actions: View | Formatted Diff | Diff

Attachments on bug 69403: 109753 | 111946