127851 2014-01-29 12:36:57 -0800 IDB: Opening an existing database is broken 2014-01-29 13:11:26 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 124521 1 beidson beidson alecflett commit-queue jsbell oldest_to_newest 973446 0 beidson 2014-01-29 12:36:57 -0800 IDB: Opening an existing database is broken This is due to both WebCore IDBDatabaseBackend logic issues and the WebKit2 SQLite backend incorrectly retrieving object store metadata. 973447 1 222590 beidson 2014-01-29 12:39:57 -0800 Created attachment 222590 Patch v1 973451 2 beidson 2014-01-29 13:11:26 -0800 http://trac.webkit.org/changeset/163038 222590 2014-01-29 12:39:57 -0800 2014-01-29 13:09:04 -0800 Patch v1 patch text/plain 6796 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzNjljZGYyLi41N2I3YjE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTQtMDEtMjkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIElEQjogT3BlbmluZyBhbiBleGlzdGluZyBkYXRhYmFzZSBpcyBicm9rZW4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzg1MQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTW9kdWxlcy9pbmRleGVk ZGIvSURCRGF0YWJhc2VCYWNrZW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQkRhdGFiYXNl QmFja2VuZDo6SURCRGF0YWJhc2VCYWNrZW5kKToKKyAgICAgICAgKFdlYkNvcmU6OklEQkRhdGFi YXNlQmFja2VuZDo6ZGlkT3BlbkludGVybmFsQXN5bmMpOiBSZW1lbWJlciBpZiB0aGlzIG1ldGhv ZCBoYXMgY29tcGxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SURCRGF0YWJhc2VCYWNrZW5kOjpw cm9jZXNzUGVuZGluZ0NhbGxzKTogSWYgZGlkT3BlbkludGVybmFsQXN5bmMgaGFzbuKAmXQKKyAg ICAgICAgICBiZWVuIGNhbGxlZCB5ZXQsIHRoZW4gaXQgaXMgaW5jb3JyZWN0IHRvIHByb2Nlc3Mg YW55IHBlbmRpbmcgY2FsbHMgcmlnaHQgbm93LgorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRi L0lEQkRhdGFiYXNlQmFja2VuZC5oOgorCiAyMDE0LTAxLTI5ICBBbGV4IENocmlzdGVuc2VuICA8 YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUHJlcGFyZSBmb3IgYWNjZWxlcmF0 ZWQgY29tcG9zaXRpbmcgb24gV2luQ2Fpcm8uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2luZGV4ZWRkYi9JREJEYXRhYmFzZUJhY2tlbmQuY3BwIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9pbmRleGVkZGIvSURCRGF0YWJhc2VCYWNrZW5kLmNwcAppbmRleCAzY2VmM2YzLi4y YzcwYTY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJE YXRhYmFzZUJhY2tlbmQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRi L0lEQkRhdGFiYXNlQmFja2VuZC5jcHAKQEAgLTU4LDYgKzU4LDcgQEAgSURCRGF0YWJhc2VCYWNr ZW5kOjpJREJEYXRhYmFzZUJhY2tlbmQoY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcm IHVuaXF1ZUkKICAgICAsIG1fc2VydmVyQ29ubmVjdGlvbihzZXJ2ZXJDb25uZWN0aW9uKQogICAg ICwgbV90cmFuc2FjdGlvbkNvb3JkaW5hdG9yKElEQlRyYW5zYWN0aW9uQ29vcmRpbmF0b3I6OmNy ZWF0ZSgpKQogICAgICwgbV9jbG9zaW5nQ29ubmVjdGlvbihmYWxzZSkKKyAgICAsIG1fZGlkT3Bl bkludGVybmFsKGZhbHNlKQogewogICAgIEFTU0VSVCghbV9tZXRhZGF0YS5uYW1lLmlzTnVsbCgp KTsKIH0KQEAgLTExMiw2ICsxMTMsOCBAQCB2b2lkIElEQkRhdGFiYXNlQmFja2VuZDo6b3Blbklu dGVybmFsQXN5bmMoKQogCiB2b2lkIElEQkRhdGFiYXNlQmFja2VuZDo6ZGlkT3BlbkludGVybmFs QXN5bmMoY29uc3QgSURCRGF0YWJhc2VNZXRhZGF0YSYgbWV0YWRhdGEsIGJvb2wgc3VjY2VzcykK IHsKKyAgICBtX2RpZE9wZW5JbnRlcm5hbCA9IHRydWU7CisKICAgICBpZiAoIXN1Y2Nlc3MpIHsK ICAgICAgICAgcHJvY2Vzc1BlbmRpbmdPcGVuQ2FsbHMoZmFsc2UpOwogICAgICAgICByZXR1cm47 CkBAIC0zNjQsNiArMzY3LDEwIEBAIHNpemVfdCBJREJEYXRhYmFzZUJhY2tlbmQ6OmNvbm5lY3Rp b25Db3VudCgpCiAKIHZvaWQgSURCRGF0YWJhc2VCYWNrZW5kOjpwcm9jZXNzUGVuZGluZ0NhbGxz KCkKIHsKKyAgICAvLyBwcm9jZXNzUGVuZGluZ0NhbGxzKCkgd2lsbCBiZSBjYWxsZWQgYWdhaW4g YWZ0ZXIgdGhlIGFzeW5jIG9wZW5JbnRlcm5hbCBjb21wbGV0ZXMuCisgICAgaWYgKCFtX2RpZE9w ZW5JbnRlcm5hbCkKKyAgICAgICAgcmV0dXJuOworCiAgICAgaWYgKG1fcGVuZGluZ1NlY29uZEhh bGZPcGVuKSB7CiAgICAgICAgIEFTU0VSVChtX3BlbmRpbmdTZWNvbmRIYWxmT3Blbi0+dmVyc2lv bigpID09IG1fbWV0YWRhdGEudmVyc2lvbik7CiAgICAgICAgIEFTU0VSVChtX21ldGFkYXRhLmlk ICE9IEludmFsaWRJZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4 ZWRkYi9JREJEYXRhYmFzZUJhY2tlbmQuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL0lEQkRhdGFiYXNlQmFja2VuZC5oCmluZGV4IDY4MTVkNmMuLjc1OGQ1Y2IgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkRhdGFiYXNlQmFja2VuZC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkRhdGFiYXNlQmFja2Vu ZC5oCkBAIC0xNjUsNiArMTY1LDcgQEAgcHJpdmF0ZToKICAgICBEYXRhYmFzZUNhbGxiYWNrc1Nl dCBtX2RhdGFiYXNlQ2FsbGJhY2tzU2V0OwogCiAgICAgYm9vbCBtX2Nsb3NpbmdDb25uZWN0aW9u OworICAgIGJvb2wgbV9kaWRPcGVuSW50ZXJuYWw7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKaW5kZXggOTYxMDgzMi4uZTk1NjZmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE3IEBACisyMDE0LTAxLTI5ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKwor ICAgICAgICBJREI6IE9wZW5pbmcgYW4gZXhpc3RpbmcgZGF0YWJhc2UgaXMgYnJva2VuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjc4NTEKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIERhdGFiYXNlUHJv Y2Vzcy9JbmRleGVkREIvVW5pcXVlSURCRGF0YWJhc2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpV bmlxdWVJREJEYXRhYmFzZTo6Z2V0T3JFc3RhYmxpc2hJREJEYXRhYmFzZU1ldGFkYXRhKTogU2F2 ZSB0aGUgcmVxdWVzdCB0byBnZXQgbWV0YWRhdGEKKyAgICAgICAgICB0byB0aGUgc2V0IGJlZm9y ZSBwb3N0aW5nIHRoZSB0YXNrIHRvIHRoZSB0aHJlYWQuCisgICAgICAgICogRGF0YWJhc2VQcm9j ZXNzL0luZGV4ZWREQi9zcWxpdGUvVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmVTUUxpdGUu Y3BwOgorICAgICAgICAoV2ViS2l0OjpVbmlxdWVJREJEYXRhYmFzZUJhY2tpbmdTdG9yZVNRTGl0 ZTo6ZXh0cmFjdEV4aXN0aW5nTWV0YWRhdGEpOiBBY3R1YWxseSBzYXZlIHRoZSByZXRyaWV2ZWQK KyAgICAgICAgICBvYmplY3Qgc3RvcmUgbWV0YWRhdGEgdG8gdGhlIGRhdGFiYXNlIG1ldGFkYXRh LgorCiAyMDE0LTAxLTI5ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAK ICAgICAgICAgUmVtb3ZlIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKSBndWFyZHMKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvVW5pcXVlSURC RGF0YWJhc2UuY3BwIGIvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9V bmlxdWVJREJEYXRhYmFzZS5jcHAKaW5kZXggOWU3Mzc5Yy4uNTM2ZDJhZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9VbmlxdWVJREJEYXRhYmFz ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9Vbmlx dWVJREJEYXRhYmFzZS5jcHAKQEAgLTE4MCw4ICsxODAsNyBAQCB2b2lkIFVuaXF1ZUlEQkRhdGFi YXNlOjpnZXRPckVzdGFibGlzaElEQkRhdGFiYXNlTWV0YWRhdGEoc3RkOjpmdW5jdGlvbjx2b2lk KGJvbwogICAgIH0KIAogICAgIC8vIElmIHRoaXMgaXMgdGhlIGZpcnN0IHVuYW5zd2VyZWQgbWV0 YWRhdGEgcmVxdWVzdCwgcG9zdCBhIHRhc2sgdG8gb3BlbiB0aGUgYmFja2luZyBzdG9yZSBhbmQg Z2V0IG1ldGFkYXRhLgotICAgIGlmIChtX3BlbmRpbmdNZXRhZGF0YVJlcXVlc3RzLmlzRW1wdHko KSkKLSAgICAgICAgcG9zdERhdGFiYXNlVGFzayhjcmVhdGVBc3luY1Rhc2soKnRoaXMsICZVbmlx dWVJREJEYXRhYmFzZTo6b3BlbkJhY2tpbmdTdG9yZUFuZFJlYWRNZXRhZGF0YSwgbV9pZGVudGlm aWVyLCBhYnNvbHV0ZURhdGFiYXNlRGlyZWN0b3J5KCkpKTsKKyAgICBib29sIHNob3VsZE9wZW5C YWNraW5nU3RvcmUgPSBtX3BlbmRpbmdNZXRhZGF0YVJlcXVlc3RzLmlzRW1wdHkoKTsKIAogICAg IC8vIFRoZW4gcmVtZW1iZXIgdGhpcyBtZXRhZGF0YSByZXF1ZXN0IHRvIGJlIGFuc3dlcmVkIGxh dGVyLgogICAgIFJlZlB0cjxBc3luY1JlcXVlc3Q+IHJlcXVlc3QgPSBBc3luY1JlcXVlc3RJbXBs PD46OmNyZWF0ZShbY29tcGxldGlvbkNhbGxiYWNrLCB0aGlzXSgpIHsKQEAgLTE5NCw2ICsxOTMs OSBAQCB2b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjpnZXRPckVzdGFibGlzaElEQkRhdGFiYXNlTWV0 YWRhdGEoc3RkOjpmdW5jdGlvbjx2b2lkKGJvbwogICAgIH0pOwogCiAgICAgbV9wZW5kaW5nTWV0 YWRhdGFSZXF1ZXN0cy5hcHBlbmQocmVxdWVzdC5yZWxlYXNlKCkpOworCisgICAgaWYgKHNob3Vs ZE9wZW5CYWNraW5nU3RvcmUpCisgICAgICAgIHBvc3REYXRhYmFzZVRhc2soY3JlYXRlQXN5bmNU YXNrKCp0aGlzLCAmVW5pcXVlSURCRGF0YWJhc2U6Om9wZW5CYWNraW5nU3RvcmVBbmRSZWFkTWV0 YWRhdGEsIG1faWRlbnRpZmllciwgYWJzb2x1dGVEYXRhYmFzZURpcmVjdG9yeSgpKSk7CiB9CiAK IHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6Om9wZW5CYWNraW5nU3RvcmVBbmRSZWFkTWV0YWRhdGEo Y29uc3QgVW5pcXVlSURCRGF0YWJhc2VJZGVudGlmaWVyJiBpZGVudGlmaWVyLCBjb25zdCBTdHJp bmcmIGRhdGFiYXNlRGlyZWN0b3J5KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvRGF0YWJh c2VQcm9jZXNzL0luZGV4ZWREQi9zcWxpdGUvVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmVT UUxpdGUuY3BwIGIvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9zcWxp dGUvVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmVTUUxpdGUuY3BwCmluZGV4IGEwOWQyZjcu Ljc1MjIzZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRl eGVkREIvc3FsaXRlL1VuaXF1ZUlEQkRhdGFiYXNlQmFja2luZ1N0b3JlU1FMaXRlLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL3NxbGl0ZS9VbmlxdWVJ REJEYXRhYmFzZUJhY2tpbmdTdG9yZVNRTGl0ZS5jcHAKQEAgLTE5MSwyMiArMTkxLDIzIEBAIHN0 ZDo6dW5pcXVlX3B0cjxJREJEYXRhYmFzZU1ldGFkYXRhPiBVbmlxdWVJREJEYXRhYmFzZUJhY2tp bmdTdG9yZVNRTGl0ZTo6ZXh0cmFjCiAKICAgICAgICAgaW50IHJlc3VsdCA9IHNxbC5zdGVwKCk7 CiAgICAgICAgIHdoaWxlIChyZXN1bHQgPT0gU1FMUmVzdWx0Um93KSB7Ci0gICAgICAgICAgICBJ REJPYmplY3RTdG9yZU1ldGFkYXRhIG1ldGFkYXRhOwotICAgICAgICAgICAgbWV0YWRhdGEuaWQg PSBzcWwuZ2V0Q29sdW1uSW50NjQoMCk7Ci0gICAgICAgICAgICBtZXRhZGF0YS5uYW1lID0gc3Fs LmdldENvbHVtblRleHQoMSk7CisgICAgICAgICAgICBJREJPYmplY3RTdG9yZU1ldGFkYXRhIG9z TWV0YWRhdGE7CisgICAgICAgICAgICBvc01ldGFkYXRhLmlkID0gc3FsLmdldENvbHVtbkludDY0 KDApOworICAgICAgICAgICAgb3NNZXRhZGF0YS5uYW1lID0gc3FsLmdldENvbHVtblRleHQoMSk7 CiAKICAgICAgICAgICAgIGludCBrZXlQYXRoU2l6ZTsKICAgICAgICAgICAgIGNvbnN0IHVpbnQ4 X3QqIGtleVBhdGhCdWZmZXIgPSBzdGF0aWNfY2FzdDxjb25zdCB1aW50OF90Kj4oc3FsLmdldENv bHVtbkJsb2IoMiwga2V5UGF0aFNpemUpKTsKIAogCi0gICAgICAgICAgICBpZiAoIWRlc2VyaWFs aXplSURCS2V5UGF0aChrZXlQYXRoQnVmZmVyLCBrZXlQYXRoU2l6ZSwgbWV0YWRhdGEua2V5UGF0 aCkpIHsKKyAgICAgICAgICAgIGlmICghZGVzZXJpYWxpemVJREJLZXlQYXRoKGtleVBhdGhCdWZm ZXIsIGtleVBhdGhTaXplLCBvc01ldGFkYXRhLmtleVBhdGgpKSB7CiAgICAgICAgICAgICAgICAg TE9HX0VSUk9SKCJVbmFibGUgdG8gZXh0cmFjdCBrZXkgcGF0aCBtZXRhZGF0YSBmcm9tIGRhdGFi YXNlIik7CiAgICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgICAgICAgICB9CiAK LSAgICAgICAgICAgIG1ldGFkYXRhLmF1dG9JbmNyZW1lbnQgPSBzcWwuZ2V0Q29sdW1uSW50KDMp OwotICAgICAgICAgICAgbWV0YWRhdGEubWF4SW5kZXhJZCA9IHNxbC5nZXRDb2x1bW5JbnQ2NCg0 KTsKKyAgICAgICAgICAgIG9zTWV0YWRhdGEuYXV0b0luY3JlbWVudCA9IHNxbC5nZXRDb2x1bW5J bnQoMyk7CisgICAgICAgICAgICBvc01ldGFkYXRhLm1heEluZGV4SWQgPSBzcWwuZ2V0Q29sdW1u SW50NjQoNCk7CiAKKyAgICAgICAgICAgIG1ldGFkYXRhLT5vYmplY3RTdG9yZXMuc2V0KG9zTWV0 YWRhdGEuaWQsIG9zTWV0YWRhdGEpOwogICAgICAgICAgICAgcmVzdWx0ID0gc3FsLnN0ZXAoKTsK ICAgICAgICAgfQogCg==