232948 2021-11-10 09:38:49 -0800 Infinite recursion under InjectedBundlePage::exitFullScreenForElement() 2021-11-11 11:07:19 -0800 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble eric.carlson webkit-bug-importer oldest_to_newest 1813652 0 jer.noble 2021-11-10 09:38:49 -0800 Infinite recursion under InjectedBundlePage::exitFullScreenForElement() 1813660 1 jer.noble 2021-11-10 09:51:31 -0800 <rdar://80588375> 1813661 2 443824 jer.noble 2021-11-10 09:52:03 -0800 Created attachment 443824 Patch 1813708 3 443824 eric.carlson 2021-11-10 11:05:05 -0800 Comment on attachment 443824 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=443824&action=review > Tools/ChangeLog:12 > + () or WKBundlePageWillDidFullScreen(), this call will recurse into Nit: "()" should be on the previous line 1813807 4 443868 jer.noble 2021-11-10 14:55:53 -0800 Created attachment 443868 Patch for landing 1814124 5 ews-feeder 2021-11-11 11:07:18 -0800 Committed r285643 (244144@main): <https://commits.webkit.org/244144@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 443868. 443824 2021-11-10 09:52:03 -0800 2021-11-10 14:55:51 -0800 Patch bug-232948-20211110095202.patch text/plain 7063 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MjM4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggY2YzYjRjNzJjMjMyODRhMDUxMjc2MGQ5NWRiMzdhNWFj YmY1ZjBjMC4uNWE0MThhMDlkYTY1Yzc2NDAzYTNhMTIyYTg3NWU2ZTE4OWE0YzIzYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMx IEBACisyMDIxLTExLTEwICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAg ICAgIEluZmluaXRlIHJlY3Vyc2lvbiB1bmRlciBJbmplY3RlZEJ1bmRsZVBhZ2U6OmV4aXRGdWxs U2NyZWVuRm9yRWxlbWVudCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMzI5NDgKKyAgICAgICAgPHJkYXI6Ly84MDU4ODM3NT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIFdlYkNvcmUgaW5kaWNh dGVzIGFuIGVycm9yIGluIGV4aXRpbmcgZnVsbHNjcmVlbiwgV2ViS2l0IHdpbGwgcmVzcG9uZCBi eSBhdHRlbXB0aW5nIHRvCisgICAgICAgIGNsb3NlIGFueSBvdXRzdGFuZGluZyBmdWxsc2NyZWVu IHNlc3Npb25zIGJ5IGNhbGxpbmcgV2ViRnVsbFNjcmVlbk1hbmFnZXI6OmNsb3NlKCkuIElmIHRo aXMKKyAgICAgICAgb2NjdXJzIGluIHRoZSBJbmplY3RlZEJ1bmRsZVBhZ2UgY2xpZW50IGR1cmlu ZyBhIGNhbGwgaW50byBXS0J1bmRsZVBhZ2VXaWxsRXhpdEZ1bGxTY3JlZW4KKyAgICAgICAgKCkg b3IgV0tCdW5kbGVQYWdlV2lsbERpZEZ1bGxTY3JlZW4oKSwgdGhpcyBjYWxsIHdpbGwgcmVjdXJz ZSBpbnRvCisgICAgICAgIEluamVjdGVkQnVuZGxlUGFnZTo6ZXhpdEZ1bGxTY3JlZW5Gb3JFbGVt ZW50KCksIGFuZCBjYXVzZSBhIHN0YWNrIG92ZXJmbG93LgorCisgICAgICAgIFRyYWNrIHRoZSBj dXJyZW50IHN0YXRlIG9mIGZ1bGxzY3JlZW4gb24gYSBwZXItSW5qZWN0ZWRCdW5kbGVQYWdlIGJh c2lzLCBhbmQgYmFpbCBvdXQgaWYKKyAgICAgICAgdGhlIHN0YXRlIGhhcyBiZWVuIG1vZGlmaWVk IGR1ZSB0byByZWN1cnNpb24uCisKKyAgICAgICAgQWRkIGEgSGFzaE1hcCB0byBtYXAgV0tCdW5k bGVQYWdlUmVmIG9udG8gSW5qZWN0ZWRCdW5kbGVQYWdlcy4gVXNlIHRoYXQgbWFwIHRvIGZpbmQg dGhlCisgICAgICAgIHBhcnRpY3VsYXIgSW5qZWN0ZWRCdW5kbGVQYWdlIGJlaW5nIHJlcXVlc3Rl ZCB0byBlbnRlciBmdWxsc2NyZWVuLiBBZGQgYW4gZW51bWVyYXRlZAorICAgICAgICBzZXQgb2Yg RnVsbHNjcmVlbiBzdGF0ZXMgYW5kIGEgcHJpdmF0ZSBpdmFyIGZvciB0cmFja2luZyB0aGF0IHN0 YXRlLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3Rl ZEJ1bmRsZVBhZ2UuY3BwOgorICAgICAgICAoV1RSOjpJbmplY3RlZEJ1bmRsZVBhZ2U6OkluamVj dGVkQnVuZGxlUGFnZSk6CisgICAgICAgIChXVFI6OkluamVjdGVkQnVuZGxlUGFnZTo6fkluamVj dGVkQnVuZGxlUGFnZSk6CisgICAgICAgIChXVFI6OkluamVjdGVkQnVuZGxlUGFnZTo6ZW50ZXJG dWxsU2NyZWVuRm9yRWxlbWVudCk6CisgICAgICAgIChXVFI6OkluamVjdGVkQnVuZGxlUGFnZTo6 ZXhpdEZ1bGxTY3JlZW5Gb3JFbGVtZW50KToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0lu amVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZS5oOgorCiAyMDIxLTExLTAzICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgWyBpT1MgRGVi dWcgXSBUZXN0V2ViS2l0QVBJLlJlc291cmNlTG9hZFN0YXRpc3RpY3MuR3JhbmRmYXRoZXJDYWxs YmFjayBpcyBmYWlsaW5nCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVj dGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZS5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVy L0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZS5jcHAKaW5kZXggZGU5ZGUxZmRjNjMz MGNhZTMyM2NhNDQ5MDM2MzdlN2ZjMGExZTQyNS4uNWI5OTI4MTVlNzcyMWUwOWVhM2M4OTcwODk5 M2NiY2JlNTI1ZTZkNCAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3Rl ZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2UuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmNwcApAQCAtMjMwLDEwICsyMzAs MTkgQEAgc3RhdGljIGlubGluZSB2b2lkIGR1bXBSZXNvdXJjZVVSTCh1aW50NjRfdCBpZGVudGlm aWVyLCBTdHJpbmdCdWlsZGVyJiBzdHJpbmdCdWkKICAgICAgICAgc3RyaW5nQnVpbGRlci5hcHBl bmQoIjx1bmtub3duPiIpOwogfQogCitzdGF0aWMgSGFzaE1hcDxXS0J1bmRsZVBhZ2VSZWYsIElu amVjdGVkQnVuZGxlUGFnZSo+IGJ1bmRsZVBhZ2VNYXAoKQoreworICAgIHN0YXRpYyBOZXZlckRl c3Ryb3llZDxIYXNoTWFwPFdLQnVuZGxlUGFnZVJlZiwgSW5qZWN0ZWRCdW5kbGVQYWdlKj4+IG1h cDsKKyAgICByZXR1cm4gbWFwLmdldCgpOworfQorCiBJbmplY3RlZEJ1bmRsZVBhZ2U6OkluamVj dGVkQnVuZGxlUGFnZShXS0J1bmRsZVBhZ2VSZWYgcGFnZSkKICAgICA6IG1fcGFnZShwYWdlKQog ICAgICwgbV93b3JsZChhZG9wdFdLKFdLQnVuZGxlU2NyaXB0V29ybGRDcmVhdGVXb3JsZCgpKSkK IHsKKyAgICBBU1NFUlQoIWJ1bmRsZVBhZ2VNYXAoKS5jb250YWlucyhwYWdlKSk7CisgICAgYnVu ZGxlUGFnZU1hcCgpLnNldChwYWdlLCB0aGlzKTsKKwogICAgIFdLQnVuZGxlUGFnZUxvYWRlckNs aWVudFY5IGxvYWRlckNsaWVudCA9IHsKICAgICAgICAgeyA5LCB0aGlzIH0sCiAgICAgICAgIGRp ZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUsCkBAIC0zNjEsNiArMzcwLDggQEAgQUxMT1df REVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECiAKIEluamVjdGVkQnVuZGxlUGFnZTo6fkluamVj dGVkQnVuZGxlUGFnZSgpCiB7CisgICAgQVNTRVJUKGJ1bmRsZVBhZ2VNYXAoKS5jb250YWlucyht X3BhZ2UpKTsKKyAgICBidW5kbGVQYWdlTWFwKCkucmVtb3ZlKG1fcGFnZSk7CiB9CiAKIHZvaWQg SW5qZWN0ZWRCdW5kbGVQYWdlOjpzdG9wTG9hZGluZygpCkBAIC0xNjQyLDI5ICsxNjUzLDY2IEBA IGJvb2wgSW5qZWN0ZWRCdW5kbGVQYWdlOjpzdXBwb3J0c0Z1bGxTY3JlZW4oV0tCdW5kbGVQYWdl UmVmIHBhZ2VSZWYsIFdLRnVsbFNjcmVlCiB9CiAKIHZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdlOjpl bnRlckZ1bGxTY3JlZW5Gb3JFbGVtZW50KFdLQnVuZGxlUGFnZVJlZiBwYWdlUmVmLCBXS0J1bmRs ZU5vZGVIYW5kbGVSZWYgZWxlbWVudFJlZikKK3sKKyAgICBBU1NFUlQoYnVuZGxlUGFnZU1hcCgp LmNvbnRhaW5zKHBhZ2VSZWYpKTsKKyAgICBpZiAoYXV0byogaW5qZWN0ZWRCdW5kbGVQYWdlID0g YnVuZGxlUGFnZU1hcCgpLmdldChwYWdlUmVmKSkKKyAgICAgICAgaW5qZWN0ZWRCdW5kbGVQYWdl LT5lbnRlckZ1bGxTY3JlZW5Gb3JFbGVtZW50KGVsZW1lbnRSZWYpOworfQorCit2b2lkIEluamVj dGVkQnVuZGxlUGFnZTo6ZW50ZXJGdWxsU2NyZWVuRm9yRWxlbWVudChXS0J1bmRsZU5vZGVIYW5k bGVSZWYgZWxlbWVudFJlZikKIHsKICAgICBhdXRvJiBpbmplY3RlZEJ1bmRsZSA9IEluamVjdGVk QnVuZGxlOjpzaW5nbGV0b24oKTsKICAgICBpZiAoaW5qZWN0ZWRCdW5kbGUudGVzdFJ1bm5lcigp LT5zaG91bGREdW1wRnVsbFNjcmVlbkNhbGxiYWNrcygpKQogICAgICAgICBpbmplY3RlZEJ1bmRs ZS5vdXRwdXRUZXh0KCJlbnRlckZ1bGxTY3JlZW5Gb3JFbGVtZW50KClcbiIpOwogCisgICAgaWYg KG1fZnVsbHNjcmVlblN0YXRlID09IEVudGVyaW5nRnVsbHNjcmVlbikKKyAgICAgICAgcmV0dXJu OworICAgIG1fZnVsbHNjcmVlblN0YXRlID0gRW50ZXJpbmdGdWxsc2NyZWVuOworCiAgICAgaWYg KCFpbmplY3RlZEJ1bmRsZS50ZXN0UnVubmVyKCktPmhhc0N1c3RvbUZ1bGxTY3JlZW5CZWhhdmlv cigpKSB7Ci0gICAgICAgIFdLQnVuZGxlUGFnZVdpbGxFbnRlckZ1bGxTY3JlZW4ocGFnZVJlZik7 Ci0gICAgICAgIFdLQnVuZGxlUGFnZURpZEVudGVyRnVsbFNjcmVlbihwYWdlUmVmKTsKKyAgICAg ICAgV0tCdW5kbGVQYWdlV2lsbEVudGVyRnVsbFNjcmVlbihtX3BhZ2UpOworICAgICAgICBpZiAo bV9mdWxsc2NyZWVuU3RhdGUgIT0gRW50ZXJpbmdGdWxsc2NyZWVuKQorICAgICAgICAgICAgcmV0 dXJuOworCisgICAgICAgIFdLQnVuZGxlUGFnZURpZEVudGVyRnVsbFNjcmVlbihtX3BhZ2UpOwor ICAgICAgICBpZiAobV9mdWxsc2NyZWVuU3RhdGUgIT0gRW50ZXJpbmdGdWxsc2NyZWVuKQorICAg ICAgICAgICAgcmV0dXJuOworCiAgICAgfSBlbHNlCiAgICAgICAgIGluamVjdGVkQnVuZGxlLnRl c3RSdW5uZXIoKS0+Y2FsbEVudGVyRnVsbHNjcmVlbkZvckVsZW1lbnRDYWxsYmFjaygpOworCisg ICAgbV9mdWxsc2NyZWVuU3RhdGUgPSBJbkZ1bGxzY3JlZW47CiB9CiAKIHZvaWQgSW5qZWN0ZWRC dW5kbGVQYWdlOjpleGl0RnVsbFNjcmVlbkZvckVsZW1lbnQoV0tCdW5kbGVQYWdlUmVmIHBhZ2VS ZWYsIFdLQnVuZGxlTm9kZUhhbmRsZVJlZiBlbGVtZW50UmVmKQoreworICAgIEFTU0VSVChidW5k bGVQYWdlTWFwKCkuY29udGFpbnMocGFnZVJlZikpOworICAgIGlmIChhdXRvKiBpbmplY3RlZEJ1 bmRsZVBhZ2UgPSBidW5kbGVQYWdlTWFwKCkuZ2V0KHBhZ2VSZWYpKQorICAgICAgICBpbmplY3Rl ZEJ1bmRsZVBhZ2UtPmV4aXRGdWxsU2NyZWVuRm9yRWxlbWVudChlbGVtZW50UmVmKTsKK30KKwor dm9pZCBJbmplY3RlZEJ1bmRsZVBhZ2U6OmV4aXRGdWxsU2NyZWVuRm9yRWxlbWVudChXS0J1bmRs ZU5vZGVIYW5kbGVSZWYgZWxlbWVudFJlZikKIHsKICAgICBhdXRvJiBpbmplY3RlZEJ1bmRsZSA9 IEluamVjdGVkQnVuZGxlOjpzaW5nbGV0b24oKTsKICAgICBpZiAoaW5qZWN0ZWRCdW5kbGUudGVz dFJ1bm5lcigpLT5zaG91bGREdW1wRnVsbFNjcmVlbkNhbGxiYWNrcygpKQogICAgICAgICBpbmpl Y3RlZEJ1bmRsZS5vdXRwdXRUZXh0KCJleGl0RnVsbFNjcmVlbkZvckVsZW1lbnQoKVxuIik7CiAK KyAgICBpZiAobV9mdWxsc2NyZWVuU3RhdGUgPT0gRXhpdGluZ0Z1bGxzY3JlZW4pCisgICAgICAg IHJldHVybjsKKyAgICBtX2Z1bGxzY3JlZW5TdGF0ZSA9IEV4aXRpbmdGdWxsc2NyZWVuOworCiAg ICAgaWYgKCFpbmplY3RlZEJ1bmRsZS50ZXN0UnVubmVyKCktPmhhc0N1c3RvbUZ1bGxTY3JlZW5C ZWhhdmlvcigpKSB7Ci0gICAgICAgIFdLQnVuZGxlUGFnZVdpbGxFeGl0RnVsbFNjcmVlbihwYWdl UmVmKTsKLSAgICAgICAgV0tCdW5kbGVQYWdlRGlkRXhpdEZ1bGxTY3JlZW4ocGFnZVJlZik7Cisg ICAgICAgIFdLQnVuZGxlUGFnZVdpbGxFeGl0RnVsbFNjcmVlbihtX3BhZ2UpOworICAgICAgICBp ZiAobV9mdWxsc2NyZWVuU3RhdGUgIT0gRXhpdGluZ0Z1bGxzY3JlZW4pCisgICAgICAgICAgICBy ZXR1cm47CisKKyAgICAgICAgV0tCdW5kbGVQYWdlRGlkRXhpdEZ1bGxTY3JlZW4obV9wYWdlKTsK KyAgICAgICAgaWYgKG1fZnVsbHNjcmVlblN0YXRlICE9IEV4aXRpbmdGdWxsc2NyZWVuKQorICAg ICAgICAgICAgcmV0dXJuOwogICAgIH0gZWxzZQogICAgICAgICBpbmplY3RlZEJ1bmRsZS50ZXN0 UnVubmVyKCktPmNhbGxFeGl0RnVsbHNjcmVlbkZvckVsZW1lbnRDYWxsYmFjaygpOworCisgICAg bV9mdWxsc2NyZWVuU3RhdGUgPSBOb3RJbkZ1bGxzY3JlZW47CiB9CiAKIHZvaWQgSW5qZWN0ZWRC dW5kbGVQYWdlOjpiZWdhbkVudGVyRnVsbFNjcmVlbihXS0J1bmRsZVBhZ2VSZWYsIFdLUmVjdCwg V0tSZWN0KQpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRs ZS9JbmplY3RlZEJ1bmRsZVBhZ2UuaCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRC dW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmgKaW5kZXggMmQ5MTJlOTE2OWMxMWIzMDdhZDVlZmIy MTNkYzEzZGE1NTJjYjc2Yy4uZGNkNjM4NWY0NjQyMTVjMmVmYmQyMjJkOWNlZWYzNzQwZjE2OGZi YiAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9Jbmpl Y3RlZEJ1bmRsZVBhZ2UuaAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVu ZGxlL0luamVjdGVkQnVuZGxlUGFnZS5oCkBAIC0xNDMsNiArMTQzLDkgQEAgcHJpdmF0ZToKICAg ICBzdGF0aWMgdm9pZCBiZWdhbkVudGVyRnVsbFNjcmVlbihXS0J1bmRsZVBhZ2VSZWYsIFdLUmVj dCBpbml0aWFsRnJhbWUsIFdLUmVjdCBmaW5hbEZyYW1lKTsKICAgICBzdGF0aWMgdm9pZCBiZWdh bkV4aXRGdWxsU2NyZWVuKFdLQnVuZGxlUGFnZVJlZiwgV0tSZWN0IGluaXRpYWxGcmFtZSwgV0tS ZWN0IGZpbmFsRnJhbWUpOwogICAgIHN0YXRpYyB2b2lkIGNsb3NlRnVsbFNjcmVlbihXS0J1bmRs ZVBhZ2VSZWYpOworCisgICAgdm9pZCBlbnRlckZ1bGxTY3JlZW5Gb3JFbGVtZW50KFdLQnVuZGxl Tm9kZUhhbmRsZVJlZiBlbGVtZW50KTsKKyAgICB2b2lkIGV4aXRGdWxsU2NyZWVuRm9yRWxlbWVu dChXS0J1bmRsZU5vZGVIYW5kbGVSZWYgZWxlbWVudCk7CiAjZW5kaWYKIAogICAgIC8vIEVkaXRv ciBjbGllbnQKQEAgLTE4MSw2ICsxODQsMTQgQEAgcHJpdmF0ZToKICAgICBXS0J1bmRsZVBhZ2VS ZWYgbV9wYWdlOwogICAgIFdLUmV0YWluUHRyPFdLQnVuZGxlU2NyaXB0V29ybGRSZWY+IG1fd29y bGQ7CiAgICAgYm9vbCBtX2RpZENvbW1pdE1haW5GcmFtZUxvYWQgeyBmYWxzZSB9OworCisgICAg ZW51bSBGdWxsc2NyZWVuU3RhdGUgeworICAgICAgICBOb3RJbkZ1bGxzY3JlZW4sCisgICAgICAg IEVudGVyaW5nRnVsbHNjcmVlbiwKKyAgICAgICAgRXhpdGluZ0Z1bGxzY3JlZW4sCisgICAgICAg IEluRnVsbHNjcmVlbiwKKyAgICB9OworICAgIEZ1bGxzY3JlZW5TdGF0ZSBtX2Z1bGxzY3JlZW5T dGF0ZSB7IE5vdEluRnVsbHNjcmVlbiB9OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV1RSCg== 443868 2021-11-10 14:55:53 -0800 2021-11-11 11:07:18 -0800 Patch for landing bug-232948-20211110145552.patch text/plain 7030 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NTk0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGUxNWMxOTlhMDE3NTg0ZjE2NDEyNWY2NWJjZTA3NGVk ODM4YjU0Yy4uYjI0MTQ5N2YwNWYxOGQyYzFjNjUyNDBkZWIzMzk3ZjAwOTA3NjRhNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMx IEBACisyMDIxLTExLTEwICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAg ICAgIEluZmluaXRlIHJlY3Vyc2lvbiB1bmRlciBJbmplY3RlZEJ1bmRsZVBhZ2U6OmV4aXRGdWxs U2NyZWVuRm9yRWxlbWVudCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMzI5NDgKKyAgICAgICAgPHJkYXI6Ly84MDU4ODM3NT4KKworICAgICAgICBS ZXZpZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAgICAgICAgV2hlbiBXZWJDb3JlIGluZGljYXRl cyBhbiBlcnJvciBpbiBleGl0aW5nIGZ1bGxzY3JlZW4sIFdlYktpdCB3aWxsIHJlc3BvbmQgYnkg YXR0ZW1wdGluZyB0bworICAgICAgICBjbG9zZSBhbnkgb3V0c3RhbmRpbmcgZnVsbHNjcmVlbiBz ZXNzaW9ucyBieSBjYWxsaW5nIFdlYkZ1bGxTY3JlZW5NYW5hZ2VyOjpjbG9zZSgpLiBJZiB0aGlz CisgICAgICAgIG9jY3VycyBpbiB0aGUgSW5qZWN0ZWRCdW5kbGVQYWdlIGNsaWVudCBkdXJpbmcg YSBjYWxsIGludG8gV0tCdW5kbGVQYWdlV2lsbEV4aXRGdWxsU2NyZWVuKCkKKyAgICAgICAgb3Ig V0tCdW5kbGVQYWdlV2lsbERpZEZ1bGxTY3JlZW4oKSwgdGhpcyBjYWxsIHdpbGwgcmVjdXJzZSBp bnRvCisgICAgICAgIEluamVjdGVkQnVuZGxlUGFnZTo6ZXhpdEZ1bGxTY3JlZW5Gb3JFbGVtZW50 KCksIGFuZCBjYXVzZSBhIHN0YWNrIG92ZXJmbG93LgorCisgICAgICAgIFRyYWNrIHRoZSBjdXJy ZW50IHN0YXRlIG9mIGZ1bGxzY3JlZW4gb24gYSBwZXItSW5qZWN0ZWRCdW5kbGVQYWdlIGJhc2lz LCBhbmQgYmFpbCBvdXQgaWYKKyAgICAgICAgdGhlIHN0YXRlIGhhcyBiZWVuIG1vZGlmaWVkIGR1 ZSB0byByZWN1cnNpb24uCisKKyAgICAgICAgQWRkIGEgSGFzaE1hcCB0byBtYXAgV0tCdW5kbGVQ YWdlUmVmIG9udG8gSW5qZWN0ZWRCdW5kbGVQYWdlcy4gVXNlIHRoYXQgbWFwIHRvIGZpbmQgdGhl CisgICAgICAgIHBhcnRpY3VsYXIgSW5qZWN0ZWRCdW5kbGVQYWdlIGJlaW5nIHJlcXVlc3RlZCB0 byBlbnRlciBmdWxsc2NyZWVuLiBBZGQgYW4gZW51bWVyYXRlZAorICAgICAgICBzZXQgb2YgRnVs bHNjcmVlbiBzdGF0ZXMgYW5kIGEgcHJpdmF0ZSBpdmFyIGZvciB0cmFja2luZyB0aGF0IHN0YXRl LgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1 bmRsZVBhZ2UuY3BwOgorICAgICAgICAoV1RSOjpJbmplY3RlZEJ1bmRsZVBhZ2U6OkluamVjdGVk QnVuZGxlUGFnZSk6CisgICAgICAgIChXVFI6OkluamVjdGVkQnVuZGxlUGFnZTo6fkluamVjdGVk QnVuZGxlUGFnZSk6CisgICAgICAgIChXVFI6OkluamVjdGVkQnVuZGxlUGFnZTo6ZW50ZXJGdWxs U2NyZWVuRm9yRWxlbWVudCk6CisgICAgICAgIChXVFI6OkluamVjdGVkQnVuZGxlUGFnZTo6ZXhp dEZ1bGxTY3JlZW5Gb3JFbGVtZW50KToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0luamVj dGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZS5oOgorCiAyMDIxLTExLTEwICBDaHJpcyBEdW1l eiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGJhc2ljIHN1cHBvcnQgZm9yIGxh dW5jaGluZyBDYXB0aXZlUG9ydGFsTW9kZSBXZWJQcm9jZXNzZXMKZGlmZiAtLWdpdCBhL1Rvb2xz L1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmNwcCBi L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdl LmNwcAppbmRleCBkZTlkZTFmZGM2MzMwY2FlMzIzY2E0NDkwMzYzN2U3ZmMwYTFlNDI1Li4zYTI0 ZjAzNGVkNWRmZjc3ZGI5NGFmZWI2ODM0ZTRmNzYwNjFkNGM4IDEwMDY0NAotLS0gYS9Ub29scy9X ZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZS5jcHAKKysr IGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBh Z2UuY3BwCkBAIC0yMzAsMTAgKzIzMCwxOSBAQCBzdGF0aWMgaW5saW5lIHZvaWQgZHVtcFJlc291 cmNlVVJMKHVpbnQ2NF90IGlkZW50aWZpZXIsIFN0cmluZ0J1aWxkZXImIHN0cmluZ0J1aQogICAg ICAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZCgiPHVua25vd24+Iik7CiB9CiAKK3N0YXRpYyBIYXNo TWFwPFdLQnVuZGxlUGFnZVJlZiwgSW5qZWN0ZWRCdW5kbGVQYWdlKj4mIGJ1bmRsZVBhZ2VNYXAo KQoreworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxIYXNoTWFwPFdLQnVuZGxlUGFnZVJlZiwg SW5qZWN0ZWRCdW5kbGVQYWdlKj4+IG1hcDsKKyAgICByZXR1cm4gbWFwLmdldCgpOworfQorCiBJ bmplY3RlZEJ1bmRsZVBhZ2U6OkluamVjdGVkQnVuZGxlUGFnZShXS0J1bmRsZVBhZ2VSZWYgcGFn ZSkKICAgICA6IG1fcGFnZShwYWdlKQogICAgICwgbV93b3JsZChhZG9wdFdLKFdLQnVuZGxlU2Ny aXB0V29ybGRDcmVhdGVXb3JsZCgpKSkKIHsKKyAgICBBU1NFUlQoIWJ1bmRsZVBhZ2VNYXAoKS5j b250YWlucyhwYWdlKSk7CisgICAgYnVuZGxlUGFnZU1hcCgpLnNldChwYWdlLCB0aGlzKTsKKwog ICAgIFdLQnVuZGxlUGFnZUxvYWRlckNsaWVudFY5IGxvYWRlckNsaWVudCA9IHsKICAgICAgICAg eyA5LCB0aGlzIH0sCiAgICAgICAgIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUsCkBA IC0zNjEsNiArMzcwLDggQEAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECiAKIElu amVjdGVkQnVuZGxlUGFnZTo6fkluamVjdGVkQnVuZGxlUGFnZSgpCiB7CisgICAgQVNTRVJUKGJ1 bmRsZVBhZ2VNYXAoKS5jb250YWlucyhtX3BhZ2UpKTsKKyAgICBidW5kbGVQYWdlTWFwKCkucmVt b3ZlKG1fcGFnZSk7CiB9CiAKIHZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdlOjpzdG9wTG9hZGluZygp CkBAIC0xNjQyLDI5ICsxNjUzLDY2IEBAIGJvb2wgSW5qZWN0ZWRCdW5kbGVQYWdlOjpzdXBwb3J0 c0Z1bGxTY3JlZW4oV0tCdW5kbGVQYWdlUmVmIHBhZ2VSZWYsIFdLRnVsbFNjcmVlCiB9CiAKIHZv aWQgSW5qZWN0ZWRCdW5kbGVQYWdlOjplbnRlckZ1bGxTY3JlZW5Gb3JFbGVtZW50KFdLQnVuZGxl UGFnZVJlZiBwYWdlUmVmLCBXS0J1bmRsZU5vZGVIYW5kbGVSZWYgZWxlbWVudFJlZikKK3sKKyAg ICBBU1NFUlQoYnVuZGxlUGFnZU1hcCgpLmNvbnRhaW5zKHBhZ2VSZWYpKTsKKyAgICBpZiAoYXV0 byogaW5qZWN0ZWRCdW5kbGVQYWdlID0gYnVuZGxlUGFnZU1hcCgpLmdldChwYWdlUmVmKSkKKyAg ICAgICAgaW5qZWN0ZWRCdW5kbGVQYWdlLT5lbnRlckZ1bGxTY3JlZW5Gb3JFbGVtZW50KGVsZW1l bnRSZWYpOworfQorCit2b2lkIEluamVjdGVkQnVuZGxlUGFnZTo6ZW50ZXJGdWxsU2NyZWVuRm9y RWxlbWVudChXS0J1bmRsZU5vZGVIYW5kbGVSZWYgZWxlbWVudFJlZikKIHsKICAgICBhdXRvJiBp bmplY3RlZEJ1bmRsZSA9IEluamVjdGVkQnVuZGxlOjpzaW5nbGV0b24oKTsKICAgICBpZiAoaW5q ZWN0ZWRCdW5kbGUudGVzdFJ1bm5lcigpLT5zaG91bGREdW1wRnVsbFNjcmVlbkNhbGxiYWNrcygp KQogICAgICAgICBpbmplY3RlZEJ1bmRsZS5vdXRwdXRUZXh0KCJlbnRlckZ1bGxTY3JlZW5Gb3JF bGVtZW50KClcbiIpOwogCisgICAgaWYgKG1fZnVsbHNjcmVlblN0YXRlID09IEVudGVyaW5nRnVs bHNjcmVlbikKKyAgICAgICAgcmV0dXJuOworICAgIG1fZnVsbHNjcmVlblN0YXRlID0gRW50ZXJp bmdGdWxsc2NyZWVuOworCiAgICAgaWYgKCFpbmplY3RlZEJ1bmRsZS50ZXN0UnVubmVyKCktPmhh c0N1c3RvbUZ1bGxTY3JlZW5CZWhhdmlvcigpKSB7Ci0gICAgICAgIFdLQnVuZGxlUGFnZVdpbGxF bnRlckZ1bGxTY3JlZW4ocGFnZVJlZik7Ci0gICAgICAgIFdLQnVuZGxlUGFnZURpZEVudGVyRnVs bFNjcmVlbihwYWdlUmVmKTsKKyAgICAgICAgV0tCdW5kbGVQYWdlV2lsbEVudGVyRnVsbFNjcmVl bihtX3BhZ2UpOworICAgICAgICBpZiAobV9mdWxsc2NyZWVuU3RhdGUgIT0gRW50ZXJpbmdGdWxs c2NyZWVuKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIFdLQnVuZGxlUGFnZURpZEVu dGVyRnVsbFNjcmVlbihtX3BhZ2UpOworICAgICAgICBpZiAobV9mdWxsc2NyZWVuU3RhdGUgIT0g RW50ZXJpbmdGdWxsc2NyZWVuKQorICAgICAgICAgICAgcmV0dXJuOworCiAgICAgfSBlbHNlCiAg ICAgICAgIGluamVjdGVkQnVuZGxlLnRlc3RSdW5uZXIoKS0+Y2FsbEVudGVyRnVsbHNjcmVlbkZv ckVsZW1lbnRDYWxsYmFjaygpOworCisgICAgbV9mdWxsc2NyZWVuU3RhdGUgPSBJbkZ1bGxzY3Jl ZW47CiB9CiAKIHZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdlOjpleGl0RnVsbFNjcmVlbkZvckVsZW1l bnQoV0tCdW5kbGVQYWdlUmVmIHBhZ2VSZWYsIFdLQnVuZGxlTm9kZUhhbmRsZVJlZiBlbGVtZW50 UmVmKQoreworICAgIEFTU0VSVChidW5kbGVQYWdlTWFwKCkuY29udGFpbnMocGFnZVJlZikpOwor ICAgIGlmIChhdXRvKiBpbmplY3RlZEJ1bmRsZVBhZ2UgPSBidW5kbGVQYWdlTWFwKCkuZ2V0KHBh Z2VSZWYpKQorICAgICAgICBpbmplY3RlZEJ1bmRsZVBhZ2UtPmV4aXRGdWxsU2NyZWVuRm9yRWxl bWVudChlbGVtZW50UmVmKTsKK30KKwordm9pZCBJbmplY3RlZEJ1bmRsZVBhZ2U6OmV4aXRGdWxs U2NyZWVuRm9yRWxlbWVudChXS0J1bmRsZU5vZGVIYW5kbGVSZWYgZWxlbWVudFJlZikKIHsKICAg ICBhdXRvJiBpbmplY3RlZEJ1bmRsZSA9IEluamVjdGVkQnVuZGxlOjpzaW5nbGV0b24oKTsKICAg ICBpZiAoaW5qZWN0ZWRCdW5kbGUudGVzdFJ1bm5lcigpLT5zaG91bGREdW1wRnVsbFNjcmVlbkNh bGxiYWNrcygpKQogICAgICAgICBpbmplY3RlZEJ1bmRsZS5vdXRwdXRUZXh0KCJleGl0RnVsbFNj cmVlbkZvckVsZW1lbnQoKVxuIik7CiAKKyAgICBpZiAobV9mdWxsc2NyZWVuU3RhdGUgPT0gRXhp dGluZ0Z1bGxzY3JlZW4pCisgICAgICAgIHJldHVybjsKKyAgICBtX2Z1bGxzY3JlZW5TdGF0ZSA9 IEV4aXRpbmdGdWxsc2NyZWVuOworCiAgICAgaWYgKCFpbmplY3RlZEJ1bmRsZS50ZXN0UnVubmVy KCktPmhhc0N1c3RvbUZ1bGxTY3JlZW5CZWhhdmlvcigpKSB7Ci0gICAgICAgIFdLQnVuZGxlUGFn ZVdpbGxFeGl0RnVsbFNjcmVlbihwYWdlUmVmKTsKLSAgICAgICAgV0tCdW5kbGVQYWdlRGlkRXhp dEZ1bGxTY3JlZW4ocGFnZVJlZik7CisgICAgICAgIFdLQnVuZGxlUGFnZVdpbGxFeGl0RnVsbFNj cmVlbihtX3BhZ2UpOworICAgICAgICBpZiAobV9mdWxsc2NyZWVuU3RhdGUgIT0gRXhpdGluZ0Z1 bGxzY3JlZW4pCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgV0tCdW5kbGVQYWdlRGlk RXhpdEZ1bGxTY3JlZW4obV9wYWdlKTsKKyAgICAgICAgaWYgKG1fZnVsbHNjcmVlblN0YXRlICE9 IEV4aXRpbmdGdWxsc2NyZWVuKQorICAgICAgICAgICAgcmV0dXJuOwogICAgIH0gZWxzZQogICAg ICAgICBpbmplY3RlZEJ1bmRsZS50ZXN0UnVubmVyKCktPmNhbGxFeGl0RnVsbHNjcmVlbkZvckVs ZW1lbnRDYWxsYmFjaygpOworCisgICAgbV9mdWxsc2NyZWVuU3RhdGUgPSBOb3RJbkZ1bGxzY3Jl ZW47CiB9CiAKIHZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdlOjpiZWdhbkVudGVyRnVsbFNjcmVlbihX S0J1bmRsZVBhZ2VSZWYsIFdLUmVjdCwgV0tSZWN0KQpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2UuaCBiL1Rvb2xzL1dl YktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmgKaW5kZXgg MmQ5MTJlOTE2OWMxMWIzMDdhZDVlZmIyMTNkYzEzZGE1NTJjYjc2Yy4uZGNkNjM4NWY0NjQyMTVj MmVmYmQyMjJkOWNlZWYzNzQwZjE2OGZiYiAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2UuaAorKysgYi9Ub29scy9XZWJL aXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZS5oCkBAIC0xNDMs NiArMTQzLDkgQEAgcHJpdmF0ZToKICAgICBzdGF0aWMgdm9pZCBiZWdhbkVudGVyRnVsbFNjcmVl bihXS0J1bmRsZVBhZ2VSZWYsIFdLUmVjdCBpbml0aWFsRnJhbWUsIFdLUmVjdCBmaW5hbEZyYW1l KTsKICAgICBzdGF0aWMgdm9pZCBiZWdhbkV4aXRGdWxsU2NyZWVuKFdLQnVuZGxlUGFnZVJlZiwg V0tSZWN0IGluaXRpYWxGcmFtZSwgV0tSZWN0IGZpbmFsRnJhbWUpOwogICAgIHN0YXRpYyB2b2lk IGNsb3NlRnVsbFNjcmVlbihXS0J1bmRsZVBhZ2VSZWYpOworCisgICAgdm9pZCBlbnRlckZ1bGxT Y3JlZW5Gb3JFbGVtZW50KFdLQnVuZGxlTm9kZUhhbmRsZVJlZiBlbGVtZW50KTsKKyAgICB2b2lk IGV4aXRGdWxsU2NyZWVuRm9yRWxlbWVudChXS0J1bmRsZU5vZGVIYW5kbGVSZWYgZWxlbWVudCk7 CiAjZW5kaWYKIAogICAgIC8vIEVkaXRvciBjbGllbnQKQEAgLTE4MSw2ICsxODQsMTQgQEAgcHJp dmF0ZToKICAgICBXS0J1bmRsZVBhZ2VSZWYgbV9wYWdlOwogICAgIFdLUmV0YWluUHRyPFdLQnVu ZGxlU2NyaXB0V29ybGRSZWY+IG1fd29ybGQ7CiAgICAgYm9vbCBtX2RpZENvbW1pdE1haW5GcmFt ZUxvYWQgeyBmYWxzZSB9OworCisgICAgZW51bSBGdWxsc2NyZWVuU3RhdGUgeworICAgICAgICBO b3RJbkZ1bGxzY3JlZW4sCisgICAgICAgIEVudGVyaW5nRnVsbHNjcmVlbiwKKyAgICAgICAgRXhp dGluZ0Z1bGxzY3JlZW4sCisgICAgICAgIEluRnVsbHNjcmVlbiwKKyAgICB9OworICAgIEZ1bGxz Y3JlZW5TdGF0ZSBtX2Z1bGxzY3JlZW5TdGF0ZSB7IE5vdEluRnVsbHNjcmVlbiB9OwogfTsKIAog fSAvLyBuYW1lc3BhY2UgV1RSCg==