153661 2016-01-29 11:40:19 -0800 Modern IDB: storage/indexeddb/modern/index-3.html fails 2016-01-29 13:23:15 -0800 1 1 1 Unclassified WebKit WebCore Misc. Safari 9 Unspecified Unspecified RESOLVED FIXED P2 Normal --- 149117 153021 1 beidson beidson achristensen aestes alecflett commit-queue jsbell oldest_to_newest 1160196 0 beidson 2016-01-29 11:40:19 -0800 Modern IDB: storage/indexeddb/modern/index-3.html fails When adding a record triggers an index unique constraint failure, we don't gracefully cleanup everything. (There were FIXMEs to this effect) 1160200 1 270232 beidson 2016-01-29 11:44:19 -0800 Created attachment 270232 Patch v1 1160201 2 beidson 2016-01-29 11:44:47 -0800 This relies on the patch in 153652. I'll mark as patch and for review after that lands. 1160205 3 270234 beidson 2016-01-29 11:48:17 -0800 Created attachment 270234 Patch v1 1160240 4 beidson 2016-01-29 13:23:15 -0800 http://trac.webkit.org/changeset/195838 270232 2016-01-29 11:44:19 -0800 2016-01-29 11:48:17 -0800 Patch v1 patch application/octet-stream 6224 beidson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhZjU2ZDYwLi40MDg4NzQxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTYtMDEt MjkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIE1vZGVybiBJ REI6IHN0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi9pbmRleC0zLmh0bWwgZmFpbHMuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTM2NjEKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy13 azEvVGVzdEV4cGVjdGF0aW9uczoKKwogMjAxNi0wMS0yOSAgUnlhbiBIYWRkYWQgIDxyeWFuaGFk ZGFkQGFwcGxlLmNvbT4KIAogICAgICAgICBNYXJraW5nIDMgZGlzcGxheWxpc3QgdGVzdHMgYXMg Zmxha3kgb24gaW9zLXNpbXVsYXRvcgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0v bWFjLXdrMS9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMS9U ZXN0RXhwZWN0YXRpb25zCmluZGV4IDEyNWM5NmEuLjY2YWQ0ZDEgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL3BsYXRmb3JtL21hYy13azEvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9tYWMtd2sxL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTI1OSw3ICsyNTksNiBAQCBz dG9yYWdlL2luZGV4ZWRkYi9jdXJzb3ItY29udGludWUtdmFsaWRpdHkuaHRtbCBbIEZhaWx1cmUg XQogc3RvcmFnZS9pbmRleGVkZGIvY3Vyc29yLXByaW1hcnkta2V5LW9yZGVyLmh0bWwgWyBGYWls dXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL2dldC1rZXlyYW5nZS5odG1sIFsgRmFpbHVyZSBdCiBz dG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4vZ2V0LWtleXJhbmdlLmh0bWwgWyBGYWlsdXJlIF0KLXN0 b3JhZ2UvaW5kZXhlZGRiL21vZGVybi9pbmRleC0zLmh0bWwgWyBGYWlsdXJlIF0KIAogIyBTUUxp dGUgYmFja2VuZCB0ZXN0cyB0aGF0IHRpbWVvdXQKIHN0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi90 cmFuc2FjdGlvbi1zY2hlZHVsZXItMS5odG1sIFsgU2tpcCBdCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWZlYjdh ZC4uOTlhZDAyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE2LTAxLTI5ICBCcmFk eSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKworICAgICAgICBNb2Rlcm4gSURCOiBzdG9y YWdlL2luZGV4ZWRkYi9tb2Rlcm4vaW5kZXgtMy5odG1sIGZhaWxzLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUzNjYxCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzICgxIGZhaWxpbmcg dGVzdCBub3cgcGFzc2VzLCBvdGhlcnMgZ2V0IGNsb3NlcikuCisKKyAgICAgICAgV2hlbiBpbmRl eGluZyBhIG5ldyByZWNvcmQgZmFpbHMgZHVlIHRvIHVuaXF1ZW5lc3MgY29uc3RyYWludHMsIHJl bW92ZSBhbGwgdHJhY2VzIG9mIHRoZSByZWNvcmQuCisKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4 ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OklEQlNlcnZlcjo6U1FMaXRlSURCQmFja2luZ1N0b3JlOjpjcmVhdGVJbmRleCk6CisgICAgICAg IChXZWJDb3JlOjpJREJTZXJ2ZXI6OlNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6dXBkYXRlQWxsSW5k ZXhlc0ZvckFkZFJlY29yZCk6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OlNRTGl0ZUlE QkJhY2tpbmdTdG9yZTo6YWRkUmVjb3JkKToKKwogMjAxNi0wMS0yOSAgSmVyIE5vYmxlICA8amVy Lm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIFdpbmRvd3MgYnVpbGQgZml4 OyBvbmUgbW9yZSBSZXNvdXJjZUxvYWRlck9wdGlvbnMgY2FsbCBzaXRlIHdoaWNoIG5lZWRzIHRv CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FM aXRlSURCQmFja2luZ1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRi L3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwCmluZGV4IDBlMTMwNWQuLjcwYTcxZWUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxp dGVJREJCYWNraW5nU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwCkBAIC03NjMsNyArNzYzLDE1IEBA IElEQkVycm9yIFNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6Y3JlYXRlSW5kZXgoY29uc3QgSURCUmVz b3VyY2VJZGVudGlmaWVyJiB0cmFuc2FjCiAKICAgICAgICAgSURCRXJyb3IgZXJyb3IgPSB1cGRh dGVPbmVJbmRleEZvckFkZFJlY29yZChpbmZvLCBrZXksIHZhbHVlQnVmZmVyKTsKICAgICAgICAg aWYgKCFlcnJvci5pc051bGwoKSkgewotICAgICAgICAgICAgLy8gRklYTUU6IFJlbW92ZSB0aGlz IG5ld2x5IGFkZGVkIGluZGV4LgorICAgICAgICAgICAgU1FMaXRlU3RhdGVtZW50IHNxbCgqbV9z cWxpdGVEQiwgQVNDSUlMaXRlcmFsKCJERUxFVEUgRlJPTSBJbmRleEluZm8gV0hFUkUgaWQgPSA/ IEFORCBvYmplY3RTdG9yZUlEID0gPzsiKSk7CisgICAgICAgICAgICBpZiAoc3FsLnByZXBhcmUo KSAhPSBTUUxJVEVfT0sKKyAgICAgICAgICAgICAgICB8fCBzcWwuYmluZEludDY0KDEsIGluZm8u aWRlbnRpZmllcigpKSAhPSBTUUxJVEVfT0sKKyAgICAgICAgICAgICAgICB8fCBzcWwuYmluZElu dDY0KDIsIGluZm8ub2JqZWN0U3RvcmVJZGVudGlmaWVyKCkpICE9IFNRTElURV9PSworICAgICAg ICAgICAgICAgIHx8IHNxbC5zdGVwKCkgIT0gU1FMSVRFX0RPTkUpIHsKKyAgICAgICAgICAgICAg ICBMT0dfRVJST1IoIkluZGV4IGNyZWF0aW9uIGZhaWxlZCBkdWUgdG8gdW5pcXVlbmVzcyBjb25z dHJhaW50IGZhaWx1cmUsIGJ1dCB0aGVyZSB3YXMgYW4gZXJyb3IgZGVsZXRpbmcgdGhlIEluZGV4 IHJlY29yZCBmcm9tIHRoZSBkYXRhYmFzZSIpOworICAgICAgICAgICAgICAgIHJldHVybiB7IElE QkRhdGFiYXNlRXhjZXB0aW9uOjpVbmtub3duRXJyb3IsIEFTQ0lJTGl0ZXJhbCgiSW5kZXggY3Jl YXRpb24gZmFpbGVkIGR1ZSB0byB1bmlxdWVuZXNzIGNvbnN0cmFpbnQgZmFpbHVyZSwgYnV0IHRo ZXJlIHdhcyBhbiBlcnJvciBkZWxldGluZyB0aGUgSW5kZXggcmVjb3JkIGZyb20gdGhlIGRhdGFi YXNlIikgfTsKKyAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgcmV0dXJuIGVycm9yOwogICAg ICAgICB9CiAKQEAgLTEwOTAsOCArMTA5OCw3IEBAIElEQkVycm9yIFNRTGl0ZUlEQkJhY2tpbmdT dG9yZTo6dXBkYXRlQWxsSW5kZXhlc0ZvckFkZFJlY29yZChjb25zdCBJREJPYmplY3RTdG9yCiAg ICAgICAgIHJldHVybiB7IH07CiAKICAgICBJREJFcnJvciBlcnJvcjsKLSAgICBWZWN0b3I8c3Rk OjpwYWlyPHVpbnQ2NF90LCBJbmRleEtleT4+IGNoYW5nZWRJbmRleFJlY29yZHM7Ci0KKyAgICBi b29sIGFueVJlY29yZHNTdWNjZWVkZWQgPSBmYWxzZTsKICAgICBmb3IgKGF1dG8mIGluZGV4IDog aW5mby5pbmRleE1hcCgpLnZhbHVlcygpKSB7CiAgICAgICAgIEluZGV4S2V5IGluZGV4S2V5Owog ICAgICAgICBnZW5lcmF0ZUluZGV4S2V5Rm9yVmFsdWUoKm1fZ2xvYmFsT2JqZWN0LT5nbG9iYWxF eGVjKCksIGluZGV4LCBqc1ZhbHVlLCBpbmRleEtleSk7CkBAIC0xMTAzLDEwICsxMTEwLDIyIEBA IElEQkVycm9yIFNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6dXBkYXRlQWxsSW5kZXhlc0ZvckFkZFJl Y29yZChjb25zdCBJREJPYmplY3RTdG9yCiAgICAgICAgIGlmICghZXJyb3IuaXNOdWxsKCkpCiAg ICAgICAgICAgICBicmVhazsKIAotICAgICAgICBjaGFuZ2VkSW5kZXhSZWNvcmRzLmFwcGVuZChz dGQ6Om1ha2VfcGFpcihpbmRleC5pZGVudGlmaWVyKCksIGluZGV4S2V5KSk7CisgICAgICAgIGFu eVJlY29yZHNTdWNjZWVkZWQgPSB0cnVlOwogICAgIH0KIAotICAgIC8vIEZJWE1FOiBJZiBhbnkg b2YgdGhlIGluZGV4IHB1dHMgZmFpbGVkLCByZXZlcnQgdGhlIG9uZXMgdGhhdCB3ZW50IHRocm91 Z2ggKGNoYW5nZWRJbmRleFJlY29yZHMpLgorICAgIGlmICghZXJyb3IuaXNOdWxsKCkgJiYgYW55 UmVjb3Jkc1N1Y2NlZWRlZCkgeworICAgICAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiBrZXlCdWZm ZXIgPSBzZXJpYWxpemVJREJLZXlEYXRhKGtleSk7CisKKyAgICAgICAgU1FMaXRlU3RhdGVtZW50 IHNxbCgqbV9zcWxpdGVEQiwgQVNDSUlMaXRlcmFsKCJERUxFVEUgRlJPTSBJbmRleFJlY29yZHMg V0hFUkUgb2JqZWN0U3RvcmVJRCA9ID8gQU5EIHZhbHVlID0gQ0FTVCg/IEFTIFRFWFQpOyIpKTsK KworICAgICAgICBpZiAoc3FsLnByZXBhcmUoKSAhPSBTUUxJVEVfT0sKKyAgICAgICAgICAgIHx8 IHNxbC5iaW5kSW50NjQoMSwgaW5mby5pZGVudGlmaWVyKCkpICE9IFNRTElURV9PSworICAgICAg ICAgICAgfHwgc3FsLmJpbmRCbG9iKDIsIGtleUJ1ZmZlci0+ZGF0YSgpLCBrZXlCdWZmZXItPnNp emUoKSkgIT0gU1FMSVRFX09LCisgICAgICAgICAgICB8fCBzcWwuc3RlcCgpICE9IFNRTElURV9E T05FKSB7CisgICAgICAgICAgICBMT0dfRVJST1IoIkFkZGluZyBvbmUgSW5kZXggcmVjb3JkIGZh aWxlZCwgYnV0IGZhaWxlZCB0byByZW1vdmUgYWxsIG90aGVycyB0aGF0IHByZXZpb3VzbHkgc3Vj Y2VlZGVkIik7CisgICAgICAgICAgICByZXR1cm4geyBJREJEYXRhYmFzZUV4Y2VwdGlvbjo6VW5r bm93bkVycm9yLCBBU0NJSUxpdGVyYWwoIkFkZGluZyBvbmUgSW5kZXggcmVjb3JkIGZhaWxlZCwg YnV0IGZhaWxlZCB0byByZW1vdmUgYWxsIG90aGVycyB0aGF0IHByZXZpb3VzbHkgc3VjY2VlZGVk IikgfTsKKyAgICAgICAgfQorICAgIH0KIAogICAgIHJldHVybiBlcnJvcjsKIH0KQEAgLTExNDgs NyArMTE2NywxNiBAQCBJREJFcnJvciBTUUxpdGVJREJCYWNraW5nU3RvcmU6OmFkZFJlY29yZChj b25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWN0aQogCiAgICAgYXV0byBlcnJvciA9 IHVwZGF0ZUFsbEluZGV4ZXNGb3JBZGRSZWNvcmQob2JqZWN0U3RvcmVJbmZvLCBrZXlEYXRhLCB2 YWx1ZSk7CiAKLSAgICAvLyBGSVhNRTogSWYgdGhlcmUgd2FzIGFuIGVycm9yIGluZGV4aW5nIHRo aXMgcmVjb3JkLCByZW1vdmUgaXQuCisgICAgaWYgKCFlcnJvci5pc051bGwoKSkgeworICAgICAg ICBTUUxpdGVTdGF0ZW1lbnQgc3FsKCptX3NxbGl0ZURCLCBBU0NJSUxpdGVyYWwoIkRFTEVURSBG Uk9NIFJlY29yZHMgV0hFUkUgb2JqZWN0U3RvcmVJRCA9ID8gQU5EIGtleSA9IENBU1QoPyBBUyBU RVhUKTsiKSk7CisgICAgICAgIGlmIChzcWwucHJlcGFyZSgpICE9IFNRTElURV9PSworICAgICAg ICAgICAgfHwgc3FsLmJpbmRJbnQ2NCgxLCBvYmplY3RTdG9yZUluZm8uaWRlbnRpZmllcigpKSAh PSBTUUxJVEVfT0sKKyAgICAgICAgICAgIHx8IHNxbC5iaW5kQmxvYigyLCBrZXlCdWZmZXItPmRh dGEoKSwga2V5QnVmZmVyLT5zaXplKCkpICE9IFNRTElURV9PSworICAgICAgICAgICAgfHwgc3Fs LnN0ZXAoKSAhPSBTUUxJVEVfRE9ORSkgeworICAgICAgICAgICAgTE9HX0VSUk9SKCJJbmRleGlu ZyBuZXcgb2JqZWN0IHN0b3JlIHJlY29yZCBmYWlsZWQsIGJ1dCB1bmFibGUgdG8gcmVtb3ZlIHRo ZSBvYmplY3Qgc3RvcmUgcmVjb3JkIGl0c2VsZiIpOworICAgICAgICAgICAgcmV0dXJuIHsgSURC RGF0YWJhc2VFeGNlcHRpb246OlVua25vd25FcnJvciwgQVNDSUlMaXRlcmFsKCJJbmRleGluZyBu ZXcgb2JqZWN0IHN0b3JlIHJlY29yZCBmYWlsZWQsIGJ1dCB1bmFibGUgdG8gcmVtb3ZlIHRoZSBv YmplY3Qgc3RvcmUgcmVjb3JkIGl0c2VsZiIpIH07CisgICAgICAgIH0KKyAgICB9CiAKICAgICB0 cmFuc2FjdGlvbi0+bm90aWZ5Q3Vyc29yc09mQ2hhbmdlcyhvYmplY3RTdG9yZUluZm8uaWRlbnRp ZmllcigpKTsKIAo= 270234 2016-01-29 11:48:17 -0800 2016-01-29 13:09:46 -0800 Patch v1 patch text/plain 6361 beidson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiZTlkZDg3Li44MzQ1M2NkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTQgQEAKIDIwMTYtMDEt MjkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAgICAgIE1vZGVybiBJ REI6IHN0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi9pbmRleC0zLmh0bWwgZmFpbHMuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTM2NjEKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy13 azEvVGVzdEV4cGVjdGF0aW9uczoKKworMjAxNi0wMS0yOSAgQnJhZHkgRWlkc29uICA8YmVpZHNv bkBhcHBsZS5jb20+CisKICAgICAgICAgTW9kZXJuIElEQjogRml4IGxvZ2dpbmcgdGhhdCBvdmVy d2hlbG1zIHB5dGhvbiB3aXRoIHN0cmluZ3Mgb2YgZXhjZXNzaXZlIGxlbmd0aC4KICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MzY1MgogCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2sxL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2sxL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggMTI1Yzk2YS4u NjZhZDRkMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMS9UZXN0RXhw ZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azEvVGVzdEV4cGVjdGF0 aW9ucwpAQCAtMjU5LDcgKzI1OSw2IEBAIHN0b3JhZ2UvaW5kZXhlZGRiL2N1cnNvci1jb250aW51 ZS12YWxpZGl0eS5odG1sIFsgRmFpbHVyZSBdCiBzdG9yYWdlL2luZGV4ZWRkYi9jdXJzb3ItcHJp bWFyeS1rZXktb3JkZXIuaHRtbCBbIEZhaWx1cmUgXQogc3RvcmFnZS9pbmRleGVkZGIvZ2V0LWtl eXJhbmdlLmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi9nZXQta2V5 cmFuZ2UuaHRtbCBbIEZhaWx1cmUgXQotc3RvcmFnZS9pbmRleGVkZGIvbW9kZXJuL2luZGV4LTMu aHRtbCBbIEZhaWx1cmUgXQogCiAjIFNRTGl0ZSBiYWNrZW5kIHRlc3RzIHRoYXQgdGltZW91dAog c3RvcmFnZS9pbmRleGVkZGIvbW9kZXJuL3RyYW5zYWN0aW9uLXNjaGVkdWxlci0xLmh0bWwgWyBT a2lwIF0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwppbmRleCA2NTg3Mjk1Li5kNmY1NDBmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUg KzEsMjEgQEAKIDIwMTYtMDEtMjkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgog CisgICAgICAgIE1vZGVybiBJREI6IHN0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi9pbmRleC0zLmh0 bWwgZmFpbHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNTM2NjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBObyBuZXcgdGVzdHMgKDEgZmFpbGluZyB0ZXN0IG5vdyBwYXNzZXMsIG90aGVycyBnZXQgY2xv c2VyKS4KKworICAgICAgICBXaGVuIGluZGV4aW5nIGEgbmV3IHJlY29yZCBmYWlscyBkdWUgdG8g dW5pcXVlbmVzcyBjb25zdHJhaW50cywgcmVtb3ZlIGFsbCB0cmFjZXMgb2YgdGhlIHJlY29yZC4K KworICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3Rv cmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpTUUxpdGVJREJCYWNraW5nU3Rv cmU6OmNyZWF0ZUluZGV4KToKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6U1FMaXRlSURC QmFja2luZ1N0b3JlOjp1cGRhdGVBbGxJbmRleGVzRm9yQWRkUmVjb3JkKToKKyAgICAgICAgKFdl YkNvcmU6OklEQlNlcnZlcjo6U1FMaXRlSURCQmFja2luZ1N0b3JlOjphZGRSZWNvcmQpOgorCisy MDE2LTAxLTI5ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKwogICAgICAgICBN b2Rlcm4gSURCOiBGaXggbG9nZ2luZyB0aGF0IG92ZXJ3aGVsbXMgcHl0aG9uIHdpdGggc3RyaW5n cyBvZiBleGNlc3NpdmUgbGVuZ3RoLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTUzNjUyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwIGIvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5jcHAK aW5kZXggMGUxMzA1ZC4uNzBhNzFlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5j cHAKQEAgLTc2Myw3ICs3NjMsMTUgQEAgSURCRXJyb3IgU1FMaXRlSURCQmFja2luZ1N0b3JlOjpj cmVhdGVJbmRleChjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWMKIAogICAgICAg ICBJREJFcnJvciBlcnJvciA9IHVwZGF0ZU9uZUluZGV4Rm9yQWRkUmVjb3JkKGluZm8sIGtleSwg dmFsdWVCdWZmZXIpOwogICAgICAgICBpZiAoIWVycm9yLmlzTnVsbCgpKSB7Ci0gICAgICAgICAg ICAvLyBGSVhNRTogUmVtb3ZlIHRoaXMgbmV3bHkgYWRkZWQgaW5kZXguCisgICAgICAgICAgICBT UUxpdGVTdGF0ZW1lbnQgc3FsKCptX3NxbGl0ZURCLCBBU0NJSUxpdGVyYWwoIkRFTEVURSBGUk9N IEluZGV4SW5mbyBXSEVSRSBpZCA9ID8gQU5EIG9iamVjdFN0b3JlSUQgPSA/OyIpKTsKKyAgICAg ICAgICAgIGlmIChzcWwucHJlcGFyZSgpICE9IFNRTElURV9PSworICAgICAgICAgICAgICAgIHx8 IHNxbC5iaW5kSW50NjQoMSwgaW5mby5pZGVudGlmaWVyKCkpICE9IFNRTElURV9PSworICAgICAg ICAgICAgICAgIHx8IHNxbC5iaW5kSW50NjQoMiwgaW5mby5vYmplY3RTdG9yZUlkZW50aWZpZXIo KSkgIT0gU1FMSVRFX09LCisgICAgICAgICAgICAgICAgfHwgc3FsLnN0ZXAoKSAhPSBTUUxJVEVf RE9ORSkgeworICAgICAgICAgICAgICAgIExPR19FUlJPUigiSW5kZXggY3JlYXRpb24gZmFpbGVk IGR1ZSB0byB1bmlxdWVuZXNzIGNvbnN0cmFpbnQgZmFpbHVyZSwgYnV0IHRoZXJlIHdhcyBhbiBl cnJvciBkZWxldGluZyB0aGUgSW5kZXggcmVjb3JkIGZyb20gdGhlIGRhdGFiYXNlIik7CisgICAg ICAgICAgICAgICAgcmV0dXJuIHsgSURCRGF0YWJhc2VFeGNlcHRpb246OlVua25vd25FcnJvciwg QVNDSUlMaXRlcmFsKCJJbmRleCBjcmVhdGlvbiBmYWlsZWQgZHVlIHRvIHVuaXF1ZW5lc3MgY29u c3RyYWludCBmYWlsdXJlLCBidXQgdGhlcmUgd2FzIGFuIGVycm9yIGRlbGV0aW5nIHRoZSBJbmRl eCByZWNvcmQgZnJvbSB0aGUgZGF0YWJhc2UiKSB9OworICAgICAgICAgICAgfQorCiAgICAgICAg ICAgICByZXR1cm4gZXJyb3I7CiAgICAgICAgIH0KIApAQCAtMTA5MCw4ICsxMDk4LDcgQEAgSURC RXJyb3IgU1FMaXRlSURCQmFja2luZ1N0b3JlOjp1cGRhdGVBbGxJbmRleGVzRm9yQWRkUmVjb3Jk KGNvbnN0IElEQk9iamVjdFN0b3IKICAgICAgICAgcmV0dXJuIHsgfTsKIAogICAgIElEQkVycm9y IGVycm9yOwotICAgIFZlY3RvcjxzdGQ6OnBhaXI8dWludDY0X3QsIEluZGV4S2V5Pj4gY2hhbmdl ZEluZGV4UmVjb3JkczsKLQorICAgIGJvb2wgYW55UmVjb3Jkc1N1Y2NlZWRlZCA9IGZhbHNlOwog ICAgIGZvciAoYXV0byYgaW5kZXggOiBpbmZvLmluZGV4TWFwKCkudmFsdWVzKCkpIHsKICAgICAg ICAgSW5kZXhLZXkgaW5kZXhLZXk7CiAgICAgICAgIGdlbmVyYXRlSW5kZXhLZXlGb3JWYWx1ZSgq bV9nbG9iYWxPYmplY3QtPmdsb2JhbEV4ZWMoKSwgaW5kZXgsIGpzVmFsdWUsIGluZGV4S2V5KTsK QEAgLTExMDMsMTAgKzExMTAsMjIgQEAgSURCRXJyb3IgU1FMaXRlSURCQmFja2luZ1N0b3JlOjp1 cGRhdGVBbGxJbmRleGVzRm9yQWRkUmVjb3JkKGNvbnN0IElEQk9iamVjdFN0b3IKICAgICAgICAg aWYgKCFlcnJvci5pc051bGwoKSkKICAgICAgICAgICAgIGJyZWFrOwogCi0gICAgICAgIGNoYW5n ZWRJbmRleFJlY29yZHMuYXBwZW5kKHN0ZDo6bWFrZV9wYWlyKGluZGV4LmlkZW50aWZpZXIoKSwg aW5kZXhLZXkpKTsKKyAgICAgICAgYW55UmVjb3Jkc1N1Y2NlZWRlZCA9IHRydWU7CiAgICAgfQog Ci0gICAgLy8gRklYTUU6IElmIGFueSBvZiB0aGUgaW5kZXggcHV0cyBmYWlsZWQsIHJldmVydCB0 aGUgb25lcyB0aGF0IHdlbnQgdGhyb3VnaCAoY2hhbmdlZEluZGV4UmVjb3JkcykuCisgICAgaWYg KCFlcnJvci5pc051bGwoKSAmJiBhbnlSZWNvcmRzU3VjY2VlZGVkKSB7CisgICAgICAgIFJlZlB0 cjxTaGFyZWRCdWZmZXI+IGtleUJ1ZmZlciA9IHNlcmlhbGl6ZUlEQktleURhdGEoa2V5KTsKKwor ICAgICAgICBTUUxpdGVTdGF0ZW1lbnQgc3FsKCptX3NxbGl0ZURCLCBBU0NJSUxpdGVyYWwoIkRF TEVURSBGUk9NIEluZGV4UmVjb3JkcyBXSEVSRSBvYmplY3RTdG9yZUlEID0gPyBBTkQgdmFsdWUg PSBDQVNUKD8gQVMgVEVYVCk7IikpOworCisgICAgICAgIGlmIChzcWwucHJlcGFyZSgpICE9IFNR TElURV9PSworICAgICAgICAgICAgfHwgc3FsLmJpbmRJbnQ2NCgxLCBpbmZvLmlkZW50aWZpZXIo KSkgIT0gU1FMSVRFX09LCisgICAgICAgICAgICB8fCBzcWwuYmluZEJsb2IoMiwga2V5QnVmZmVy LT5kYXRhKCksIGtleUJ1ZmZlci0+c2l6ZSgpKSAhPSBTUUxJVEVfT0sKKyAgICAgICAgICAgIHx8 IHNxbC5zdGVwKCkgIT0gU1FMSVRFX0RPTkUpIHsKKyAgICAgICAgICAgIExPR19FUlJPUigiQWRk aW5nIG9uZSBJbmRleCByZWNvcmQgZmFpbGVkLCBidXQgZmFpbGVkIHRvIHJlbW92ZSBhbGwgb3Ro ZXJzIHRoYXQgcHJldmlvdXNseSBzdWNjZWVkZWQiKTsKKyAgICAgICAgICAgIHJldHVybiB7IElE QkRhdGFiYXNlRXhjZXB0aW9uOjpVbmtub3duRXJyb3IsIEFTQ0lJTGl0ZXJhbCgiQWRkaW5nIG9u ZSBJbmRleCByZWNvcmQgZmFpbGVkLCBidXQgZmFpbGVkIHRvIHJlbW92ZSBhbGwgb3RoZXJzIHRo YXQgcHJldmlvdXNseSBzdWNjZWVkZWQiKSB9OworICAgICAgICB9CisgICAgfQogCiAgICAgcmV0 dXJuIGVycm9yOwogfQpAQCAtMTE0OCw3ICsxMTY3LDE2IEBAIElEQkVycm9yIFNRTGl0ZUlEQkJh Y2tpbmdTdG9yZTo6YWRkUmVjb3JkKGNvbnN0IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJhbnNh Y3RpCiAKICAgICBhdXRvIGVycm9yID0gdXBkYXRlQWxsSW5kZXhlc0ZvckFkZFJlY29yZChvYmpl Y3RTdG9yZUluZm8sIGtleURhdGEsIHZhbHVlKTsKIAotICAgIC8vIEZJWE1FOiBJZiB0aGVyZSB3 YXMgYW4gZXJyb3IgaW5kZXhpbmcgdGhpcyByZWNvcmQsIHJlbW92ZSBpdC4KKyAgICBpZiAoIWVy cm9yLmlzTnVsbCgpKSB7CisgICAgICAgIFNRTGl0ZVN0YXRlbWVudCBzcWwoKm1fc3FsaXRlREIs IEFTQ0lJTGl0ZXJhbCgiREVMRVRFIEZST00gUmVjb3JkcyBXSEVSRSBvYmplY3RTdG9yZUlEID0g PyBBTkQga2V5ID0gQ0FTVCg/IEFTIFRFWFQpOyIpKTsKKyAgICAgICAgaWYgKHNxbC5wcmVwYXJl KCkgIT0gU1FMSVRFX09LCisgICAgICAgICAgICB8fCBzcWwuYmluZEludDY0KDEsIG9iamVjdFN0 b3JlSW5mby5pZGVudGlmaWVyKCkpICE9IFNRTElURV9PSworICAgICAgICAgICAgfHwgc3FsLmJp bmRCbG9iKDIsIGtleUJ1ZmZlci0+ZGF0YSgpLCBrZXlCdWZmZXItPnNpemUoKSkgIT0gU1FMSVRF X09LCisgICAgICAgICAgICB8fCBzcWwuc3RlcCgpICE9IFNRTElURV9ET05FKSB7CisgICAgICAg ICAgICBMT0dfRVJST1IoIkluZGV4aW5nIG5ldyBvYmplY3Qgc3RvcmUgcmVjb3JkIGZhaWxlZCwg YnV0IHVuYWJsZSB0byByZW1vdmUgdGhlIG9iamVjdCBzdG9yZSByZWNvcmQgaXRzZWxmIik7Cisg ICAgICAgICAgICByZXR1cm4geyBJREJEYXRhYmFzZUV4Y2VwdGlvbjo6VW5rbm93bkVycm9yLCBB U0NJSUxpdGVyYWwoIkluZGV4aW5nIG5ldyBvYmplY3Qgc3RvcmUgcmVjb3JkIGZhaWxlZCwgYnV0 IHVuYWJsZSB0byByZW1vdmUgdGhlIG9iamVjdCBzdG9yZSByZWNvcmQgaXRzZWxmIikgfTsKKyAg ICAgICAgfQorICAgIH0KIAogICAgIHRyYW5zYWN0aW9uLT5ub3RpZnlDdXJzb3JzT2ZDaGFuZ2Vz KG9iamVjdFN0b3JlSW5mby5pZGVudGlmaWVyKCkpOwogCg==