204900 2019-12-05 10:39:11 -0800 IndexedDB: pass along error of IDBBackingStore::renameIndex 2019-12-06 15:57:22 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu alecflett beidson commit-queue ews-watchlist jsbell webkit-bug-importer oldest_to_newest 1595877 0 sihui_liu 2019-12-05 10:39:11 -0800 ... 1595891 1 384923 sihui_liu 2019-12-05 11:10:19 -0800 Created attachment 384923 Patch 1595924 2 384932 sihui_liu 2019-12-05 12:13:07 -0800 Created attachment 384932 Patch 1595996 3 384932 beidson 2019-12-05 14:17:18 -0800 Comment on attachment 384932 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=384932&action=review > Source/WebCore/ChangeLog:13 > + Covered by existing test: storage/indexeddb//modern/index-rename-1-private.html I don't see any changes to that test or its expectations, yet this is purportedly a behavior change. How is it covered by the test? 1596012 4 sihui_liu 2019-12-05 14:34:05 -0800 (In reply to Brady Eidson from comment #3) > Comment on attachment 384932 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=384932&action=review > > > Source/WebCore/ChangeLog:13 > > + Covered by existing test: storage/indexeddb//modern/index-rename-1-private.html > > I don't see any changes to that test or its expectations, yet this is > purportedly a behavior change. > > How is it covered by the test? The two bugs are covered by the test after we pass along the IDBBackingStore error. 1596412 5 384932 commit-queue 2019-12-06 15:56:42 -0800 Comment on attachment 384932 Patch Clearing flags on attachment: 384932 Committed r253228: <https://trac.webkit.org/changeset/253228> 1596413 6 commit-queue 2019-12-06 15:56:43 -0800 All reviewed patches have been landed. Closing bug. 1596414 7 webkit-bug-importer 2019-12-06 15:57:22 -0800 <rdar://problem/57716666> 384923 2019-12-05 11:10:19 -0800 2019-12-05 12:13:05 -0800 Patch bug-204900-20191205111018.patch text/plain 4664 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzMTUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjUyZjhiNzA0Yzk3MWY1 NzQ5YTBmNDI3NzBlYzc1NDBiZGRkYTM5ZS4uNzk2MmVlOWMwM2IzMzUxYjk2NTdmMzRkY2IwNGQx Y2Y2NjdmZTA2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE5LTEyLTA1ICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIEluZGV4ZWREQjogdXBkYXRl IElEQk9iamVjdFN0b3JlSW5mbyB3aGVuIGNyZWF0ZUluZGV4L2RlbGV0ZUluZGV4IGluIE1lbW9y eUlEQkJhY2tpbmdTdG9yZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjA0OTAwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5SURCQmFja2luZ1N0b3Jl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6TWVtb3J5SURCQmFja2luZ1N0b3Jl OjpjcmVhdGVJbmRleCk6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6Ok1lbW9yeUlEQkJh Y2tpbmdTdG9yZTo6ZGVsZXRlSW5kZXgpOgorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL3No YXJlZC9JREJPYmplY3RTdG9yZUluZm8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCT2JqZWN0 U3RvcmVJbmZvOjppc29sYXRlZENvcHkgY29uc3QpOgorCiAyMDE5LTEyLTA1ICB5b3Vlbm4gZmFi bGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBpbnNwZWN0b3IvcGFnZS9vdmVycmlk ZVNldHRpbmctTW9ja0NhcHR1cmVEZXZpY2VzRW5hYmxlZC5odG1sIGlzIGZhaWxpbmcgYWZ0ZXIg cmVtb3ZhbCBvZiBpbnRlcm5hbHMuc2V0TW9ja01lZGlhQ2FwdHVyZURldmljZXNFbmFibGVkIEFQ SQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL01l bW9yeUlEQkJhY2tpbmdTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRk Yi9zZXJ2ZXIvTWVtb3J5SURCQmFja2luZ1N0b3JlLmNwcAppbmRleCA3Y2JmYjc3NTcyMzdkNzEy ZjJmZDgwZDk3NTc0N2UxZTIxZjJiN2YzLi41OWRkNDEwNzNkOGJkNGVhNGZjNTMzZjk3MmU2ZGVh MTgwNTI1NWZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9z ZXJ2ZXIvTWVtb3J5SURCQmFja2luZ1N0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5SURCQmFja2luZ1N0b3JlLmNwcApAQCAtMjMyLDYg KzIzMiwxMSBAQCBJREJFcnJvciBNZW1vcnlJREJCYWNraW5nU3RvcmU6OmNyZWF0ZUluZGV4KGNv bnN0IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJhbnNhYwogewogICAgIExPRyhJbmRleGVkREIs ICJNZW1vcnlJREJCYWNraW5nU3RvcmU6OmNyZWF0ZUluZGV4Iik7CiAKKyAgICBBU1NFUlQobV9k YXRhYmFzZUluZm8pOworICAgIGF1dG8qIG9iamVjdFN0b3JlSW5mbyA9IG1fZGF0YWJhc2VJbmZv LT5pbmZvRm9yRXhpc3RpbmdPYmplY3RTdG9yZShpbmZvLm9iamVjdFN0b3JlSWRlbnRpZmllcigp KTsKKyAgICBpZiAoIW9iamVjdFN0b3JlSW5mbykKKyAgICAgICAgcmV0dXJuIElEQkVycm9yIHsg Q29uc3RyYWludEVycm9yIH07CisKICAgICBhdXRvIHJhd1RyYW5zYWN0aW9uID0gbV90cmFuc2Fj dGlvbnMuZ2V0KHRyYW5zYWN0aW9uSWRlbnRpZmllcik7CiAgICAgQVNTRVJUKHJhd1RyYW5zYWN0 aW9uKTsKICAgICBBU1NFUlQocmF3VHJhbnNhY3Rpb24tPmlzVmVyc2lvbkNoYW5nZSgpKTsKQEAg LTI0MCwxMyArMjQ1LDI2IEBAIElEQkVycm9yIE1lbW9yeUlEQkJhY2tpbmdTdG9yZTo6Y3JlYXRl SW5kZXgoY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVyJiB0cmFuc2FjCiAgICAgaWYgKCFvYmpl Y3RTdG9yZSkKICAgICAgICAgcmV0dXJuIElEQkVycm9yIHsgQ29uc3RyYWludEVycm9yIH07CiAK LSAgICByZXR1cm4gb2JqZWN0U3RvcmUtPmNyZWF0ZUluZGV4KCpyYXdUcmFuc2FjdGlvbiwgaW5m byk7CisgICAgYXV0byBlcnJvciA9IG9iamVjdFN0b3JlLT5jcmVhdGVJbmRleCgqcmF3VHJhbnNh Y3Rpb24sIGluZm8pOworICAgIGlmIChlcnJvci5pc051bGwoKSkKKyAgICAgICAgb2JqZWN0U3Rv cmVJbmZvLT5hZGRFeGlzdGluZ0luZGV4KGluZm8pOworCisgICAgcmV0dXJuIGVycm9yOwogfQog CiBJREJFcnJvciBNZW1vcnlJREJCYWNraW5nU3RvcmU6OmRlbGV0ZUluZGV4KGNvbnN0IElEQlJl c291cmNlSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCB1aW50NjRfdCBvYmplY3RT dG9yZUlkZW50aWZpZXIsIHVpbnQ2NF90IGluZGV4SWRlbnRpZmllciwgY29uc3QgTG9ja0hvbGRl ciYpCiB7CiAgICAgTE9HKEluZGV4ZWREQiwgIk1lbW9yeUlEQkJhY2tpbmdTdG9yZTo6ZGVsZXRl SW5kZXgiKTsKIAorICAgIEFTU0VSVChtX2RhdGFiYXNlSW5mbyk7CisgICAgYXV0byogb2JqZWN0 U3RvcmVJbmZvID0gbV9kYXRhYmFzZUluZm8tPmluZm9Gb3JFeGlzdGluZ09iamVjdFN0b3JlKG9i amVjdFN0b3JlSWRlbnRpZmllcik7CisgICAgaWYgKCFvYmplY3RTdG9yZUluZm8pCisgICAgICAg IHJldHVybiBJREJFcnJvciB7IENvbnN0cmFpbnRFcnJvciB9OworCisgICAgYXV0byogaW5kZXhJ bmZvID0gb2JqZWN0U3RvcmVJbmZvLT5pbmZvRm9yRXhpc3RpbmdJbmRleChpbmRleElkZW50aWZp ZXIpOworICAgIGlmICghaW5kZXhJbmZvKQorICAgICAgICByZXR1cm4gSURCRXJyb3IgeyBDb25z dHJhaW50RXJyb3IgfTsKKwogICAgIGF1dG8gcmF3VHJhbnNhY3Rpb24gPSBtX3RyYW5zYWN0aW9u cy5nZXQodHJhbnNhY3Rpb25JZGVudGlmaWVyKTsKICAgICBBU1NFUlQocmF3VHJhbnNhY3Rpb24p OwogICAgIEFTU0VSVChyYXdUcmFuc2FjdGlvbi0+aXNWZXJzaW9uQ2hhbmdlKCkpOwpAQCAtMjU1 LDcgKzI3MywxMSBAQCBJREJFcnJvciBNZW1vcnlJREJCYWNraW5nU3RvcmU6OmRlbGV0ZUluZGV4 KGNvbnN0IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJhbnNhYwogICAgIGlmICghb2JqZWN0U3Rv cmUpCiAgICAgICAgIHJldHVybiBJREJFcnJvciB7IENvbnN0cmFpbnRFcnJvciB9OwogCi0gICAg cmV0dXJuIG9iamVjdFN0b3JlLT5kZWxldGVJbmRleCgqcmF3VHJhbnNhY3Rpb24sIGluZGV4SWRl bnRpZmllcik7CisgICAgYXV0byBlcnJvciA9IG9iamVjdFN0b3JlLT5kZWxldGVJbmRleCgqcmF3 VHJhbnNhY3Rpb24sIGluZGV4SWRlbnRpZmllcik7CisgICAgaWYgKCFlcnJvci5pc051bGwoKSkK KyAgICAgICAgb2JqZWN0U3RvcmVJbmZvLT5kZWxldGVJbmRleChpbmRleElkZW50aWZpZXIpOwor CisgICAgcmV0dXJuIGVycm9yOwogfQogCiBJREJFcnJvciBNZW1vcnlJREJCYWNraW5nU3RvcmU6 OnJlbmFtZUluZGV4KGNvbnN0IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVu dGlmaWVyLCB1aW50NjRfdCBvYmplY3RTdG9yZUlkZW50aWZpZXIsIHVpbnQ2NF90IGluZGV4SWRl bnRpZmllciwgY29uc3QgU3RyaW5nJiBuZXdOYW1lLCBjb25zdCBMb2NrSG9sZGVyJikKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NoYXJlZC9JREJPYmplY3RT dG9yZUluZm8uY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2hhcmVkL0lE Qk9iamVjdFN0b3JlSW5mby5jcHAKaW5kZXggMmEwNTFmMzY2ZjdmMTlkOGQyYWE4YmJjMGQyZmI2 ZmU1N2JhNDI5My4uNWM3MjgyYTQ2MzhlYjRlNjcxYzUzZjFjNWZkY2YyYWYyNzJlYWM1NSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2hhcmVkL0lEQk9iamVj dFN0b3JlSW5mby5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2hh cmVkL0lEQk9iamVjdFN0b3JlSW5mby5jcHAKQEAgLTk4LDEzICs5OCwxMCBAQCBJREJPYmplY3RT dG9yZUluZm8gSURCT2JqZWN0U3RvcmVJbmZvOjppc29sYXRlZENvcHkoKSBjb25zdAogewogICAg IElEQk9iamVjdFN0b3JlSW5mbyByZXN1bHQgPSB7IG1faWRlbnRpZmllciwgbV9uYW1lLmlzb2xh dGVkQ29weSgpLCBXZWJDb3JlOjppc29sYXRlZENvcHkobV9rZXlQYXRoKSwgbV9hdXRvSW5jcmVt ZW50IH07CiAKLSAgICBmb3IgKGF1dG8mIGl0ZXJhdG9yIDogbV9pbmRleE1hcCkgeworICAgIGZv ciAoYXV0byYgaXRlcmF0b3IgOiBtX2luZGV4TWFwKQogICAgICAgICByZXN1bHQubV9pbmRleE1h cC5zZXQoaXRlcmF0b3Iua2V5LCBpdGVyYXRvci52YWx1ZS5pc29sYXRlZENvcHkoKSk7Ci0gICAg ICAgIGlmIChpdGVyYXRvci5rZXkgPiByZXN1bHQubV9tYXhJbmRleElEKQotICAgICAgICAgICAg cmVzdWx0Lm1fbWF4SW5kZXhJRCA9IGl0ZXJhdG9yLmtleTsKLSAgICB9CiAKLSAgICBBU1NFUlQo cmVzdWx0Lm1fbWF4SW5kZXhJRCA9PSBtX21heEluZGV4SUQpOworICAgIHJlc3VsdC5tX21heElu ZGV4SUQgPSBtX21heEluZGV4SUQ7CiAKICAgICByZXR1cm4gcmVzdWx0OwogfQo= 384932 2019-12-05 12:13:07 -0800 2019-12-06 15:56:42 -0800 Patch bug-204900-20191205121306.patch text/plain 7519 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzMTUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjUyZjhiNzA0Yzk3MWY1 NzQ5YTBmNDI3NzBlYzc1NDBiZGRkYTM5ZS4uOWJmNjc0NTAzY2EzMjExZWFkMDM3ZjViNjg1MTlj ZDM4NDA2OGQxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE5LTEyLTA1ICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIEluZGV4ZWREQjogcGFzcyBh bG9uZyBlcnJvciBvZiBJREJCYWNraW5nU3RvcmU6OnJlbmFtZUluZGV4CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDQ5MDAKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBpZ25vcmVkIGVycm9yIG9mIElE QkJhY2tpbmdTdG9yZTo6cmVuYW1lSW5kZXgsIHNvIHRoZSBvcGVyYXRpb24gbWF5IGZhaWwgc2ls ZW50bHkuIFRoaXMgY292ZXJlZCB1cCB0d28gYnVncyAKKyAgICAgICAgaW4gb3VyIGNvZGUgYXMg d2Ugd2VyZSB1bmF3YXJlIG9mIHRoZSBmYWlsdXJlLgorICAgICAgICBPbmUgd2FzIGluIE1lbW9y eUlEQkJhY2tpbmdTdG9yZSB0aGF0IHdlIGRpZCBub3QgdXBkYXRlIG9iamVjdFN0b3JlSW5mbyBw cm9wZXJseSB3aGVuIGNyZWF0ZUluZGV4L2RlbGV0ZUluZGV4OyAKKyAgICAgICAgYW5vdGhlciB3 YXMgaW4gSURCT2JqZWN0U3RvcmVJbmZvIHRoYXQgd2UgZGlkIG5vdCBjb3B5IGl0cyBtZW1iZXJz IGNvcnJlY3RseS4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3Q6IHN0b3JhZ2Uv aW5kZXhlZGRiLy9tb2Rlcm4vaW5kZXgtcmVuYW1lLTEtcHJpdmF0ZS5odG1sCisKKyAgICAgICAg KiBNb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5SURCQmFja2luZ1N0b3JlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6TWVtb3J5SURCQmFja2luZ1N0b3JlOjpjcmVhdGVJ bmRleCk6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6Ok1lbW9yeUlEQkJhY2tpbmdTdG9y ZTo6ZGVsZXRlSW5kZXgpOgorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9Vbmlx dWVJREJEYXRhYmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OlVuaXF1ZUlE QkRhdGFiYXNlOjpwZXJmb3JtUmVuYW1lSW5kZXgpOgorICAgICAgICAqIE1vZHVsZXMvaW5kZXhl ZGRiL3NoYXJlZC9JREJPYmplY3RTdG9yZUluZm8uY3BwOiBJZiBzb21lIGluZGV4IGlzIGRlbGV0 ZWQgZnJvbSBJREJPYmplY3RTdG9yZUluZm8sIHRoZW4KKyAgICAgICAgbV9tYXhJbmRleElEIGNv dWxkIGJlIGJpZ2dlciB0aGFuIG1heGltdW0gaW5kZXggSUQgaW4gbV9pbmRleE1hcCwgYmVjYXVz ZSB3ZSBkb24ndCBkZWNyZWFzZSBtX21heEluZGV4SUQgZm9yCisgICAgICAgIGRlbGV0aW9uLiBU aGVyZWZvcmUsIHRoZSBhc3NlcnRpb24gaGVyZSBpcyBpbmNvcnJlY3QuCisgICAgICAgIChXZWJD b3JlOjpJREJPYmplY3RTdG9yZUluZm86Omlzb2xhdGVkQ29weSBjb25zdCk6CisKIDIwMTktMTIt MDUgIHlvdWVubiBmYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIGluc3BlY3Rv ci9wYWdlL292ZXJyaWRlU2V0dGluZy1Nb2NrQ2FwdHVyZURldmljZXNFbmFibGVkLmh0bWwgaXMg ZmFpbGluZyBhZnRlciByZW1vdmFsIG9mIGludGVybmFscy5zZXRNb2NrTWVkaWFDYXB0dXJlRGV2 aWNlc0VuYWJsZWQgQVBJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4 ZWRkYi9zZXJ2ZXIvTWVtb3J5SURCQmFja2luZ1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9NZW1vcnlJREJCYWNraW5nU3RvcmUuY3BwCmluZGV4IDdj YmZiNzc1NzIzN2Q3MTJmMmZkODBkOTc1NzQ3ZTFlMjFmMmI3ZjMuLjU5ZGQ0MTA3M2Q4YmQ0ZWE0 ZmM1MzNmOTcyZTZkZWExODA1MjU1ZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaW5kZXhlZGRiL3NlcnZlci9NZW1vcnlJREJCYWNraW5nU3RvcmUuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9NZW1vcnlJREJCYWNraW5nU3RvcmUu Y3BwCkBAIC0yMzIsNiArMjMyLDExIEBAIElEQkVycm9yIE1lbW9yeUlEQkJhY2tpbmdTdG9yZTo6 Y3JlYXRlSW5kZXgoY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVyJiB0cmFuc2FjCiB7CiAgICAg TE9HKEluZGV4ZWREQiwgIk1lbW9yeUlEQkJhY2tpbmdTdG9yZTo6Y3JlYXRlSW5kZXgiKTsKIAor ICAgIEFTU0VSVChtX2RhdGFiYXNlSW5mbyk7CisgICAgYXV0byogb2JqZWN0U3RvcmVJbmZvID0g bV9kYXRhYmFzZUluZm8tPmluZm9Gb3JFeGlzdGluZ09iamVjdFN0b3JlKGluZm8ub2JqZWN0U3Rv cmVJZGVudGlmaWVyKCkpOworICAgIGlmICghb2JqZWN0U3RvcmVJbmZvKQorICAgICAgICByZXR1 cm4gSURCRXJyb3IgeyBDb25zdHJhaW50RXJyb3IgfTsKKwogICAgIGF1dG8gcmF3VHJhbnNhY3Rp b24gPSBtX3RyYW5zYWN0aW9ucy5nZXQodHJhbnNhY3Rpb25JZGVudGlmaWVyKTsKICAgICBBU1NF UlQocmF3VHJhbnNhY3Rpb24pOwogICAgIEFTU0VSVChyYXdUcmFuc2FjdGlvbi0+aXNWZXJzaW9u Q2hhbmdlKCkpOwpAQCAtMjQwLDEzICsyNDUsMjYgQEAgSURCRXJyb3IgTWVtb3J5SURCQmFja2lu Z1N0b3JlOjpjcmVhdGVJbmRleChjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWMK ICAgICBpZiAoIW9iamVjdFN0b3JlKQogICAgICAgICByZXR1cm4gSURCRXJyb3IgeyBDb25zdHJh aW50RXJyb3IgfTsKIAotICAgIHJldHVybiBvYmplY3RTdG9yZS0+Y3JlYXRlSW5kZXgoKnJhd1Ry YW5zYWN0aW9uLCBpbmZvKTsKKyAgICBhdXRvIGVycm9yID0gb2JqZWN0U3RvcmUtPmNyZWF0ZUlu ZGV4KCpyYXdUcmFuc2FjdGlvbiwgaW5mbyk7CisgICAgaWYgKGVycm9yLmlzTnVsbCgpKQorICAg ICAgICBvYmplY3RTdG9yZUluZm8tPmFkZEV4aXN0aW5nSW5kZXgoaW5mbyk7CisKKyAgICByZXR1 cm4gZXJyb3I7CiB9CiAKIElEQkVycm9yIE1lbW9yeUlEQkJhY2tpbmdTdG9yZTo6ZGVsZXRlSW5k ZXgoY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVyJiB0cmFuc2FjdGlvbklkZW50aWZpZXIsIHVp bnQ2NF90IG9iamVjdFN0b3JlSWRlbnRpZmllciwgdWludDY0X3QgaW5kZXhJZGVudGlmaWVyLCBj b25zdCBMb2NrSG9sZGVyJikKIHsKICAgICBMT0coSW5kZXhlZERCLCAiTWVtb3J5SURCQmFja2lu Z1N0b3JlOjpkZWxldGVJbmRleCIpOwogCisgICAgQVNTRVJUKG1fZGF0YWJhc2VJbmZvKTsKKyAg ICBhdXRvKiBvYmplY3RTdG9yZUluZm8gPSBtX2RhdGFiYXNlSW5mby0+aW5mb0ZvckV4aXN0aW5n T2JqZWN0U3RvcmUob2JqZWN0U3RvcmVJZGVudGlmaWVyKTsKKyAgICBpZiAoIW9iamVjdFN0b3Jl SW5mbykKKyAgICAgICAgcmV0dXJuIElEQkVycm9yIHsgQ29uc3RyYWludEVycm9yIH07CisKKyAg ICBhdXRvKiBpbmRleEluZm8gPSBvYmplY3RTdG9yZUluZm8tPmluZm9Gb3JFeGlzdGluZ0luZGV4 KGluZGV4SWRlbnRpZmllcik7CisgICAgaWYgKCFpbmRleEluZm8pCisgICAgICAgIHJldHVybiBJ REJFcnJvciB7IENvbnN0cmFpbnRFcnJvciB9OworCiAgICAgYXV0byByYXdUcmFuc2FjdGlvbiA9 IG1fdHJhbnNhY3Rpb25zLmdldCh0cmFuc2FjdGlvbklkZW50aWZpZXIpOwogICAgIEFTU0VSVChy YXdUcmFuc2FjdGlvbik7CiAgICAgQVNTRVJUKHJhd1RyYW5zYWN0aW9uLT5pc1ZlcnNpb25DaGFu Z2UoKSk7CkBAIC0yNTUsNyArMjczLDExIEBAIElEQkVycm9yIE1lbW9yeUlEQkJhY2tpbmdTdG9y ZTo6ZGVsZXRlSW5kZXgoY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVyJiB0cmFuc2FjCiAgICAg aWYgKCFvYmplY3RTdG9yZSkKICAgICAgICAgcmV0dXJuIElEQkVycm9yIHsgQ29uc3RyYWludEVy cm9yIH07CiAKLSAgICByZXR1cm4gb2JqZWN0U3RvcmUtPmRlbGV0ZUluZGV4KCpyYXdUcmFuc2Fj dGlvbiwgaW5kZXhJZGVudGlmaWVyKTsKKyAgICBhdXRvIGVycm9yID0gb2JqZWN0U3RvcmUtPmRl bGV0ZUluZGV4KCpyYXdUcmFuc2FjdGlvbiwgaW5kZXhJZGVudGlmaWVyKTsKKyAgICBpZiAoIWVy cm9yLmlzTnVsbCgpKQorICAgICAgICBvYmplY3RTdG9yZUluZm8tPmRlbGV0ZUluZGV4KGluZGV4 SWRlbnRpZmllcik7CisKKyAgICByZXR1cm4gZXJyb3I7CiB9CiAKIElEQkVycm9yIE1lbW9yeUlE QkJhY2tpbmdTdG9yZTo6cmVuYW1lSW5kZXgoY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVyJiB0 cmFuc2FjdGlvbklkZW50aWZpZXIsIHVpbnQ2NF90IG9iamVjdFN0b3JlSWRlbnRpZmllciwgdWlu dDY0X3QgaW5kZXhJZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIG5ld05hbWUsIGNvbnN0IExvY2tI b2xkZXImKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2Vy dmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZS5jcHAKaW5kZXggZmY4YWQ4YTgwNjAzNjEwOTAz Y2I4MWY0N2UyN2RmMDU2Nzk1MWViMi4uNmVkYjNiMzg3YTU3OWEwYzZlYjQyNzYxYzZjNGM3ZDk5 ZTE0ODEwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2Vy dmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2lu ZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2UuY3BwCkBAIC0xMTEyLDYgKzExMTIsMTEg QEAgdm9pZCBVbmlxdWVJREJEYXRhYmFzZTo6cGVyZm9ybVJlbmFtZUluZGV4KHVpbnQ2NF90IGNh bGxiYWNrSWRlbnRpZmllciwgY29uc3QgSUQKICAgICBBU1NFUlQoIWlzTWFpblRocmVhZCgpKTsK ICAgICBMT0coSW5kZXhlZERCLCAiKGRiKSBVbmlxdWVJREJEYXRhYmFzZTo6cGVyZm9ybVJlbmFt ZUluZGV4Iik7CiAKKyAgICBpZiAoIWVycm9yLmlzTnVsbCgpKSB7CisgICAgICAgIHBvc3REYXRh YmFzZVRhc2tSZXBseShjcmVhdGVDcm9zc1RocmVhZFRhc2soKnRoaXMsICZVbmlxdWVJREJEYXRh YmFzZTo6ZGlkUGVyZm9ybVJlbmFtZUluZGV4LCBjYWxsYmFja0lkZW50aWZpZXIsIGVycm9yLCBv YmplY3RTdG9yZUlkZW50aWZpZXIsIGluZGV4SWRlbnRpZmllciwgbmV3TmFtZSkpOworICAgICAg ICByZXR1cm47CisgICAgfQorCiAgICAgLy8gUXVvdGEgY2hlY2suCiAgICAgYXV0byB0YXNrU2l6 ZSA9IGRlZmF1bHRXcml0ZU9wZXJhdGlvbkNvc3QgKyBuZXdOYW1lLnNpemVJbkJ5dGVzKCk7CiAg ICAgaWYgKG1fc2VydmVyLT5yZXF1ZXN0U3BhY2UobV9vcmlnaW4sIHRhc2tTaXplKSA9PSBTdG9y YWdlUXVvdGFNYW5hZ2VyOjpEZWNpc2lvbjo6RGVueSkgewpAQCAtMTEyMCwxMiArMTEyNSwxMyBA QCB2b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjpwZXJmb3JtUmVuYW1lSW5kZXgodWludDY0X3QgY2Fs bGJhY2tJZGVudGlmaWVyLCBjb25zdCBJRAogICAgIH0KIAogICAgIEFTU0VSVChtX2JhY2tpbmdT dG9yZSk7CisgICAgSURCRXJyb3IgYmFja2luZ1N0b3JlRXJyb3I7CiAgICAgewogICAgICAgICBM b2NrSG9sZGVyIGxvY2tlcihtX2JhY2tpbmdTdG9yZUxvY2spOwotICAgICAgICBtX2JhY2tpbmdT dG9yZS0+cmVuYW1lSW5kZXgodHJhbnNhY3Rpb25JZGVudGlmaWVyLCBvYmplY3RTdG9yZUlkZW50 aWZpZXIsIGluZGV4SWRlbnRpZmllciwgbmV3TmFtZSwgbG9ja2VyKTsKKyAgICAgICAgYmFja2lu Z1N0b3JlRXJyb3IgPSBtX2JhY2tpbmdTdG9yZS0+cmVuYW1lSW5kZXgodHJhbnNhY3Rpb25JZGVu dGlmaWVyLCBvYmplY3RTdG9yZUlkZW50aWZpZXIsIGluZGV4SWRlbnRpZmllciwgbmV3TmFtZSwg bG9ja2VyKTsKICAgICB9CiAKLSAgICBwb3N0RGF0YWJhc2VUYXNrUmVwbHkoY3JlYXRlQ3Jvc3NU aHJlYWRUYXNrKCp0aGlzLCAmVW5pcXVlSURCRGF0YWJhc2U6OmRpZFBlcmZvcm1SZW5hbWVJbmRl eCwgY2FsbGJhY2tJZGVudGlmaWVyLCBlcnJvciwgb2JqZWN0U3RvcmVJZGVudGlmaWVyLCBpbmRl eElkZW50aWZpZXIsIG5ld05hbWUpKTsKKyAgICBwb3N0RGF0YWJhc2VUYXNrUmVwbHkoY3JlYXRl Q3Jvc3NUaHJlYWRUYXNrKCp0aGlzLCAmVW5pcXVlSURCRGF0YWJhc2U6OmRpZFBlcmZvcm1SZW5h bWVJbmRleCwgY2FsbGJhY2tJZGVudGlmaWVyLCBiYWNraW5nU3RvcmVFcnJvciwgb2JqZWN0U3Rv cmVJZGVudGlmaWVyLCBpbmRleElkZW50aWZpZXIsIG5ld05hbWUpKTsKIH0KIAogdm9pZCBVbmlx dWVJREJEYXRhYmFzZTo6ZGlkUGVyZm9ybVJlbmFtZUluZGV4KHVpbnQ2NF90IGNhbGxiYWNrSWRl bnRpZmllciwgY29uc3QgSURCRXJyb3ImIGVycm9yLCB1aW50NjRfdCBvYmplY3RTdG9yZUlkZW50 aWZpZXIsIHVpbnQ2NF90IGluZGV4SWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBuZXdOYW1lKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2hhcmVkL0lEQk9i amVjdFN0b3JlSW5mby5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zaGFy ZWQvSURCT2JqZWN0U3RvcmVJbmZvLmNwcAppbmRleCAyYTA1MWYzNjZmN2YxOWQ4ZDJhYThiYmMw ZDJmYjZmZTU3YmE0MjkzLi41YzcyODJhNDYzOGViNGU2NzFjNTNmMWM1ZmRjZjJhZjI3MmVhYzU1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zaGFyZWQvSURC T2JqZWN0U3RvcmVJbmZvLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRk Yi9zaGFyZWQvSURCT2JqZWN0U3RvcmVJbmZvLmNwcApAQCAtOTgsMTMgKzk4LDEwIEBAIElEQk9i amVjdFN0b3JlSW5mbyBJREJPYmplY3RTdG9yZUluZm86Omlzb2xhdGVkQ29weSgpIGNvbnN0CiB7 CiAgICAgSURCT2JqZWN0U3RvcmVJbmZvIHJlc3VsdCA9IHsgbV9pZGVudGlmaWVyLCBtX25hbWUu aXNvbGF0ZWRDb3B5KCksIFdlYkNvcmU6Omlzb2xhdGVkQ29weShtX2tleVBhdGgpLCBtX2F1dG9J bmNyZW1lbnQgfTsKIAotICAgIGZvciAoYXV0byYgaXRlcmF0b3IgOiBtX2luZGV4TWFwKSB7Cisg ICAgZm9yIChhdXRvJiBpdGVyYXRvciA6IG1faW5kZXhNYXApCiAgICAgICAgIHJlc3VsdC5tX2lu ZGV4TWFwLnNldChpdGVyYXRvci5rZXksIGl0ZXJhdG9yLnZhbHVlLmlzb2xhdGVkQ29weSgpKTsK LSAgICAgICAgaWYgKGl0ZXJhdG9yLmtleSA+IHJlc3VsdC5tX21heEluZGV4SUQpCi0gICAgICAg ICAgICByZXN1bHQubV9tYXhJbmRleElEID0gaXRlcmF0b3Iua2V5OwotICAgIH0KIAotICAgIEFT U0VSVChyZXN1bHQubV9tYXhJbmRleElEID09IG1fbWF4SW5kZXhJRCk7CisgICAgcmVzdWx0Lm1f bWF4SW5kZXhJRCA9IG1fbWF4SW5kZXhJRDsKIAogICAgIHJldHVybiByZXN1bHQ7CiB9Cg==