160463 2016-08-02 13:29:26 -0700 Removing IndexedDB WebsiteData can fail for some users 2016-08-02 22:53:06 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 149117 1 beidson beidson achristensen alecflett commit-queue jsbell oldest_to_newest 1216585 0 beidson 2016-08-02 13:29:26 -0700 Removing IndexeDB WebsiteData can fail for some users If somebody removed website data in an earlier version of WebKit that only deleted sqlite3 files, the directories for the databases remain with -wal and -shm files. Further attempts to fully clear the directories will refuse to run, leaving behind those files. Those users will still see that site as taking up data in Safari preferences, and can't get out of that state without hitting the filesystem directly. Let's help them. 1216586 1 beidson 2016-08-02 13:30:01 -0700 <rdar://problem/27391925> 1216588 2 285132 beidson 2016-08-02 13:38:42 -0700 Created attachment 285132 Patch v1 1216602 3 beidson 2016-08-02 14:29:43 -0700 https://trac.webkit.org/changeset/204041 1216807 4 285132 darin 2016-08-02 22:53:06 -0700 Comment on attachment 285132 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=285132&action=review > Source/WebCore/platform/sql/SQLiteFileSystem.cpp:96 > + // If any of the wal or shm files remain after the delete attempt, the overall delete operation failed. Should just say "any of the files"; "any of the wal or shm files" doesn’t match the code below that also looks at the main file! 285132 2016-08-02 13:38:42 -0700 2016-08-02 13:39:56 -0700 Patch v1 patch text/plain 6992 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0OGUzM2VlLi5iYTQ0MzczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkg QEAKKzIwMTYtMDgtMDIgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIFJlbW92aW5nIEluZGV4ZWREQiBXZWJzaXRlRGF0YSBjYW4gZmFpbCBmb3Igc29tZSB1c2Vy cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MDQ2 MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvdmVy ZWQgYnkgY2hhbmdlcyB0byBBUEkgdGVzdCBJbmRleGVkREIuU3RvcmVCbG9iVGhlbkRlbGV0ZS4K KworICAgICAgICBGb3IgYSBmZXcgbW9udGhzIGluIHRydW5rIFdlYktpdCwgZGVsZXRpbmcgYW4g SW5kZXhlZERCIHVzaW5nIFdlYnNpdGVEYXRhU3RvcmUgQVBJIHdvdWxkIG9ubHkKKyAgICAgICAg ZGVsZXRlIHRoZSAiSW5kZXhlZERCLnNxbGl0ZTMiIGZpbGUsIGJ1dCB3b3VsZCBsZWF2ZSB0aGUg Ii13YWwiIGFuZCAiLXNobSIgZmlsZXMgYmVoaW5kLgorICAgICAgICAKKyAgICAgICAgV2UnZCB0 aGVuIGZhaWwgdG8gZGVsZXRlIHRoZSBkaXJlY3RvcnkgaXRzZWxmLCB0cmlja2luZyBBUEkgY2xp ZW50cyB0byB0aGluayB0aGVyZSBhcmUgc3RpbGwKKyAgICAgICAgZGF0YWJhc2VzIGluIHRoZSBn aXZlbiBvcmlnaW4uCisgICAgICAgIAorICAgICAgICBGdXJ0aGVybW9yZSwgdGhlIGNvZGUgdG8g ZGVsZXRlIGEgZGF0YWJhc2UgZmlyc3QgY2hlY2tzIGZvciB0aGUgZXhpc3RlbmNlIG9mICJJbmRl eGVkREIuc3FsaXRlMyIKKyAgICAgICAgdGhlbiByZWZ1c2VzIHRvIGRvIGFueSBmdXJ0aGVyIGNs ZWFudXAgaWYgaXQgZG9lc24ndCBleGlzdC4KKyAgICAgICAgCisgICAgICAgIFdlIHNob3VsZCBq dXN0IGFsd2F5cyBydW4gdGhlIGVudGlyZSBkZWxldGUgcHJvY2VkdXJlIGV2ZW4gaWYgSW5kZXhl ZERCLnNxbGl0ZSBkb2VzIG5vdCBleGlzdC4KKyAgICAgICAgCisgICAgICAgICogTW9kdWxlcy9p bmRleGVkZGIvc2VydmVyL0lEQlNlcnZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2 ZXI6OnJlbW92ZUFsbERhdGFiYXNlc0Zvck9yaWdpblBhdGgpOgorCisgICAgICAgICogcGxhdGZv cm0vc3FsL1NRTGl0ZUZpbGVTeXN0ZW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1FMaXRlRmls ZVN5c3RlbTo6ZGVsZXRlRGF0YWJhc2VGaWxlKToKKwogMjAxNi0wOC0wMSAgRnJlZGVyaWMgV2Fu ZyAgPGZ3YW5nQGlnYWxpYS5jb20+CiAKICAgICAgICAgSW50cm9kdWNlIGEgUmVuZGVyTWF0aE1M RmVuY2VkT3BlcmF0b3IgY2xhc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL3NlcnZlci9JREJTZXJ2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvc2VydmVyL0lEQlNlcnZlci5jcHAKaW5kZXggZDE4MDU5Zi4uYjU5ZjhlMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL0lEQlNlcnZl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL0lEQlNl cnZlci5jcHAKQEAgLTU0MywxMCArNTQzLDcgQEAgc3RhdGljIHZvaWQgcmVtb3ZlQWxsRGF0YWJh c2VzRm9yT3JpZ2luUGF0aChjb25zdCBTdHJpbmcmIG9yaWdpblBhdGgsIHN0ZDo6Y2hyb24KICAg ICBmb3IgKGF1dG8mIGRhdGFiYXNlUGF0aCA6IGRhdGFiYXNlUGF0aHMpIHsKICAgICAgICAgU3Ry aW5nIGRhdGFiYXNlRmlsZSA9IHBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChkYXRhYmFzZVBhdGgs ICJJbmRleGVkREIuc3FsaXRlMyIpOwogCi0gICAgICAgIGlmICghZmlsZUV4aXN0cyhkYXRhYmFz ZUZpbGUpKQotICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAgICAgaWYgKG1vZGlmaWVkU2lu Y2UgPiBzdGQ6OmNocm9ubzo6c3lzdGVtX2Nsb2NrOjp0aW1lX3BvaW50OjptaW4oKSkgeworICAg ICAgICBpZiAobW9kaWZpZWRTaW5jZSA+IHN0ZDo6Y2hyb25vOjpzeXN0ZW1fY2xvY2s6OnRpbWVf cG9pbnQ6Om1pbigpICYmIGZpbGVFeGlzdHMoZGF0YWJhc2VGaWxlKSkgewogICAgICAgICAgICAg dGltZV90IG1vZGlmaWNhdGlvblRpbWU7CiAgICAgICAgICAgICBpZiAoIWdldEZpbGVNb2RpZmlj YXRpb25UaW1lKGRhdGFiYXNlRmlsZSwgbW9kaWZpY2F0aW9uVGltZSkpCiAgICAgICAgICAgICAg ICAgY29udGludWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FM aXRlRmlsZVN5c3RlbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlRmls ZVN5c3RlbS5jcHAKaW5kZXggNWIzMjJlNC4uYjAzYzQ1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZUZpbGVTeXN0ZW0uY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVGaWxlU3lzdGVtLmNwcApAQCAtODgsMTUgKzg4LDEzIEBA IGJvb2wgU1FMaXRlRmlsZVN5c3RlbTo6ZGVsZXRlRGF0YWJhc2VGaWxlKGNvbnN0IFN0cmluZyYg ZmlsZU5hbWUpCiAgICAgU3RyaW5nIHdhbEZpbGVOYW1lID0gbWFrZVN0cmluZyhmaWxlTmFtZSwg QVNDSUlMaXRlcmFsKCItd2FsIikpOwogICAgIFN0cmluZyBzaG1GaWxlTmFtZSA9IG1ha2VTdHJp bmcoZmlsZU5hbWUsIEFTQ0lJTGl0ZXJhbCgiLXNobSIpKTsKIAotICAgIGlmICghZGVsZXRlRmls ZShmaWxlTmFtZSkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIC8vIFRyeSB0byBkZWxl dGUgYm90aCB0aGUgd2FsIGFuZCBzaG0gZmlsZXMsIHdoZXRoZXIgb3Igbm90IHRoZXkgYXJlIGFj dHVhbGx5IHRoZXJlLgorICAgIC8vIFRyeSB0byBkZWxldGUgYWxsIHRocmVlIGZpbGVzIHdoZXRo ZXIgb3Igbm90IHRoZXkgYXJlIHRoZXJlLgorICAgIGRlbGV0ZUZpbGUoZmlsZU5hbWUpOwogICAg IGRlbGV0ZUZpbGUod2FsRmlsZU5hbWUpOwogICAgIGRlbGV0ZUZpbGUoc2htRmlsZU5hbWUpOwog Ci0gICAgLy8gSWYgZWl0aGVyIHRoZSB3YWwgb3Igc2htIGZpbGVzIHJlbWFpbiBhZnRlciB0aGUg ZGVsZXRlIGF0dGVtcHQsIHRoZSBvdmVyYWxsIGRlbGV0ZSBvcGVyYXRpb24gZmFpbGVkLgotICAg IHJldHVybiAhZmlsZUV4aXN0cyh3YWxGaWxlTmFtZSkgJiYgIWZpbGVFeGlzdHMoc2htRmlsZU5h bWUpOworICAgIC8vIElmIGFueSBvZiB0aGUgd2FsIG9yIHNobSBmaWxlcyByZW1haW4gYWZ0ZXIg dGhlIGRlbGV0ZSBhdHRlbXB0LCB0aGUgb3ZlcmFsbCBkZWxldGUgb3BlcmF0aW9uIGZhaWxlZC4K KyAgICByZXR1cm4gIWZpbGVFeGlzdHMoZmlsZU5hbWUpICYmICFmaWxlRXhpc3RzKHdhbEZpbGVO YW1lKSAmJiAhZmlsZUV4aXN0cyhzaG1GaWxlTmFtZSk7CiB9CiAKICNpZiBQTEFURk9STShJT1Mp CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2E1 Yjk1NS4uYTVjNDM1MiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0No YW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDE2LTA4LTAyICBCcmFkeSBFaWRzb24gIDxiZWlk c29uQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmluZyBJbmRleGVkREIgV2Vic2l0ZURhdGEg Y2FuIGZhaWwgZm9yIHNvbWUgdXNlcnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNjA0NjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0MkNvY29hL1N0b3Jl QmxvYlRoZW5EZWxldGUubW06CisKIDIwMTYtMDgtMDEgIEtlaXRoIE1pbGxlciAgPGtlaXRoX21p bGxlckBhcHBsZS5jb20+CiAKICAgICAgICAgV2Ugc2hvdWxkIG5vdCBrZWVwIHRoZSBKYXZhU2Ny aXB0IHRlc3RzIGluc2lkZSB0aGUgU291cmNlL0phdmFTY3JpcHRDb3JlLyBkaXJlY3RvcnkuCmRp ZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJDb2NvYS9TdG9yZUJs b2JUaGVuRGVsZXRlLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyQ29jb2Ev U3RvcmVCbG9iVGhlbkRlbGV0ZS5tbQppbmRleCAzNDBiNjk4Li5mNmY1ZTE2IDEwMDY0NAotLS0g YS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJDb2NvYS9TdG9yZUJsb2JUaGVuRGVs ZXRlLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0MkNvY29hL1N0b3Jl QmxvYlRoZW5EZWxldGUubW0KQEAgLTc0LDYgKzc0LDE4IEBAIFRFU1QoSW5kZXhlZERCLCBTdG9y ZUJsb2JUaGVuRGVsZXRlKQogICAgIEVYUEVDVF9UUlVFKFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0 TWFuYWdlcl0gZmlsZUV4aXN0c0F0UGF0aDpibG9iRmlsZVBhdGhdKTsKICAgICBFWFBFQ1RfVFJV RShbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIGZpbGVFeGlzdHNBdFBhdGg6ZGF0YWJh c2VGaWxlUGF0aF0pOwogCisgICAgLy8gVG8gbWFrZSBzdXJlIHRoYXQgdGhlIC13YWwgYW5kIC1z aG0gZmlsZXMgZm9yIGEgZGF0YWJhc2UgYXJlIGRlbGV0ZWQgZXZlbiBpZiB0aGUgc3FsaXRlMyBm aWxlIGlzIGFscmVhZHkgbWlzc2luZywKKyAgICAvLyB3ZSBuZWVkIHRvOgorICAgIC8vIDEgLSBD cmVhdGUgdGhlIHBhdGggZm9yIGEgZmFrZSBkYXRhYmFzZSB0aGF0IHdvbid0IGFjdGl2ZWx5IGJl IGluIHVzZQorICAgIC8vIDIgLSBNb3ZlIC13YWwgYW5kIC1zaG0gZmlsZXMgaW50byB0aGF0IGRp cmVjdG9yeQorICAgIC8vIDMgLSBNYWtlIHN1cmUgdGhlIGVudGlyZSBkaXJlY3RvcnkgaXMgZGVs ZXRlZAorICAgIE5TU3RyaW5nICpmYWtlRGF0YWJhc2VQYXRoID0gW0Aifi9MaWJyYXJ5L1dlYktp dC9UZXN0V2ViS2l0QVBJL1dlYnNpdGVEYXRhL0luZGV4ZWREQi9maWxlX18wL0Zha2VEYXRhYmFz ZVBhdGgiIHN0cmluZ0J5RXhwYW5kaW5nVGlsZGVJblBhdGhdOworICAgIE5TU3RyaW5nICpmYWtl U2htUGF0aCA9IFtAIn4vTGlicmFyeS9XZWJLaXQvVGVzdFdlYktpdEFQSS9XZWJzaXRlRGF0YS9J bmRleGVkREIvZmlsZV9fMC9GYWtlRGF0YWJhc2VQYXRoL0luZGV4ZWREQi5zcWxpdGUzLXdhbCIg c3RyaW5nQnlFeHBhbmRpbmdUaWxkZUluUGF0aF07CisgICAgTlNTdHJpbmcgKmZha2VXYWxQYXRo ID0gW0Aifi9MaWJyYXJ5L1dlYktpdC9UZXN0V2ViS2l0QVBJL1dlYnNpdGVEYXRhL0luZGV4ZWRE Qi9maWxlX18wL0Zha2VEYXRhYmFzZVBhdGgvSW5kZXhlZERCLnNxbGl0ZTMtc2htIiBzdHJpbmdC eUV4cGFuZGluZ1RpbGRlSW5QYXRoXTsKKyAgICBbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFn ZXJdIGNyZWF0ZURpcmVjdG9yeUF0UGF0aDpmYWtlRGF0YWJhc2VQYXRoIHdpdGhJbnRlcm1lZGlh dGVEaXJlY3RvcmllczpOTyBhdHRyaWJ1dGVzOm5pbCBlcnJvcjpuaWxdOworICAgIFtbTlNGaWxl TWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gY29weUl0ZW1BdFBhdGg6ZGF0YWJhc2VGaWxlUGF0aCB0 b1BhdGg6ZmFrZVNobVBhdGggZXJyb3I6bmlsXTsKKyAgICBbW05TRmlsZU1hbmFnZXIgZGVmYXVs dE1hbmFnZXJdIGNvcHlJdGVtQXRQYXRoOmRhdGFiYXNlRmlsZVBhdGggdG9QYXRoOmZha2VXYWxQ YXRoIGVycm9yOm5pbF07CisKICAgICAvLyBNYWtlIHNvbWUgb3RoZXIgLmJsb2IgZmlsZXMgaW4g dGhlIGRhdGFiYXNlIGRpcmVjdG9yeSB0byBsYXRlciB2YWxpZGF0ZSB0aGF0IG9ubHkgYXBwcm9w cmlhdGUgZmlsZXMgYXJlIGRlbGV0ZWQuCiAgICAgTlNTdHJpbmcgKm90aGVyQmxvYjEgPSBbQCJ+ L0xpYnJhcnkvV2ViS2l0L1Rlc3RXZWJLaXRBUEkvV2Vic2l0ZURhdGEvSW5kZXhlZERCL2ZpbGVf XzAvU3RvcmVCbG9iVG9CZURlbGV0ZWQvNzE4Mi5ibG9iIiBzdHJpbmdCeUV4cGFuZGluZ1RpbGRl SW5QYXRoXTsKICAgICBOU1N0cmluZyAqb3RoZXJCbG9iMiA9IFtAIn4vTGlicmFyeS9XZWJLaXQv VGVzdFdlYktpdEFQSS9XZWJzaXRlRGF0YS9JbmRleGVkREIvZmlsZV9fMC9TdG9yZUJsb2JUb0Jl RGVsZXRlZC8xYS5ibG9iIiBzdHJpbmdCeUV4cGFuZGluZ1RpbGRlSW5QYXRoXTsKQEAgLTk3LDYg KzEwOSwxMSBAQCBURVNUKEluZGV4ZWREQiwgU3RvcmVCbG9iVGhlbkRlbGV0ZSkKICAgICAgICAg RVhQRUNUX1RSVUUoW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBmaWxlRXhpc3RzQXRQ YXRoOm90aGVyQmxvYjNdKTsKICAgICAgICAgRVhQRUNUX1RSVUUoW1tOU0ZpbGVNYW5hZ2VyIGRl ZmF1bHRNYW5hZ2VyXSBmaWxlRXhpc3RzQXRQYXRoOm90aGVyQmxvYjRdKTsKIAorICAgICAgICAv LyBNYWtlIHN1cmUgZXZlcnl0aGluZyByZWxhdGVkIHRvIHRoZSBmYWtlIGRhdGFiYXNlIGlzIGdv bmUuCisgICAgICAgIEVYUEVDVF9GQUxTRShbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJd IGZpbGVFeGlzdHNBdFBhdGg6ZmFrZVNobVBhdGhdKTsKKyAgICAgICAgRVhQRUNUX0ZBTFNFKFtb TlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gZmlsZUV4aXN0c0F0UGF0aDpmYWtlV2FsUGF0 aF0pOworICAgICAgICBFWFBFQ1RfRkFMU0UoW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2Vy XSBmaWxlRXhpc3RzQXRQYXRoOmZha2VEYXRhYmFzZVBhdGhdKTsKKwogICAgICAgICAvLyBOb3cg ZGVsZXRlIHRoZW0gc28gd2UncmUgbm90IGxlYXZpbmcgZmlsZXMgYXJvdW5kLgogICAgICAgICBb W05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIHJlbW92ZUl0ZW1BdFBhdGg6b3RoZXJCbG9i MiBlcnJvcjpuaWxdOwogICAgICAgICBbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIHJl bW92ZUl0ZW1BdFBhdGg6b3RoZXJCbG9iMyBlcnJvcjpuaWxdOwo=