153616 2016-01-28 14:45:30 -0800 Modern IDB: Fix several more problems with object store changes during cursor iteration in SQLite backend 2016-01-28 15:19:11 -0800 1 1 1 Unclassified WebKit WebCore Misc. Safari 9 Unspecified Unspecified RESOLVED FIXED P2 Normal --- 149117 153021 1 beidson beidson achristensen alecflett commit-queue jsbell oldest_to_newest 1159887 0 beidson 2016-01-28 14:45:30 -0800 Modern IDB: Fix several more problems with object store changes during cursor iteration in SQLite backend 1159893 1 270150 beidson 2016-01-28 14:53:15 -0800 Created attachment 270150 Patch v1 1159911 2 beidson 2016-01-28 15:19:11 -0800 http://trac.webkit.org/changeset/195787 270150 2016-01-28 14:53:15 -0800 2016-01-28 14:56:49 -0800 Patch v1 patch text/plain 6912 beidson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmZTU3NjU4Li4xNDE1NDllIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTQgQEAKIDIwMTYtMDEt MjggIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAgICAgIE1vZGVybiBJ REI6IEZpeCBzZXZlcmFsIG1vcmUgcHJvYmxlbXMgd2l0aCBvYmplY3Qgc3RvcmUgY2hhbmdlcyBk dXJpbmcgY3Vyc29yIGl0ZXJhdGlvbiBpbiBTUUxpdGUgYmFja2VuZC4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MzYxNgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vbWFjLXdrMS9UZXN0 RXhwZWN0YXRpb25zOgorCisyMDE2LTAxLTI4ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxl LmNvbT4KKwogICAgICAgICBNb2Rlcm4gSURCOiBTUUxpdGUgYmFja2VuZCBkb2Vzbid0IGhhbmRs ZSBtdXRhdGlvbiBkdXJpbmcgY3Vyc29yIGl0ZXJhdGlvbi4KICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MzYxNAogCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9tYWMtd2sxL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9tYWMtd2sxL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggMTM0MGZkNzQuLjk2OGVhMzkgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azEvVGVzdEV4cGVjdGF0aW9ucwor KysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2sxL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQ1 NCwxMSArNDU0LDkgQEAgaW1wb3J0ZWQvdzNjL2luZGV4ZWRkYi92YWx1ZV9yZWN1cnNpdmUuaHRt IFsgRmFpbHVyZSBdCiBpbXBvcnRlZC93M2MvaW5kZXhlZGRiL3dyaXRlci1zdGFydmF0aW9uLmh0 bSBbIEZhaWx1cmUgXQogc3RvcmFnZS9pbmRleGVkZGIvY3Vyc29yLWNvbnRpbnVlLXZhbGlkaXR5 Lmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL2N1cnNvci1wcmltYXJ5LWtleS1v cmRlci5odG1sIFsgRmFpbHVyZSBdCi1zdG9yYWdlL2luZGV4ZWRkYi9jdXJzb3ItdXBkYXRlLmh0 bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL2dldC1rZXlyYW5nZS5odG1sIFsgRmFp bHVyZSBdCiBzdG9yYWdlL2luZGV4ZWRkYi9pbmRleC1kdXBsaWNhdGUta2V5cGF0aHMuaHRtbCBb IEZhaWx1cmUgXQogc3RvcmFnZS9pbmRleGVkZGIva2V5LWdlbmVyYXRvci5odG1sIFsgRmFpbHVy ZSBdCi1zdG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4vY3Vyc29yLTcuaHRtbCBbIEZhaWx1cmUgXQog c3RvcmFnZS9pbmRleGVkZGIvbW9kZXJuL2dldC1rZXlyYW5nZS5odG1sIFsgRmFpbHVyZSBdCiBz dG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4vaW5kZXgtMy5odG1sIFsgRmFpbHVyZSBdCiBzdG9yYWdl L2luZGV4ZWRkYi9vYmplY3RzdG9yZS1hdXRvaW5jcmVtZW50Lmh0bWwgWyBGYWlsdXJlIF0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwppbmRleCAzYzJjZmY0Li41MGE2NTQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjQgQEAK IDIwMTYtMDEtMjggIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAgICAg IE1vZGVybiBJREI6IEZpeCBzZXZlcmFsIG1vcmUgcHJvYmxlbXMgd2l0aCBvYmplY3Qgc3RvcmUg Y2hhbmdlcyBkdXJpbmcgY3Vyc29yIGl0ZXJhdGlvbiBpbiBTUUxpdGUgYmFja2VuZC4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MzYxNgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAo QSBmZXcgZmFpbGluZyB0ZXN0cyBwYXNzLCBhIGZldyBnZXQgY2xvc2VyKS4KKworICAgICAgICAq IE1vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpTUUxpdGVJREJCYWNraW5nU3RvcmU6OmNsZWFyT2Jq ZWN0U3RvcmUpOgorICAgICAgICAKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIv U1FMaXRlSURCQ3Vyc29yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6U1FMaXRl SURCQ3Vyc29yOjpyZXNldEFuZFJlYmluZFN0YXRlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpJ REJTZXJ2ZXI6OlNRTGl0ZUlEQkN1cnNvcjo6YmluZEFyZ3VtZW50cyk6CisgICAgICAgIAorICAg ICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZVRyYW5zYWN0 aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6VW5pcXVlSURCRGF0YWJhc2VU cmFuc2FjdGlvbjo6aXRlcmF0ZUN1cnNvcik6CisKKzIwMTYtMDEtMjggIEJyYWR5IEVpZHNvbiAg PGJlaWRzb25AYXBwbGUuY29tPgorCiAgICAgICAgIE1vZGVybiBJREI6IFNRTGl0ZSBiYWNrZW5k IGRvZXNuJ3QgaGFuZGxlIG11dGF0aW9uIGR1cmluZyBjdXJzb3IgaXRlcmF0aW9uLgogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUzNjE0CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJC YWNraW5nU3RvcmUuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVy L1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5jcHAKaW5kZXggZTdjZmJmOS4uZjFlZjg1ZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJh Y2tpbmdTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2Vy dmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5jcHAKQEAgLTY3Myw2ICs2NzMsOCBAQCBJREJFcnJv ciBTUUxpdGVJREJCYWNraW5nU3RvcmU6OmRlbGV0ZU9iamVjdFN0b3JlKGNvbnN0IElEQlJlc291 cmNlSWRlbnRpZmllciYgdAogCiBJREJFcnJvciBTUUxpdGVJREJCYWNraW5nU3RvcmU6OmNsZWFy T2JqZWN0U3RvcmUoY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVyJiB0cmFuc2FjdGlvbklkZW50 aWZpZXIsIHVpbnQ2NF90IG9iamVjdFN0b3JlSUQpCiB7CisgICAgTE9HKEluZGV4ZWREQiwgIlNR TGl0ZUlEQkJhY2tpbmdTdG9yZTo6Y2xlYXJPYmplY3RTdG9yZSAtIG9iamVjdCBzdG9yZSAlIiBQ Ukl1NjQsIG9iamVjdFN0b3JlSUQpOworCiAgICAgQVNTRVJUKG1fc3FsaXRlREIpOwogICAgIEFT U0VSVChtX3NxbGl0ZURCLT5pc09wZW4oKSk7CiAKQEAgLTcwNiw2ICs3MDgsOCBAQCBJREJFcnJv ciBTUUxpdGVJREJCYWNraW5nU3RvcmU6OmNsZWFyT2JqZWN0U3RvcmUoY29uc3QgSURCUmVzb3Vy Y2VJZGVudGlmaWVyJiB0cgogICAgICAgICB9CiAgICAgfQogCisgICAgdHJhbnNhY3Rpb24tPm5v dGlmeUN1cnNvcnNPZkNoYW5nZXMob2JqZWN0U3RvcmVJRCk7CisKICAgICByZXR1cm4geyB9Owog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIv U1FMaXRlSURCQ3Vyc29yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3Nl cnZlci9TUUxpdGVJREJDdXJzb3IuY3BwCmluZGV4IGI5YTBlZjUuLmE5YWE3ZDQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJDdXJz b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxp dGVJREJDdXJzb3IuY3BwCkBAIC0yMjMsMTAgKzIyMywyOSBAQCB2b2lkIFNRTGl0ZUlEQkN1cnNv cjo6cmVzZXRBbmRSZWJpbmRTdGF0ZW1lbnQoKQogCiAgICAgLy8gT3RoZXJ3aXNlIHVwZGF0ZSB0 aGUgbG93ZXIga2V5IG9yIHVwcGVyIGtleSB1c2VkIGZvciB0aGUgY3Vyc29yIHJhbmdlLgogICAg IC8vIFRoaXMgaXMgc28gdGhlIGN1cnNvciBjYW4gcGljayB1cCB3aGVyZSB3ZSBsZWZ0IG9mZi4K LSAgICBpZiAobV9jdXJzb3JEaXJlY3Rpb24gPT0gSW5kZXhlZERCOjpDdXJzb3JEaXJlY3Rpb246 Ok5leHQgfHwgbV9jdXJzb3JEaXJlY3Rpb24gPT0gSW5kZXhlZERCOjpDdXJzb3JEaXJlY3Rpb246 Ok5leHROb0R1cGxpY2F0ZSkKKyAgICAvLyBXZSBtaWdodCBhbHNvIGhhdmUgdG8gY2hhbmdlIHRo ZSBzdGF0ZW1lbnQgZnJvbSBjbG9zZWQgdG8gb3BlbiBzbyB3ZSBkb24ndCByZWZldGNoIHRoZSBj dXJyZW50IGtleSBhIHNlY29uZCB0aW1lLgorICAgIGlmIChtX2N1cnNvckRpcmVjdGlvbiA9PSBJ bmRleGVkREI6OkN1cnNvckRpcmVjdGlvbjo6TmV4dCB8fCBtX2N1cnNvckRpcmVjdGlvbiA9PSBJ bmRleGVkREI6OkN1cnNvckRpcmVjdGlvbjo6TmV4dE5vRHVwbGljYXRlKSB7CiAgICAgICAgIG1f Y3VycmVudExvd2VyS2V5ID0gbV9jdXJyZW50S2V5OwotICAgIGVsc2UKKyAgICAgICAgaWYgKCFt X2tleVJhbmdlLmxvd2VyT3BlbikgeworICAgICAgICAgICAgbV9rZXlSYW5nZS5sb3dlck9wZW4g PSB0cnVlOworICAgICAgICAgICAgbV9rZXlSYW5nZS5sb3dlcktleSA9IG1fY3VycmVudExvd2Vy S2V5OworICAgICAgICAgICAgbV9zdGF0ZW1lbnQgPSBudWxscHRyOworICAgICAgICAgICAgbV9j dXJyZW50UmVjb3JkSUQgPSAtMTsKKyAgICAgICAgfQorICAgIH0gZWxzZSB7CiAgICAgICAgIG1f Y3VycmVudFVwcGVyS2V5ID0gbV9jdXJyZW50S2V5OworICAgICAgICBpZiAoIW1fa2V5UmFuZ2Uu dXBwZXJPcGVuKSB7CisgICAgICAgICAgICBtX2tleVJhbmdlLnVwcGVyT3BlbiA9IHRydWU7Cisg ICAgICAgICAgICBtX2tleVJhbmdlLnVwcGVyS2V5ID0gbV9jdXJyZW50VXBwZXJLZXk7CisgICAg ICAgICAgICBtX3N0YXRlbWVudCA9IG51bGxwdHI7CisgICAgICAgICAgICBtX2N1cnJlbnRSZWNv cmRJRCA9IC0xOworICAgICAgICB9CisgICAgfQorCisgICAgaWYgKCFtX3N0YXRlbWVudCAmJiAh ZXN0YWJsaXNoU3RhdGVtZW50KCkpIHsKKyAgICAgICAgTE9HX0VSUk9SKCJVbmFibGUgdG8gZXN0 YWJsaXNoIG5ldyBzdGF0ZW1lbnQgZm9yIGN1cnNvciBpdGVyYXRpb24iKTsKKyAgICAgICAgcmV0 dXJuOworICAgIH0KIAogICAgIGlmIChtX3N0YXRlbWVudC0+cmVzZXQoKSAhPSBTUUxJVEVfT0sp IHsKICAgICAgICAgTE9HX0VSUk9SKCJDb3VsZCBub3QgcmVzZXQgY3Vyc29yIHN0YXRlbWVudCB0 byByZXNwb25kIHRvIG9iamVjdCBzdG9yZSBjaGFuZ2VzIik7CkBAIC0yMzgsNiArMjU3LDggQEAg dm9pZCBTUUxpdGVJREJDdXJzb3I6OnJlc2V0QW5kUmViaW5kU3RhdGVtZW50KCkKIAogYm9vbCBT UUxpdGVJREJDdXJzb3I6OmJpbmRBcmd1bWVudHMoKQogeworICAgIExPRyhJbmRleGVkREIsICJD dXJzb3IgaXMgYmluZGluZyBsb3dlciBrZXkgJyVzJyBhbmQgdXBwZXIga2V5ICclcyciLCBtX2N1 cnJlbnRMb3dlcktleS5sb2dnaW5nU3RyaW5nKCkudXRmOCgpLmRhdGEoKSwgbV9jdXJyZW50VXBw ZXJLZXkubG9nZ2luZ1N0cmluZygpLnV0ZjgoKS5kYXRhKCkpOworCiAgICAgaWYgKG1fc3RhdGVt ZW50LT5iaW5kSW50NjQoMSwgbV9ib3VuZElEKSAhPSBTUUxJVEVfT0spIHsKICAgICAgICAgTE9H X0VSUk9SKCJDb3VsZCBub3QgYmluZCBpZCBhcmd1bWVudCAoYm91bmQgSUQpIik7CiAgICAgICAg IHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZVRyYW5zYWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZVRyYW5zYWN0aW9u LmNwcAppbmRleCA4NjgxMzNiLi40MWVmOGMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2VUcmFuc2FjdGlvbi5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRh dGFiYXNlVHJhbnNhY3Rpb24uY3BwCkBAIC0yODEsNyArMjgxLDcgQEAgdm9pZCBVbmlxdWVJREJE YXRhYmFzZVRyYW5zYWN0aW9uOjppdGVyYXRlQ3Vyc29yKGNvbnN0IElEQlJlcXVlc3REYXRhJiBy ZXF1ZXN0RGEKIAogICAgIFJlZlB0cjxVbmlxdWVJREJEYXRhYmFzZVRyYW5zYWN0aW9uPiBwcm90 ZWN0ZWRUaGlzKHRoaXMpOwogICAgIG1fZGF0YWJhc2VDb25uZWN0aW9uLT5kYXRhYmFzZSgpLml0 ZXJhdGVDdXJzb3IocmVxdWVzdERhdGEsIGtleSwgY291bnQsIFt0aGlzLCBwcm90ZWN0ZWRUaGlz LCByZXF1ZXN0RGF0YV0oY29uc3QgSURCRXJyb3ImIGVycm9yLCBjb25zdCBJREJHZXRSZXN1bHQm IHJlc3VsdCkgewotICAgICAgICBMT0coSW5kZXhlZERCLCAiVW5pcXVlSURCRGF0YWJhc2VUcmFu c2FjdGlvbjo6b3BlbkN1cnNvciAoY2FsbGJhY2spIik7CisgICAgICAgIExPRyhJbmRleGVkREIs ICJVbmlxdWVJREJEYXRhYmFzZVRyYW5zYWN0aW9uOjppdGVyYXRlQ3Vyc29yIChjYWxsYmFjayki KTsKIAogICAgICAgICBpZiAoZXJyb3IuaXNOdWxsKCkpCiAgICAgICAgICAgICBtX2RhdGFiYXNl Q29ubmVjdGlvbi0+Y29ubmVjdGlvblRvQ2xpZW50KCkuZGlkSXRlcmF0ZUN1cnNvcihJREJSZXN1 bHREYXRhOjppdGVyYXRlQ3Vyc29yU3VjY2VzcyhyZXF1ZXN0RGF0YS5yZXF1ZXN0SWRlbnRpZmll cigpLCByZXN1bHQpKTsK