227115 2021-06-17 02:42:12 -0700 REGRESSION(r278978): The patch seems to be breaking the Debian and Ubuntu builds. 2021-06-17 02:50:29 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 204686 1 commit-queue commit-queue eocanha pnormand webkit-bug-importer oldest_to_newest 1770567 0 commit-queue 2021-06-17 02:42:12 -0700 https://trac.webkit.org/changeset/278978 broke the build: The patch seems to be breaking the Debian and Ubuntu builds. This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 1770569 1 431646 commit-queue 2021-06-17 02:42:20 -0700 Created attachment 431646 REVERT of r278978 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the revert will be successful. This process takes approximately 15 minutes. If you would like to land the revert faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 1770570 2 ews-feeder 2021-06-17 02:49:09 -0700 Committed r278979 (238905@main): <https://commits.webkit.org/238905@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 431646. 1770571 3 webkit-bug-importer 2021-06-17 02:50:29 -0700 <rdar://problem/79441395> 431646 2021-06-17 02:42:20 -0700 2021-06-17 02:49:10 -0700 REVERT of r278978 bug-227115-20210617094219.patch text/plain 15141 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4OTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzliYzRmY2IyNGU4ZmEy MmMzYjYxNTRjMTE1MDlhOWNlZmEyMjI3MC4uMjVmYTM1Nzk0ZGIwZWNhZDNhMWVjM2E5NDUxMjE4 YzUyYjNlYTU5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA2LTE3ICBDb21t aXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2Vk LCByZXZlcnRpbmcgcjI3ODk3OC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyNzExNQorCisgICAgICAgIFRoZSBwYXRjaCBzZWVtcyB0byBiZSBicmVh a2luZyB0aGUgRGViaWFuIGFuZCBVYnVudHUgYnVpbGRzLgorCisgICAgICAgIFJldmVydGVkIGNo YW5nZXNldDoKKworICAgICAgICAiW0dTdHJlYW1lcl0gUmVmYWN0b3IKKyAgICAgICAgTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpub3RpZnlQbGF5ZXJPZioiCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDQ2ODYKKyAgICAgICAgaHR0cHM6Ly90 cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzI3ODk3OAorCiAyMDIxLTA2LTE3ICBFbnJpcXVlIE9j YcOxYSBHb256w6FsZXogIDxlb2NhbmhhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dTdHJlYW1l cl0gUmVmYWN0b3IgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpub3RpZnlQbGF5ZXJPZioK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9J bmJhbmRUZXh0VHJhY2tQcml2YXRlR1N0cmVhbWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUdTdHJlYW1lci5oCmlu ZGV4IGYwNTM4MDYzYTFmMDdkMmQwNzliNmFjZmZlNGEyNzA4MTNjYTcwNjUuLjAyMzk4NWJmMzFm MDhiZGNjOTkxZDIwZjlhYmNhMmI3ZmEwNzNjMzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9JbmJhbmRUZXh0VHJhY2tQcml2YXRlR1N0cmVh bWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0lu YmFuZFRleHRUcmFja1ByaXZhdGVHU3RyZWFtZXIuaApAQCAtNDQsMTEgKzQ0LDYgQEAgcHVibGlj OgogICAgICAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBJbmJhbmRUZXh0VHJhY2tQcml2YXRlR1N0 cmVhbWVyKGluZGV4LCBwYWQpKTsKICAgICB9CiAKLSAgICBzdGF0aWMgUmVmPEluYmFuZFRleHRU cmFja1ByaXZhdGVHU3RyZWFtZXI+IGNyZWF0ZShXZWFrUHRyPE1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lcj4sIGdpbnQgaW5kZXgsIEdSZWZQdHI8R3N0UGFkPiBwYWQpCi0gICAgewotICAgICAg ICByZXR1cm4gY3JlYXRlKGluZGV4LCBwYWQpOwotICAgIH0KLQogICAgIHN0YXRpYyBSZWY8SW5i YW5kVGV4dFRyYWNrUHJpdmF0ZUdTdHJlYW1lcj4gY3JlYXRlKGdpbnQgaW5kZXgsIEdSZWZQdHI8 R3N0U3RyZWFtPiBzdHJlYW0pCiAgICAgewogICAgICAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBJ bmJhbmRUZXh0VHJhY2tQcml2YXRlR1N0cmVhbWVyKGluZGV4LCBzdHJlYW0pKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKaW5kZXggN2QyOTA2MDgy NDE4NTIzZmQwMGIwZGZmZWMyYzYwODFjZDdmMDc3Mi4uNjgwZWJjMjM5MTlmNDcyZjU3Y2M0ZDZi NjgzODk3NmZkNzYwMmEyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lci5jcHAKQEAgLTk2Miw1MSArOTYyLDMxIEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyOjpzeW5jT25DbG9jayhib29sIHN5bmMpCiAgICAgc2V0U3luY09uQ2xvY2so YXVkaW9TaW5rKCksIHN5bmMpOwogfQogCi10ZW1wbGF0ZSA8dHlwZW5hbWUgVHJhY2tQcml2YXRl VHlwZT4KLXZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpub3RpZnlQbGF5ZXJPZlRy YWNrKCkKK3ZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpub3RpZnlQbGF5ZXJPZlZp ZGVvKCkKIHsKICAgICBpZiAoVU5MSUtFTFkoIW1fcGlwZWxpbmUgfHwgIW1fc291cmNlKSkKICAg ICAgICAgcmV0dXJuOwogCiAgICAgQVNTRVJUKG1faXNMZWdhY3lQbGF5YmluIHx8IGlzTWVkaWFT b3VyY2UoKSk7Ci0gICAgQVNTRVJUKHR5cGVOYW1lKTsKLQotICAgIGVudW0gVHJhY2tUeXBlIHsg QXVkaW8gPSAwLCBWaWRlbyA9IDEsIFRleHQgPSAyIH07Ci0gICAgVmFyaWFudDxIYXNoTWFwPEF0 b21TdHJpbmcsIFJlZlB0cjxBdWRpb1RyYWNrUHJpdmF0ZUdTdHJlYW1lcj4+KiwgSGFzaE1hcDxB dG9tU3RyaW5nLCBSZWZQdHI8VmlkZW9UcmFja1ByaXZhdGVHU3RyZWFtZXI+PiosIEhhc2hNYXA8 QXRvbVN0cmluZywgUmVmUHRyPEluYmFuZFRleHRUcmFja1ByaXZhdGVHU3RyZWFtZXI+Pio+IHZh cmlhbnRUcmFja3MgPSBzdGF0aWNfY2FzdDxIYXNoTWFwPEF0b21TdHJpbmcsIFJlZlB0cjxUcmFj a1ByaXZhdGVUeXBlPj4qPigwKTsKLSAgICBhdXRvIHR5cGUoc3RhdGljX2Nhc3Q8VHJhY2tUeXBl Pih2YXJpYW50VHJhY2tzLmluZGV4KCkpKTsKLSAgICBhdXRvIHR5cGVOYW1lID0gKGNvbnN0IGNo YXIqW10pIHsgImF1ZGlvIiwgInZpZGVvIiwgInRleHQiIH1bdHlwZV07Ci0gICAgYXV0byogaGFz VHlwZSA9IChib29sKltdKSB7ICZtX2hhc0F1ZGlvLCAmbV9oYXNWaWRlbywgbnVsbHB0ciB9W3R5 cGVdOwotICAgIHN3aXRjaCAodHlwZSkgewotICAgIGNhc2UgQXVkaW86IHZhcmlhbnRUcmFja3Mg PSAmbV9hdWRpb1RyYWNrczsgYnJlYWs7Ci0gICAgY2FzZSBWaWRlbzogdmFyaWFudFRyYWNrcyA9 ICZtX3ZpZGVvVHJhY2tzOyBicmVhazsKLSAgICBjYXNlIFRleHQ6IHZhcmlhbnRUcmFja3MgPSAm bV90ZXh0VHJhY2tzOyBicmVhazsKLSAgICB9Ci0gICAgSGFzaE1hcDxBdG9tU3RyaW5nLCBSZWZQ dHI8VHJhY2tQcml2YXRlVHlwZT4+JiB0cmFja3MgPSAqZ2V0PEhhc2hNYXA8QXRvbVN0cmluZywg UmVmUHRyPFRyYWNrUHJpdmF0ZVR5cGU+Pio+KHZhcmlhbnRUcmFja3MpOwogCiAgICAgLy8gSWdu b3JlIG5vdGlmaWNhdGlvbnMgYWZ0ZXIgYSBFT1MuIFdlIGRvbid0IHdhbnQgdGhlIHRyYWNrcyB0 byBkaXNhcHBlYXIgd2hlbiB0aGUgdmlkZW8gaXMgZmluaXNoZWQuCi0gICAgaWYgKG1faXNFbmRS ZWFjaGVkICYmICh0eXBlID09IEF1ZGlvIHx8IHR5cGUgPT0gVmlkZW8pKQorICAgIGlmIChtX2lz RW5kUmVhY2hlZCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgdW5zaWduZWQgbnVtYmVyT2ZUcmFj a3MgPSAwOworICAgIHVuc2lnbmVkIG51bVRyYWNrcyA9IDA7CiAgICAgYm9vbCB1c2VNZWRpYVNv dXJjZSA9IGlzTWVkaWFTb3VyY2UoKTsKLQotICAgIFN0cmluZ1ByaW50U3RyZWFtIG51bWJlck9m VHJhY2tzUHJvcGVydHk7Ci0gICAgbnVtYmVyT2ZUcmFja3NQcm9wZXJ0eS5wcmludGYoIm4tJXMi LCB0eXBlTmFtZSk7Ci0KICAgICBHc3RFbGVtZW50KiBlbGVtZW50ID0gdXNlTWVkaWFTb3VyY2Ug PyBtX3NvdXJjZS5nZXQoKSA6IG1fcGlwZWxpbmUuZ2V0KCk7Ci0gICAgZ19vYmplY3RfZ2V0KGVs ZW1lbnQsIG51bWJlck9mVHJhY2tzUHJvcGVydHkudG9DU3RyaW5nKCkuZGF0YSgpLCAmbnVtYmVy T2ZUcmFja3MsIG51bGxwdHIpOworICAgIGdfb2JqZWN0X2dldChlbGVtZW50LCAibi12aWRlbyIs ICZudW1UcmFja3MsIG51bGxwdHIpOwogCi0gICAgR1NUX0lORk9fT0JKRUNUKHBpcGVsaW5lKCks ICJNZWRpYSBoYXMgJWQgJXMgdHJhY2tzIiwgbnVtYmVyT2ZUcmFja3MsIHR5cGVOYW1lKTsKKyAg ICBHU1RfSU5GT19PQkpFQ1QocGlwZWxpbmUoKSwgIk1lZGlhIGhhcyAlZCB2aWRlbyB0cmFja3Mi LCBudW1UcmFja3MpOwogCi0gICAgaWYgKGhhc1R5cGUpIHsKLSAgICAgICAgYm9vbCBvbGRIYXNU eXBlID0gKmhhc1R5cGU7Ci0gICAgICAgICpoYXNUeXBlID0gbnVtYmVyT2ZUcmFja3MgPiAwOwot ICAgICAgICBpZiAob2xkSGFzVHlwZSAhPSAqaGFzVHlwZSkKLSAgICAgICAgICAgIG1fcGxheWVy LT5jaGFyYWN0ZXJpc3RpY0NoYW5nZWQoKTsKKyAgICBib29sIG9sZEhhc1ZpZGVvID0gbV9oYXNW aWRlbzsKKyAgICBtX2hhc1ZpZGVvID0gbnVtVHJhY2tzID4gMDsKKyAgICBpZiAob2xkSGFzVmlk ZW8gIT0gbV9oYXNWaWRlbykKKyAgICAgICAgbV9wbGF5ZXItPmNoYXJhY3RlcmlzdGljQ2hhbmdl ZCgpOwogCi0gICAgICAgIGlmICgqaGFzVHlwZSAmJiB0eXBlID09IFZpZGVvKQotICAgICAgICAg ICAgbV9wbGF5ZXItPnNpemVDaGFuZ2VkKCk7Ci0gICAgfQorICAgIGlmIChtX2hhc1ZpZGVvKQor ICAgICAgICBtX3BsYXllci0+c2l6ZUNoYW5nZWQoKTsKIAogICAgIGlmICh1c2VNZWRpYVNvdXJj ZSkgewogICAgICAgICBHU1RfREVCVUdfT0JKRUNUKHBpcGVsaW5lKCksICJUcmFja3MgbWFuYWdl ZCBieSBzb3VyY2UgZWxlbWVudC4gQmFpbGluZyBvdXQgbm93LiIpOwpAQCAtMTAxNCwyMCArOTk0 LDE2IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpub3RpZnlQbGF5ZXJPZlRy YWNrKCkKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIFZlY3RvcjxTdHJpbmc+IHZhbGlk U3RyZWFtczsKLSAgICBTdHJpbmdQcmludFN0cmVhbSBnZXRQYWRQcm9wZXJ0eTsKLSAgICBnZXRQ YWRQcm9wZXJ0eS5wcmludGYoImdldC0lcy1wYWQiLCB0eXBlTmFtZSk7Ci0KLSAgICBmb3IgKHVu c2lnbmVkIGkgPSAwOyBpIDwgbnVtYmVyT2ZUcmFja3M7ICsraSkgeworICAgIFZlY3RvcjxTdHJp bmc+IHZhbGlkVmlkZW9TdHJlYW1zOworICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBudW1U cmFja3M7ICsraSkgewogICAgICAgICBHUmVmUHRyPEdzdFBhZD4gcGFkOwotICAgICAgICBnX3Np Z25hbF9lbWl0X2J5X25hbWUobV9waXBlbGluZS5nZXQoKSwgZ2V0UGFkUHJvcGVydHkudG9DU3Ry aW5nKCkuZGF0YSgpLCBpLCAmcGFkLm91dFB0cigpLCBudWxscHRyKTsKKyAgICAgICAgZ19zaWdu YWxfZW1pdF9ieV9uYW1lKG1fcGlwZWxpbmUuZ2V0KCksICJnZXQtdmlkZW8tcGFkIiwgaSwgJnBh ZC5vdXRQdHIoKSwgbnVsbHB0cik7CiAgICAgICAgIEFTU0VSVChwYWQpOwogCi0gICAgICAgIFN0 cmluZyBzdHJlYW1JZCA9IFN0cmluZyh0eXBlTmFtZSkuc3Vic3RyaW5nKDAsIDEpLmNvbnZlcnRU b0FTQ0lJVXBwZXJjYXNlKCkgKyBTdHJpbmc6Om51bWJlcihpKTsKLSAgICAgICAgdmFsaWRTdHJl YW1zLmFwcGVuZChzdHJlYW1JZCk7Ci0KLSAgICAgICAgaWYgKGkgPCB0cmFja3Muc2l6ZSgpKSB7 Ci0gICAgICAgICAgICBSZWZQdHI8VHJhY2tQcml2YXRlVHlwZT4gZXhpc3RpbmdUcmFjayA9IHRy YWNrcy5nZXQoc3RyZWFtSWQpOworICAgICAgICBTdHJpbmcgc3RyZWFtSWQgPSAiViIgKyBTdHJp bmc6Om51bWJlcihpKTsKKyAgICAgICAgdmFsaWRWaWRlb1N0cmVhbXMuYXBwZW5kKHN0cmVhbUlk KTsKKyAgICAgICAgaWYgKGkgPCBtX3ZpZGVvVHJhY2tzLnNpemUoKSkgeworICAgICAgICAgICAg UmVmUHRyPFZpZGVvVHJhY2tQcml2YXRlR1N0cmVhbWVyPiBleGlzdGluZ1RyYWNrID0gbV92aWRl b1RyYWNrcy5nZXQoc3RyZWFtSWQpOwogICAgICAgICAgICAgaWYgKGV4aXN0aW5nVHJhY2spIHsK ICAgICAgICAgICAgICAgICBleGlzdGluZ1RyYWNrLT5zZXRJbmRleChpKTsKICAgICAgICAgICAg ICAgICAvLyBJZiB0aGUgdmlkZW8gaGFzIGJlZW4gcGxheWVkIHR3aWNlLCB0aGUgdHJhY2sgaXMg c3RpbGwgdGhlcmUsIGJ1dCB3ZSBuZWVkCkBAIC0xMDM4LDI4ICsxMDE0LDE4IEBAIHZvaWQgTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpub3RpZnlQbGF5ZXJPZlRyYWNrKCkKICAgICAgICAg ICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIGF1dG8gdHJhY2sgPSBUcmFja1ByaXZhdGVUeXBl OjpjcmVhdGUobWFrZVdlYWtQdHIoKnRoaXMpLCBpLCBwYWQpOwotICAgICAgICBpZiAoIXRyYWNr LT50cmFja0luZGV4KCkgJiYgKHR5cGUgPT0gQXVkaW8gfHwgdHlwZSA9PSBWaWRlbykpCisgICAg ICAgIGF1dG8gdHJhY2sgPSBWaWRlb1RyYWNrUHJpdmF0ZUdTdHJlYW1lcjo6Y3JlYXRlKG1ha2VX ZWFrUHRyKCp0aGlzKSwgaSwgcGFkKTsKKyAgICAgICAgaWYgKCF0cmFjay0+dHJhY2tJbmRleCgp KQogICAgICAgICAgICAgdHJhY2stPnNldEFjdGl2ZSh0cnVlKTsKICAgICAgICAgQVNTRVJUKHN0 cmVhbUlkID09IHRyYWNrLT5pZCgpKTsKLSAgICAgICAgdHJhY2tzLmFkZChzdHJlYW1JZCwgdHJh Y2suY29weVJlZigpKTsKLQotICAgICAgICBWYXJpYW50PEF1ZGlvVHJhY2tQcml2YXRlJiwgVmlk ZW9UcmFja1ByaXZhdGUmLCBJbmJhbmRUZXh0VHJhY2tQcml2YXRlJj4gdmFyaWFudFRyYWNrKHRy YWNrLmdldCgpKTsKLSAgICAgICAgc3dpdGNoICh2YXJpYW50VHJhY2suaW5kZXgoKSkgewotICAg ICAgICBjYXNlIEF1ZGlvOiBtX3BsYXllci0+YWRkQXVkaW9UcmFjayhnZXQ8QXVkaW9UcmFja1By aXZhdGUmPih2YXJpYW50VHJhY2spKTsgYnJlYWs7Ci0gICAgICAgIGNhc2UgVmlkZW86IG1fcGxh eWVyLT5hZGRWaWRlb1RyYWNrKGdldDxWaWRlb1RyYWNrUHJpdmF0ZSY+KHZhcmlhbnRUcmFjaykp OyBicmVhazsKLSAgICAgICAgY2FzZSBUZXh0OiBtX3BsYXllci0+YWRkVGV4dFRyYWNrKGdldDxJ bmJhbmRUZXh0VHJhY2tQcml2YXRlJj4odmFyaWFudFRyYWNrKSk7IGJyZWFrOwotICAgICAgICB9 CisgICAgICAgIG1fdmlkZW9UcmFja3MuYWRkKHN0cmVhbUlkLCB0cmFjay5jb3B5UmVmKCkpOwor ICAgICAgICBtX3BsYXllci0+YWRkVmlkZW9UcmFjayh0cmFjay5nZXQoKSk7CiAgICAgfQogCi0g ICAgLy8gUHVyZ2UgaW52YWxpZCB0cmFja3MKLSAgICB0cmFja3MucmVtb3ZlSWYoW3ZhbGlkU3Ry ZWFtc10oYXV0byYga2V5QW5kVmFsdWUpIHsKLSAgICAgICAgcmV0dXJuICF2YWxpZFN0cmVhbXMu Y29udGFpbnMoa2V5QW5kVmFsdWUua2V5KTsKLSAgICB9KTsKKyAgICBwdXJnZUludmFsaWRWaWRl b1RyYWNrcyh2YWxpZFZpZGVvU3RyZWFtcyk7CiAKICAgICBtX3BsYXllci0+bWVkaWFFbmdpbmVV cGRhdGVkKCk7CiB9Ci0KIGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpoYXNGaXJz dFZpZGVvU2FtcGxlUmVhY2hlZFNpbmsoKSBjb25zdAogewogICAgIExvY2tlciBzYW1wbGVMb2Nr ZXIgeyBtX3NhbXBsZU11dGV4IH07CkBAIC0xMDk0LDE3ICsxMDYwLDEyNyBAQCB2b2lkIE1lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dmlkZW9TaW5rQ2Fwc0NoYW5nZWQoR3N0UGFkKiB2aWRl b1NpbmtQYWQpCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6YXVkaW9DaGFuZ2Vk Q2FsbGJhY2soTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyKiBwbGF5ZXIpCiB7CiAgICAgcGxh eWVyLT5tX25vdGlmaWVyLT5ub3RpZnkoTWFpblRocmVhZE5vdGlmaWNhdGlvbjo6QXVkaW9DaGFu Z2VkLCBbcGxheWVyXSB7Ci0gICAgICAgIHBsYXllci0+bm90aWZ5UGxheWVyT2ZUcmFjazxBdWRp b1RyYWNrUHJpdmF0ZUdTdHJlYW1lcj4oKTsKKyAgICAgICAgcGxheWVyLT5ub3RpZnlQbGF5ZXJP ZkF1ZGlvKCk7CiAgICAgfSk7CiB9CiAKK3ZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy Ojpub3RpZnlQbGF5ZXJPZkF1ZGlvKCkKK3sKKyAgICBpZiAoVU5MSUtFTFkoIW1fcGlwZWxpbmUg fHwgIW1fc291cmNlKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgQVNTRVJUKG1faXNMZWdhY3lQ bGF5YmluIHx8IGlzTWVkaWFTb3VyY2UoKSk7CisKKyAgICAvLyBJZ25vcmUgbm90aWZpY2F0aW9u cyBhZnRlciBhIEVPUy4gV2UgZG9uJ3Qgd2FudCB0aGUgdHJhY2tzIHRvIGRpc2FwcGVhciB3aGVu IHRoZSB2aWRlbyBpcyBmaW5pc2hlZC4KKyAgICBpZiAobV9pc0VuZFJlYWNoZWQpCisgICAgICAg IHJldHVybjsKKworICAgIHVuc2lnbmVkIG51bVRyYWNrcyA9IDA7CisgICAgYm9vbCB1c2VNZWRp YVNvdXJjZSA9IGlzTWVkaWFTb3VyY2UoKTsKKyAgICBHc3RFbGVtZW50KiBlbGVtZW50ID0gdXNl TWVkaWFTb3VyY2UgPyBtX3NvdXJjZS5nZXQoKSA6IG1fcGlwZWxpbmUuZ2V0KCk7CisgICAgZ19v YmplY3RfZ2V0KGVsZW1lbnQsICJuLWF1ZGlvIiwgJm51bVRyYWNrcywgbnVsbHB0cik7CisKKyAg ICBHU1RfSU5GT19PQkpFQ1QocGlwZWxpbmUoKSwgIk1lZGlhIGhhcyAlZCBhdWRpbyB0cmFja3Mi LCBudW1UcmFja3MpOworICAgIGJvb2wgb2xkSGFzQXVkaW8gPSBtX2hhc0F1ZGlvOworICAgIG1f aGFzQXVkaW8gPSBudW1UcmFja3MgPiAwOworICAgIGlmIChvbGRIYXNBdWRpbyAhPSBtX2hhc0F1 ZGlvKQorICAgICAgICBtX3BsYXllci0+Y2hhcmFjdGVyaXN0aWNDaGFuZ2VkKCk7CisKKyAgICBp ZiAodXNlTWVkaWFTb3VyY2UpIHsKKyAgICAgICAgR1NUX0RFQlVHX09CSkVDVChwaXBlbGluZSgp LCAiVHJhY2tzIG1hbmFnZWQgYnkgc291cmNlIGVsZW1lbnQuIEJhaWxpbmcgb3V0IG5vdy4iKTsK KyAgICAgICAgbV9wbGF5ZXItPm1lZGlhRW5naW5lVXBkYXRlZCgpOworICAgICAgICByZXR1cm47 CisgICAgfQorCisgICAgVmVjdG9yPFN0cmluZz4gdmFsaWRBdWRpb1N0cmVhbXM7CisgICAgZm9y ICh1bnNpZ25lZCBpID0gMDsgaSA8IG51bVRyYWNrczsgKytpKSB7CisgICAgICAgIEdSZWZQdHI8 R3N0UGFkPiBwYWQ7CisgICAgICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShtX3BpcGVsaW5lLmdl dCgpLCAiZ2V0LWF1ZGlvLXBhZCIsIGksICZwYWQub3V0UHRyKCksIG51bGxwdHIpOworICAgICAg ICBBU1NFUlQocGFkKTsKKworICAgICAgICBTdHJpbmcgc3RyZWFtSWQgPSAiQSIgKyBTdHJpbmc6 Om51bWJlcihpKTsKKyAgICAgICAgdmFsaWRBdWRpb1N0cmVhbXMuYXBwZW5kKHN0cmVhbUlkKTsK KyAgICAgICAgaWYgKGkgPCBtX2F1ZGlvVHJhY2tzLnNpemUoKSkgeworICAgICAgICAgICAgUmVm UHRyPEF1ZGlvVHJhY2tQcml2YXRlR1N0cmVhbWVyPiBleGlzdGluZ1RyYWNrID0gbV9hdWRpb1Ry YWNrcy5nZXQoc3RyZWFtSWQpOworICAgICAgICAgICAgaWYgKGV4aXN0aW5nVHJhY2spIHsKKyAg ICAgICAgICAgICAgICBleGlzdGluZ1RyYWNrLT5zZXRJbmRleChpKTsKKyAgICAgICAgICAgICAg ICAvLyBJZiB0aGUgdmlkZW8gaGFzIGJlZW4gcGxheWVkIHR3aWNlLCB0aGUgdHJhY2sgaXMgc3Rp bGwgdGhlcmUsIGJ1dCB3ZSBuZWVkCisgICAgICAgICAgICAgICAgLy8gdG8gdXBkYXRlIHRoZSBw YWQgcG9pbnRlci4KKyAgICAgICAgICAgICAgICBpZiAoZXhpc3RpbmdUcmFjay0+cGFkKCkgIT0g cGFkKQorICAgICAgICAgICAgICAgICAgICBleGlzdGluZ1RyYWNrLT5zZXRQYWQoR1JlZlB0cihw YWQpKTsKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg fQorCisgICAgICAgIGF1dG8gdHJhY2sgPSBBdWRpb1RyYWNrUHJpdmF0ZUdTdHJlYW1lcjo6Y3Jl YXRlKG1ha2VXZWFrUHRyKCp0aGlzKSwgaSwgcGFkKTsKKyAgICAgICAgaWYgKCF0cmFjay0+dHJh Y2tJbmRleCgpKQorICAgICAgICAgICAgdHJhY2stPnNldEFjdGl2ZSh0cnVlKTsKKyAgICAgICAg QVNTRVJUKHN0cmVhbUlkID09IHRyYWNrLT5pZCgpKTsKKyAgICAgICAgbV9hdWRpb1RyYWNrcy5h ZGQoc3RyZWFtSWQsIHRyYWNrLmNvcHlSZWYoKSk7CisgICAgICAgIG1fcGxheWVyLT5hZGRBdWRp b1RyYWNrKHRyYWNrLmdldCgpKTsKKyAgICB9CisKKyAgICBwdXJnZUludmFsaWRBdWRpb1RyYWNr cyh2YWxpZEF1ZGlvU3RyZWFtcyk7CisKKyAgICBtX3BsYXllci0+bWVkaWFFbmdpbmVVcGRhdGVk KCk7Cit9CisKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp0ZXh0Q2hhbmdlZENh bGxiYWNrKE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lciogcGxheWVyKQogewogICAgIHBsYXll ci0+bV9ub3RpZmllci0+bm90aWZ5KE1haW5UaHJlYWROb3RpZmljYXRpb246OlRleHRDaGFuZ2Vk LCBbcGxheWVyXSB7Ci0gICAgICAgIHBsYXllci0+bm90aWZ5UGxheWVyT2ZUcmFjazxJbmJhbmRU ZXh0VHJhY2tQcml2YXRlR1N0cmVhbWVyPigpOworICAgICAgICBwbGF5ZXItPm5vdGlmeVBsYXll ck9mVGV4dCgpOwogICAgIH0pOwogfQogCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l cjo6bm90aWZ5UGxheWVyT2ZUZXh0KCkKK3sKKyAgICBpZiAoVU5MSUtFTFkoIW1fcGlwZWxpbmUg fHwgIW1fc291cmNlKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgQVNTRVJUKG1faXNMZWdhY3lQ bGF5YmluIHx8IGlzTWVkaWFTb3VyY2UoKSk7CisKKyAgICB1bnNpZ25lZCBudW1UcmFja3MgPSAw OworICAgIGJvb2wgdXNlTWVkaWFTb3VyY2UgPSBpc01lZGlhU291cmNlKCk7CisgICAgR3N0RWxl bWVudCogZWxlbWVudCA9IHVzZU1lZGlhU291cmNlID8gbV9zb3VyY2UuZ2V0KCkgOiBtX3BpcGVs aW5lLmdldCgpOworICAgIGdfb2JqZWN0X2dldChlbGVtZW50LCAibi10ZXh0IiwgJm51bVRyYWNr cywgbnVsbHB0cik7CisKKyAgICBHU1RfSU5GT19PQkpFQ1QocGlwZWxpbmUoKSwgIk1lZGlhIGhh cyAlZCB0ZXh0IHRyYWNrcyIsIG51bVRyYWNrcyk7CisKKyAgICBpZiAodXNlTWVkaWFTb3VyY2Up IHsKKyAgICAgICAgR1NUX0RFQlVHX09CSkVDVChwaXBlbGluZSgpLCAiVHJhY2tzIG1hbmFnZWQg Ynkgc291cmNlIGVsZW1lbnQuIEJhaWxpbmcgb3V0IG5vdy4iKTsKKyAgICAgICAgcmV0dXJuOwor ICAgIH0KKworICAgIFZlY3RvcjxTdHJpbmc+IHZhbGlkVGV4dFN0cmVhbXM7CisgICAgZm9yICh1 bnNpZ25lZCBpID0gMDsgaSA8IG51bVRyYWNrczsgKytpKSB7CisgICAgICAgIEdSZWZQdHI8R3N0 UGFkPiBwYWQ7CisgICAgICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShtX3BpcGVsaW5lLmdldCgp LCAiZ2V0LXRleHQtcGFkIiwgaSwgJnBhZC5vdXRQdHIoKSwgbnVsbHB0cik7CisgICAgICAgIEFT U0VSVChwYWQpOworCisgICAgICAgIC8vIFdlIGNhbid0IGFzc3VtZSB0aGUgcGFkIGhhcyBhIHN0 aWNreSBldmVudCBoZXJlIGxpa2UgaW1wbGVtZW50ZWQgaW4KKyAgICAgICAgLy8gSW5iYW5kVGV4 dFRyYWNrUHJpdmF0ZUdTdHJlYW1lciBiZWNhdXNlIGl0IG1pZ2h0IGJlIGVtaXR0ZWQgYWZ0ZXIg dGhlCisgICAgICAgIC8vIHRyYWNrIHdhcyBjcmVhdGVkLiBTbyBmYWxsYmFjayB0byBhIGR1bW15 IHN0cmVhbSBJRCBsaWtlIGluIHRoZSBBdWRpbworICAgICAgICAvLyBhbmQgVmlkZW8gdHJhY2tz LgorICAgICAgICBTdHJpbmcgc3RyZWFtSWQgPSAiVCIgKyBTdHJpbmc6Om51bWJlcihpKTsKKwor ICAgICAgICB2YWxpZFRleHRTdHJlYW1zLmFwcGVuZChzdHJlYW1JZCk7CisgICAgICAgIGlmIChp IDwgbV90ZXh0VHJhY2tzLnNpemUoKSkgeworICAgICAgICAgICAgUmVmUHRyPEluYmFuZFRleHRU cmFja1ByaXZhdGVHU3RyZWFtZXI+IGV4aXN0aW5nVHJhY2sgPSBtX3RleHRUcmFja3MuZ2V0KHN0 cmVhbUlkKTsKKyAgICAgICAgICAgIGlmIChleGlzdGluZ1RyYWNrKSB7CisgICAgICAgICAgICAg ICAgZXhpc3RpbmdUcmFjay0+c2V0SW5kZXgoaSk7CisgICAgICAgICAgICAgICAgaWYgKGV4aXN0 aW5nVHJhY2stPnBhZCgpID09IHBhZCkKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7Cisg ICAgICAgICAgICB9CisgICAgICAgIH0KKworICAgICAgICBhdXRvIHRyYWNrID0gSW5iYW5kVGV4 dFRyYWNrUHJpdmF0ZUdTdHJlYW1lcjo6Y3JlYXRlKGksIHBhZCk7CisgICAgICAgIG1fdGV4dFRy YWNrcy5hZGQoc3RyZWFtSWQsIHRyYWNrLmNvcHlSZWYoKSk7CisgICAgICAgIG1fcGxheWVyLT5h ZGRUZXh0VHJhY2sodHJhY2suZ2V0KCkpOworICAgIH0KKworICAgIHB1cmdlSW52YWxpZFRleHRU cmFja3ModmFsaWRUZXh0U3RyZWFtcyk7Cit9CisKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyOjpoYW5kbGVUZXh0U2FtcGxlKEdzdFNhbXBsZSogc2FtcGxlLCBjb25zdCBjaGFyKiBz dHJlYW1JZCkKIHsKICAgICBmb3IgKGF1dG8mIHRyYWNrIDogbV90ZXh0VHJhY2tzLnZhbHVlcygp KSB7CkBAIC0xNDYyLDcgKzE1MzgsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l cjo6dXBkYXRlVHJhY2tzKGNvbnN0IEdSZWZQdHI8R3N0U3RyZWFtQ29sbGVjdGlvbgogdm9pZCBN ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnZpZGVvQ2hhbmdlZENhbGxiYWNrKE1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lciogcGxheWVyKQogewogICAgIHBsYXllci0+bV9ub3RpZmllci0+ bm90aWZ5KE1haW5UaHJlYWROb3RpZmljYXRpb246OlZpZGVvQ2hhbmdlZCwgW3BsYXllcl0gewot ICAgICAgICBwbGF5ZXItPm5vdGlmeVBsYXllck9mVHJhY2s8VmlkZW9UcmFja1ByaXZhdGVHU3Ry ZWFtZXI+KCk7CisgICAgICAgIHBsYXllci0+bm90aWZ5UGxheWVyT2ZWaWRlbygpOwogICAgIH0p OwogfQogCkBAIC0yMDc3LDYgKzIxNTMsMjcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXI6OnByb2Nlc3NUYWJsZU9mQ29udGVudHNFbnRyeShHc3RUb2NFbnRyeSogZW50cnkKICAg ICAgICAgcHJvY2Vzc1RhYmxlT2ZDb250ZW50c0VudHJ5KHN0YXRpY19jYXN0PEdzdFRvY0VudHJ5 Kj4oaS0+ZGF0YSkpOwogfQogCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6cHVy Z2VJbnZhbGlkQXVkaW9UcmFja3MoVmVjdG9yPFN0cmluZz4gdmFsaWRUcmFja0lkcykKK3sKKyAg ICBtX2F1ZGlvVHJhY2tzLnJlbW92ZUlmKFt2YWxpZFRyYWNrSWRzXShhdXRvJiBrZXlBbmRWYWx1 ZSkgeworICAgICAgICByZXR1cm4gIXZhbGlkVHJhY2tJZHMuY29udGFpbnMoa2V5QW5kVmFsdWUu a2V5KTsKKyAgICB9KTsKK30KKwordm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnB1 cmdlSW52YWxpZFZpZGVvVHJhY2tzKFZlY3RvcjxTdHJpbmc+IHZhbGlkVHJhY2tJZHMpCit7Cisg ICAgbV92aWRlb1RyYWNrcy5yZW1vdmVJZihbdmFsaWRUcmFja0lkc10oYXV0byYga2V5QW5kVmFs dWUpIHsKKyAgICAgICAgcmV0dXJuICF2YWxpZFRyYWNrSWRzLmNvbnRhaW5zKGtleUFuZFZhbHVl LmtleSk7CisgICAgfSk7Cit9CisKK3ZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpw dXJnZUludmFsaWRUZXh0VHJhY2tzKFZlY3RvcjxTdHJpbmc+IHZhbGlkVHJhY2tJZHMpCit7Cisg ICAgbV90ZXh0VHJhY2tzLnJlbW92ZUlmKFt2YWxpZFRyYWNrSWRzXShhdXRvJiBrZXlBbmRWYWx1 ZSkgeworICAgICAgICByZXR1cm4gIXZhbGlkVHJhY2tJZHMuY29udGFpbnMoa2V5QW5kVmFsdWUu a2V5KTsKKyAgICB9KTsKK30KKwogdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnVy aURlY29kZUJpbkVsZW1lbnRBZGRlZENhbGxiYWNrKEdzdEJpbiogYmluLCBHc3RFbGVtZW50KiBl bGVtZW50LCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIqIHBsYXllcikKIHsKICAgICBpZiAo Z19zdHJjbXAwKEdfT0JKRUNUX1RZUEVfTkFNRShlbGVtZW50KSwgIkdzdERvd25sb2FkQnVmZmVy IikpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmgKaW5kZXgg MDg0Nzk4NmQ4MDhhNWQ2NjYwMDI5ZTliMDlmNmFmY2NhOWZkOTcwOS4uNjRjMTI0ODUwZWNlMjMy ZWZlMTdhZDdjMDUzZmFmMDk3NDE2NjkxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXIuaApAQCAtMjk4LDcgKzI5OCw5IEBAIHByb3RlY3RlZDoKIAogICAg IHZvaWQgcmVhZHlUaW1lckZpcmVkKCk7CiAKLSAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVHJhY2tQ cml2YXRlVHlwZT4gdm9pZCBub3RpZnlQbGF5ZXJPZlRyYWNrKCk7CisgICAgdm9pZCBub3RpZnlQ bGF5ZXJPZlZpZGVvKCk7CisgICAgdm9pZCBub3RpZnlQbGF5ZXJPZkF1ZGlvKCk7CisgICAgdm9p ZCBub3RpZnlQbGF5ZXJPZlRleHQoKTsKIAogICAgIHZvaWQgZW5zdXJlQXVkaW9Tb3VyY2VQcm92 aWRlcigpOwogICAgIHZvaWQgc2V0QXVkaW9TdHJlYW1Qcm9wZXJ0aWVzKEdPYmplY3QqKTsKQEAg LTQ1Nyw2ICs0NTksMTAgQEAgcHJpdmF0ZToKICAgICB2b2lkIHByb2Nlc3NUYWJsZU9mQ29udGVu dHMoR3N0TWVzc2FnZSopOwogICAgIHZvaWQgcHJvY2Vzc1RhYmxlT2ZDb250ZW50c0VudHJ5KEdz dFRvY0VudHJ5Kik7CiAKKyAgICB2b2lkIHB1cmdlSW52YWxpZEF1ZGlvVHJhY2tzKFZlY3RvcjxT dHJpbmc+IHZhbGlkVHJhY2tJZHMpOworICAgIHZvaWQgcHVyZ2VJbnZhbGlkVmlkZW9UcmFja3Mo VmVjdG9yPFN0cmluZz4gdmFsaWRUcmFja0lkcyk7CisgICAgdm9pZCBwdXJnZUludmFsaWRUZXh0 VHJhY2tzKFZlY3RvcjxTdHJpbmc+IHZhbGlkVHJhY2tJZHMpOworCiAgICAgU3RyaW5nIGVuZ2lu ZURlc2NyaXB0aW9uKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gIkdTdHJlYW1lciI7IH0KICAg ICBib29sIGRpZFBhc3NDT1JTQWNjZXNzQ2hlY2soKSBjb25zdCBvdmVycmlkZTsKICAgICBib29s IGNhblNhdmVNZWRpYURhdGEoKSBjb25zdCBvdmVycmlkZTsK