From 51565f4df90a8becc723c7a1194070fa690e7de6 Mon Sep 17 00:00:00 2001 From: "andersca@apple.com" Date: Mon, 5 Jan 2015 22:37:46 +0000 Subject: [PATCH] heap-buffer-overflow on fast/loader/reload-zero-byte-plugin.html https://bugs.webkit.org/show_bug.cgi?id=140096 rdar://problem/19368938 Reviewed by Alexey Proskuryakov. When creating a new page, don't pass clientInfo when setting up the frame and policy clients, since clientInfo points to a web view, not the test controller. * WebKitTestRunner/TestController.cpp: (WTR::TestController::createOtherPage): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@177930 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 14 ++++++++++++++ Tools/WebKitTestRunner/TestController.cpp | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 17977f1..ea0512e 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,17 @@ +2015-01-05 Anders Carlsson + + heap-buffer-overflow on fast/loader/reload-zero-byte-plugin.html + https://bugs.webkit.org/show_bug.cgi?id=140096 + rdar://problem/19368938 + + Reviewed by Alexey Proskuryakov. + + When creating a new page, don't pass clientInfo when setting up the frame and policy clients, + since clientInfo points to a web view, not the test controller. + + * WebKitTestRunner/TestController.cpp: + (WTR::TestController::createOtherPage): + 2015-01-05 Hunseop Jeong [EFL][GTK] WKPreferencesDefaults test failed after r177506 diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp index c117c22..791cef7 100644 --- a/Tools/WebKitTestRunner/TestController.cpp +++ b/Tools/WebKitTestRunner/TestController.cpp @@ -262,7 +262,7 @@ WKPageRef TestController::createOtherPage(WKPageRef oldPage, WKURLRequestRef, WK WKPageSetPageUIClient(newPage, &otherPageUIClient.base); WKPageLoaderClientV5 pageLoaderClient = { - { 5, clientInfo }, + { 5, &TestController::shared() }, 0, // didStartProvisionalLoadForFrame 0, // didReceiveServerRedirectForProvisionalLoadForFrame 0, // didFailProvisionalLoadWithErrorForFrame @@ -306,7 +306,7 @@ WKPageRef TestController::createOtherPage(WKPageRef oldPage, WKURLRequestRef, WK WKPageSetPageLoaderClient(view->page(), &pageLoaderClient.base); WKPagePolicyClientV1 pagePolicyClient = { - { 1, clientInfo }, + { 1, &TestController::shared() }, 0, // decidePolicyForNavigationAction_deprecatedForUseWithV0 0, // decidePolicyForNewWindowAction 0, // decidePolicyForResponse_deprecatedForUseWithV0 -- 1.8.3.1