Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Database process crashes deleting a corrupt SQLite database file (nul…
…l deref). https://bugs.webkit.org/show_bug.cgi?id=155506. Reviewed by Alex Christensen. Source/WebCore: Covered by new API test. * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp: (WebCore::IDBServer::SQLiteIDBBackingStore::deleteBackingStore): Null check. Tools: * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/WebKit2Cocoa/IDBDeleteRecovery.html: Added. * TestWebKitAPI/Tests/WebKit2Cocoa/IDBDeleteRecovery.mm: Added. * TestWebKitAPI/Tests/WebKit2Cocoa/IDBDeleteRecovery.sqlite3: Added. * TestWebKitAPI/Tests/WebKit2Cocoa/IDBDeleteRecovery.sqlite3-shm: Added. * TestWebKitAPI/Tests/WebKit2Cocoa/IDBDeleteRecovery.sqlite3-wal: Added. Canonical link: https://commits.webkit.org/177553@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@202822 268f45cc-cd09-0410-ab3c-d52691b4dbfc
- Loading branch information
Showing
9 changed files
with
160 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IDBDeleteRecovery.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <script> | ||
|
|
||
| var request = window.indexedDB.deleteDatabase("IDBDeleteRecovery"); | ||
|
|
||
| request.onsuccess = function(e) | ||
| { | ||
| window.webkit.messageHandlers.testHandler.postMessage('Deleted database'); | ||
| } | ||
| request.onerror = function(e) | ||
| { | ||
| // Unexpected error | ||
| window.webkit.messageHandlers.testHandler.postMessage('Error deleting database'); | ||
| } | ||
| </script> |
89 changes: 89 additions & 0 deletions
89
Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IDBDeleteRecovery.mm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| /* | ||
| * Copyright (C) 2016 Apple Inc. All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * 1. Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' | ||
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, | ||
| * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS | ||
| * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | ||
| * THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| #import "config.h" | ||
|
|
||
| #import "PlatformUtilities.h" | ||
| #import "Test.h" | ||
| #import <WebKit/WKProcessPoolPrivate.h> | ||
| #import <WebKit/WKUserContentControllerPrivate.h> | ||
| #import <WebKit/WKWebViewConfigurationPrivate.h> | ||
| #import <WebKit/WebKit.h> | ||
| #import <WebKit/_WKProcessPoolConfiguration.h> | ||
| #import <WebKit/_WKUserStyleSheet.h> | ||
| #import <wtf/RetainPtr.h> | ||
|
|
||
| #if WK_API_ENABLED | ||
|
|
||
| static bool receivedScriptMessage; | ||
| static RetainPtr<WKScriptMessage> lastScriptMessage; | ||
|
|
||
| @interface IDBDeleteRecoveryMessageHandler : NSObject <WKScriptMessageHandler> | ||
| @end | ||
|
|
||
| @implementation IDBDeleteRecoveryMessageHandler | ||
|
|
||
| - (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message | ||
| { | ||
| receivedScriptMessage = true; | ||
| lastScriptMessage = message; | ||
| } | ||
|
|
||
| @end | ||
|
|
||
| TEST(IndexedDB, DeleteRecovery) | ||
| { | ||
| RetainPtr<IDBDeleteRecoveryMessageHandler> handler = adoptNS([[IDBDeleteRecoveryMessageHandler alloc] init]); | ||
| RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]); | ||
| [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"]; | ||
|
|
||
| // Allow file URLs to load non-file resources | ||
| [configuration _setAllowUniversalAccessFromFileURLs:YES]; | ||
|
|
||
| [configuration.get().processPool _terminateDatabaseProcess]; | ||
|
|
||
| // Copy the inconsistent database files to the database directory | ||
| NSURL *url1 = [[NSBundle mainBundle] URLForResource:@"IDBDeleteRecovery" withExtension:@"sqlite3" subdirectory:@"TestWebKitAPI.resources"]; | ||
| NSURL *url2 = [[NSBundle mainBundle] URLForResource:@"IDBDeleteRecovery" withExtension:@"sqlite3-shm" subdirectory:@"TestWebKitAPI.resources"]; | ||
| NSURL *url3 = [[NSBundle mainBundle] URLForResource:@"IDBDeleteRecovery" withExtension:@"sqlite3-wal" subdirectory:@"TestWebKitAPI.resources"]; | ||
|
|
||
| NSURL *targetURL = [NSURL fileURLWithPath:[@"~/Library/WebKit/TestWebKitAPI/WebsiteData/IndexedDB/file__0/IDBDeleteRecovery" stringByExpandingTildeInPath]]; | ||
| [[NSFileManager defaultManager] createDirectoryAtURL:targetURL withIntermediateDirectories:YES attributes:nil error:nil]; | ||
|
|
||
| [[NSFileManager defaultManager] copyItemAtURL:url1 toURL:[targetURL URLByAppendingPathComponent:@"IndexedDB.sqlite3"] error:nil]; | ||
| [[NSFileManager defaultManager] copyItemAtURL:url2 toURL:[targetURL URLByAppendingPathComponent:@"IndexedDB.sqlite3-shm"] error:nil]; | ||
| [[NSFileManager defaultManager] copyItemAtURL:url3 toURL:[targetURL URLByAppendingPathComponent:@"IndexedDB.sqlite3-wal"] error:nil]; | ||
|
|
||
| RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]); | ||
|
|
||
| NSURLRequest *request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"IDBDeleteRecovery" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]]; | ||
| [webView loadRequest:request]; | ||
|
|
||
| TestWebKitAPI::Util::run(&receivedScriptMessage); | ||
|
|
||
| EXPECT_WK_STREQ(@"Deleted database", [lastScriptMessage body]); | ||
| } | ||
|
|
||
| #endif |
Binary file not shown.
Binary file not shown.
Binary file not shown.