228295 2021-07-26 13:10:33 -0700 Rename activeWindow to incumbentWindow in the Location class 2021-07-26 14:20:17 -0700 1 1 1 Unclassified WebKit DOM WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=228287 InRadar P2 Normal --- 1 cdumez cdumez darin ggaren sam webkit-bug-importer oldest_to_newest 1779530 0 cdumez 2021-07-26 13:10:33 -0700 Rename activeWindow to incumbentWindow in the Location class, since this is the naming used both in the HTML specification and Location.idl. 1779533 1 434229 cdumez 2021-07-26 13:11:40 -0700 Created attachment 434229 Patch 1779535 2 434229 darin 2021-07-26 13:14:26 -0700 Comment on attachment 434229 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=434229&action=review > Source/WebCore/page/Location.cpp:284 > URL completedURL = firstFrame->document()->completeURL(urlString); > + > + > // FIXME: The specification says to throw a SyntaxError if the URL is not valid. Not sure why there are two blank lines here. 1779537 3 434230 cdumez 2021-07-26 13:15:26 -0700 Created attachment 434230 Patch 1779568 4 ews-feeder 2021-07-26 14:19:26 -0700 Committed r280313 (239963@main): <https://commits.webkit.org/239963@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 434230. 1779569 5 webkit-bug-importer 2021-07-26 14:20:17 -0700 <rdar://problem/81129964> 434229 2021-07-26 13:11:40 -0700 2021-07-26 13:15:24 -0700 Patch bug-228295-20210726131139.patch text/plain 12977 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMjk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGJkZGIzZjNhMjJkMTgz YTJjN2M3NDVhOGVlZGMyY2FkMDM4MzQwNC4uNjc3YjQ5MjhjZDVmNGIwMzNlMTFmZDU2YjY0MjNm ODNmYmE5ZWIzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA3LTI2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1lIGFjdGl2ZVdpbmRv dyB0byBpbmN1bWJlbnRXaW5kb3cgaW4gdGhlIExvY2F0aW9uIGNsYXNzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjgyOTUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5hbWUgYWN0aXZlV2luZG93IHRv IGluY3VtYmVudFdpbmRvdyBpbiB0aGUgTG9jYXRpb24gY2xhc3MsIHNpbmNlIHRoaXMgaXMgdGhl IG5hbWluZyB1c2VkCisgICAgICAgIGJvdGggaW4gdGhlIEhUTUwgc3BlY2lmaWNhdGlvbiBhbmQg TG9jYXRpb24uaWRsLgorCisgICAgICAgICogcGFnZS9Mb2NhdGlvbi5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpMb2NhdGlvbjo6c2V0SHJlZik6CisgICAgICAgIChXZWJDb3JlOjpMb2NhdGlvbjo6 c2V0UHJvdG9jb2wpOgorICAgICAgICAoV2ViQ29yZTo6TG9jYXRpb246OnNldEhvc3QpOgorICAg ICAgICAoV2ViQ29yZTo6TG9jYXRpb246OnNldEhvc3RuYW1lKToKKyAgICAgICAgKFdlYkNvcmU6 OkxvY2F0aW9uOjpzZXRQb3J0KToKKyAgICAgICAgKFdlYkNvcmU6OkxvY2F0aW9uOjpzZXRQYXRo bmFtZSk6CisgICAgICAgIChXZWJDb3JlOjpMb2NhdGlvbjo6c2V0U2VhcmNoKToKKyAgICAgICAg KFdlYkNvcmU6OkxvY2F0aW9uOjpzZXRIYXNoKToKKyAgICAgICAgKFdlYkNvcmU6OkxvY2F0aW9u Ojphc3NpZ24pOgorICAgICAgICAoV2ViQ29yZTo6TG9jYXRpb246OnJlcGxhY2UpOgorICAgICAg ICAoV2ViQ29yZTo6TG9jYXRpb246OnJlbG9hZCk6CisgICAgICAgIChXZWJDb3JlOjpMb2NhdGlv bjo6c2V0TG9jYXRpb24pOgorICAgICAgICAqIHBhZ2UvTG9jYXRpb24uaDoKKwogMjAyMS0wNy0y NiAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBBbGwg aG9tZSBzY3JlZW4gd2ViIGFwcHMgcmVzdW1lIHdoZW4gYW55IGhvbWUgc2NyZWVuIHdlYiBhcHAg aXMgZm9yZWdyb3VuZGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0xvY2F0aW9u LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTG9jYXRpb24uY3BwCmluZGV4IDA5NWU0NzQ4NWYz YmM0NTY0MDIzYjExZjk5OWI5NjQ2MDIxMDA1MDcuLmIxMjBlOTkwMTkwYTk5YmNkNzhhNGJkYWJl YThlNTNhMThjMWI4YmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTG9jYXRpb24u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTG9jYXRpb24uY3BwCkBAIC0xMjIsMTQgKzEy MiwxNCBAQCBTdHJpbmcgTG9jYXRpb246Omhhc2goKSBjb25zdAogICAgIHJldHVybiB1cmwoKS5m cmFnbWVudElkZW50aWZpZXIoKS5pc0VtcHR5KCkgPyBlbXB0eVN0cmluZygpIDogdXJsKCkuZnJh Z21lbnRJZGVudGlmaWVyV2l0aExlYWRpbmdOdW1iZXJTaWduKCkudG9TdHJpbmcoKTsKIH0KIAot RXhjZXB0aW9uT3I8dm9pZD4gTG9jYXRpb246OnNldEhyZWYoRE9NV2luZG93JiBhY3RpdmVXaW5k b3csIERPTVdpbmRvdyYgZmlyc3RXaW5kb3csIGNvbnN0IFN0cmluZyYgdXJsKQorRXhjZXB0aW9u T3I8dm9pZD4gTG9jYXRpb246OnNldEhyZWYoRE9NV2luZG93JiBpbmN1bWJlbnRXaW5kb3csIERP TVdpbmRvdyYgZmlyc3RXaW5kb3csIGNvbnN0IFN0cmluZyYgdXJsKQogewogICAgIGlmICghZnJh bWUoKSkKICAgICAgICAgcmV0dXJuIHsgfTsKLSAgICByZXR1cm4gc2V0TG9jYXRpb24oYWN0aXZl V2luZG93LCBmaXJzdFdpbmRvdywgdXJsKTsKKyAgICByZXR1cm4gc2V0TG9jYXRpb24oaW5jdW1i ZW50V2luZG93LCBmaXJzdFdpbmRvdywgdXJsKTsKIH0KIAotRXhjZXB0aW9uT3I8dm9pZD4gTG9j YXRpb246OnNldFByb3RvY29sKERPTVdpbmRvdyYgYWN0aXZlV2luZG93LCBET01XaW5kb3cmIGZp cnN0V2luZG93LCBjb25zdCBTdHJpbmcmIHByb3RvY29sKQorRXhjZXB0aW9uT3I8dm9pZD4gTG9j YXRpb246OnNldFByb3RvY29sKERPTVdpbmRvdyYgaW5jdW1iZW50V2luZG93LCBET01XaW5kb3cm IGZpcnN0V2luZG93LCBjb25zdCBTdHJpbmcmIHByb3RvY29sKQogewogICAgIGF1dG8qIGZyYW1l ID0gdGhpcy0+ZnJhbWUoKTsKICAgICBpZiAoIWZyYW1lKQpAQCAtMTM3LDYwICsxMzcsNjAgQEAg RXhjZXB0aW9uT3I8dm9pZD4gTG9jYXRpb246OnNldFByb3RvY29sKERPTVdpbmRvdyYgYWN0aXZl V2luZG93LCBET01XaW5kb3cmIGZpcnMKICAgICBVUkwgdXJsID0gZnJhbWUtPmRvY3VtZW50KCkt PnVybCgpOwogICAgIGlmICghdXJsLnNldFByb3RvY29sKHByb3RvY29sKSkKICAgICAgICAgcmV0 dXJuIEV4Y2VwdGlvbiB7IFN5bnRheEVycm9yIH07Ci0gICAgcmV0dXJuIHNldExvY2F0aW9uKGFj dGl2ZVdpbmRvdywgZmlyc3RXaW5kb3csIHVybC5zdHJpbmcoKSk7CisgICAgcmV0dXJuIHNldExv Y2F0aW9uKGluY3VtYmVudFdpbmRvdywgZmlyc3RXaW5kb3csIHVybC5zdHJpbmcoKSk7CiB9CiAK LUV4Y2VwdGlvbk9yPHZvaWQ+IExvY2F0aW9uOjpzZXRIb3N0KERPTVdpbmRvdyYgYWN0aXZlV2lu ZG93LCBET01XaW5kb3cmIGZpcnN0V2luZG93LCBjb25zdCBTdHJpbmcmIGhvc3QpCitFeGNlcHRp b25Pcjx2b2lkPiBMb2NhdGlvbjo6c2V0SG9zdChET01XaW5kb3cmIGluY3VtYmVudFdpbmRvdywg RE9NV2luZG93JiBmaXJzdFdpbmRvdywgY29uc3QgU3RyaW5nJiBob3N0KQogewogICAgIGF1dG8q IGZyYW1lID0gdGhpcy0+ZnJhbWUoKTsKICAgICBpZiAoIWZyYW1lKQogICAgICAgICByZXR1cm4g eyB9OwogICAgIFVSTCB1cmwgPSBmcmFtZS0+ZG9jdW1lbnQoKS0+dXJsKCk7CiAgICAgdXJsLnNl dEhvc3RBbmRQb3J0KGhvc3QpOwotICAgIHJldHVybiBzZXRMb2NhdGlvbihhY3RpdmVXaW5kb3cs IGZpcnN0V2luZG93LCB1cmwuc3RyaW5nKCkpOworICAgIHJldHVybiBzZXRMb2NhdGlvbihpbmN1 bWJlbnRXaW5kb3csIGZpcnN0V2luZG93LCB1cmwuc3RyaW5nKCkpOwogfQogCi1FeGNlcHRpb25P cjx2b2lkPiBMb2NhdGlvbjo6c2V0SG9zdG5hbWUoRE9NV2luZG93JiBhY3RpdmVXaW5kb3csIERP TVdpbmRvdyYgZmlyc3RXaW5kb3csIGNvbnN0IFN0cmluZyYgaG9zdG5hbWUpCitFeGNlcHRpb25P cjx2b2lkPiBMb2NhdGlvbjo6c2V0SG9zdG5hbWUoRE9NV2luZG93JiBpbmN1bWJlbnRXaW5kb3cs IERPTVdpbmRvdyYgZmlyc3RXaW5kb3csIGNvbnN0IFN0cmluZyYgaG9zdG5hbWUpCiB7CiAgICAg YXV0byogZnJhbWUgPSB0aGlzLT5mcmFtZSgpOwogICAgIGlmICghZnJhbWUpCiAgICAgICAgIHJl dHVybiB7IH07CiAgICAgVVJMIHVybCA9IGZyYW1lLT5kb2N1bWVudCgpLT51cmwoKTsKICAgICB1 cmwuc2V0SG9zdChob3N0bmFtZSk7Ci0gICAgcmV0dXJuIHNldExvY2F0aW9uKGFjdGl2ZVdpbmRv dywgZmlyc3RXaW5kb3csIHVybC5zdHJpbmcoKSk7CisgICAgcmV0dXJuIHNldExvY2F0aW9uKGlu Y3VtYmVudFdpbmRvdywgZmlyc3RXaW5kb3csIHVybC5zdHJpbmcoKSk7CiB9CiAKLUV4Y2VwdGlv bk9yPHZvaWQ+IExvY2F0aW9uOjpzZXRQb3J0KERPTVdpbmRvdyYgYWN0aXZlV2luZG93LCBET01X aW5kb3cmIGZpcnN0V2luZG93LCBjb25zdCBTdHJpbmcmIHBvcnRTdHJpbmcpCitFeGNlcHRpb25P cjx2b2lkPiBMb2NhdGlvbjo6c2V0UG9ydChET01XaW5kb3cmIGluY3VtYmVudFdpbmRvdywgRE9N V2luZG93JiBmaXJzdFdpbmRvdywgY29uc3QgU3RyaW5nJiBwb3J0U3RyaW5nKQogewogICAgIGF1 dG8qIGZyYW1lID0gdGhpcy0+ZnJhbWUoKTsKICAgICBpZiAoIWZyYW1lKQogICAgICAgICByZXR1 cm4geyB9OwogICAgIFVSTCB1cmwgPSBmcmFtZS0+ZG9jdW1lbnQoKS0+dXJsKCk7CiAgICAgdXJs LnNldFBvcnQocGFyc2VJbnRlZ2VyPHVpbnQxNl90Pihwb3J0U3RyaW5nKSk7Ci0gICAgcmV0dXJu IHNldExvY2F0aW9uKGFjdGl2ZVdpbmRvdywgZmlyc3RXaW5kb3csIHVybC5zdHJpbmcoKSk7Cisg ICAgcmV0dXJuIHNldExvY2F0aW9uKGluY3VtYmVudFdpbmRvdywgZmlyc3RXaW5kb3csIHVybC5z dHJpbmcoKSk7CiB9CiAKLUV4Y2VwdGlvbk9yPHZvaWQ+IExvY2F0aW9uOjpzZXRQYXRobmFtZShE T01XaW5kb3cmIGFjdGl2ZVdpbmRvdywgRE9NV2luZG93JiBmaXJzdFdpbmRvdywgY29uc3QgU3Ry aW5nJiBwYXRobmFtZSkKK0V4Y2VwdGlvbk9yPHZvaWQ+IExvY2F0aW9uOjpzZXRQYXRobmFtZShE T01XaW5kb3cmIGluY3VtYmVudFdpbmRvdywgRE9NV2luZG93JiBmaXJzdFdpbmRvdywgY29uc3Qg U3RyaW5nJiBwYXRobmFtZSkKIHsKICAgICBhdXRvKiBmcmFtZSA9IHRoaXMtPmZyYW1lKCk7CiAg ICAgaWYgKCFmcmFtZSkKICAgICAgICAgcmV0dXJuIHsgfTsKICAgICBVUkwgdXJsID0gZnJhbWUt PmRvY3VtZW50KCktPnVybCgpOwogICAgIHVybC5zZXRQYXRoKHBhdGhuYW1lKTsKLSAgICByZXR1 cm4gc2V0TG9jYXRpb24oYWN0aXZlV2luZG93LCBmaXJzdFdpbmRvdywgdXJsLnN0cmluZygpKTsK KyAgICByZXR1cm4gc2V0TG9jYXRpb24oaW5jdW1iZW50V2luZG93LCBmaXJzdFdpbmRvdywgdXJs LnN0cmluZygpKTsKIH0KIAotRXhjZXB0aW9uT3I8dm9pZD4gTG9jYXRpb246OnNldFNlYXJjaChE T01XaW5kb3cmIGFjdGl2ZVdpbmRvdywgRE9NV2luZG93JiBmaXJzdFdpbmRvdywgY29uc3QgU3Ry aW5nJiBzZWFyY2gpCitFeGNlcHRpb25Pcjx2b2lkPiBMb2NhdGlvbjo6c2V0U2VhcmNoKERPTVdp bmRvdyYgaW5jdW1iZW50V2luZG93LCBET01XaW5kb3cmIGZpcnN0V2luZG93LCBjb25zdCBTdHJp bmcmIHNlYXJjaCkKIHsKICAgICBhdXRvKiBmcmFtZSA9IHRoaXMtPmZyYW1lKCk7CiAgICAgaWYg KCFmcmFtZSkKICAgICAgICAgcmV0dXJuIHsgfTsKICAgICBVUkwgdXJsID0gZnJhbWUtPmRvY3Vt ZW50KCktPnVybCgpOwogICAgIHVybC5zZXRRdWVyeShzZWFyY2gpOwotICAgIHJldHVybiBzZXRM b2NhdGlvbihhY3RpdmVXaW5kb3csIGZpcnN0V2luZG93LCB1cmwuc3RyaW5nKCkpOworICAgIHJl dHVybiBzZXRMb2NhdGlvbihpbmN1bWJlbnRXaW5kb3csIGZpcnN0V2luZG93LCB1cmwuc3RyaW5n KCkpOwogfQogCi1FeGNlcHRpb25Pcjx2b2lkPiBMb2NhdGlvbjo6c2V0SGFzaChET01XaW5kb3cm IGFjdGl2ZVdpbmRvdywgRE9NV2luZG93JiBmaXJzdFdpbmRvdywgY29uc3QgU3RyaW5nJiBoYXNo KQorRXhjZXB0aW9uT3I8dm9pZD4gTG9jYXRpb246OnNldEhhc2goRE9NV2luZG93JiBpbmN1bWJl bnRXaW5kb3csIERPTVdpbmRvdyYgZmlyc3RXaW5kb3csIGNvbnN0IFN0cmluZyYgaGFzaCkKIHsK ICAgICBhdXRvKiBmcmFtZSA9IHRoaXMtPmZyYW1lKCk7CiAgICAgaWYgKCFmcmFtZSkKQEAgLTIw NywxNyArMjA3LDE3IEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IExvY2F0aW9uOjpzZXRIYXNoKERPTVdp bmRvdyYgYWN0aXZlV2luZG93LCBET01XaW5kb3cmIGZpcnN0V2luCiAgICAgLy8gY2FzZXMgd2hl cmUgZnJhZ21lbnQgaWRlbnRpZmllcnMgYXJlIGlnbm9yZWQgb3IgaW52YWxpZC4gCiAgICAgaWYg KGVxdWFsSWdub3JpbmdOdWxsaXR5KG9sZEZyYWdtZW50SWRlbnRpZmllciwgdXJsLmZyYWdtZW50 SWRlbnRpZmllcigpKSkKICAgICAgICAgcmV0dXJuIHsgfTsKLSAgICByZXR1cm4gc2V0TG9jYXRp b24oYWN0aXZlV2luZG93LCBmaXJzdFdpbmRvdywgdXJsLnN0cmluZygpKTsKKyAgICByZXR1cm4g c2V0TG9jYXRpb24oaW5jdW1iZW50V2luZG93LCBmaXJzdFdpbmRvdywgdXJsLnN0cmluZygpKTsK IH0KIAotRXhjZXB0aW9uT3I8dm9pZD4gTG9jYXRpb246OmFzc2lnbihET01XaW5kb3cmIGFjdGl2 ZVdpbmRvdywgRE9NV2luZG93JiBmaXJzdFdpbmRvdywgY29uc3QgU3RyaW5nJiB1cmwpCitFeGNl cHRpb25Pcjx2b2lkPiBMb2NhdGlvbjo6YXNzaWduKERPTVdpbmRvdyYgaW5jdW1iZW50V2luZG93 LCBET01XaW5kb3cmIGZpcnN0V2luZG93LCBjb25zdCBTdHJpbmcmIHVybCkKIHsKICAgICBpZiAo IWZyYW1lKCkpCiAgICAgICAgIHJldHVybiB7IH07Ci0gICAgcmV0dXJuIHNldExvY2F0aW9uKGFj dGl2ZVdpbmRvdywgZmlyc3RXaW5kb3csIHVybCk7CisgICAgcmV0dXJuIHNldExvY2F0aW9uKGlu Y3VtYmVudFdpbmRvdywgZmlyc3RXaW5kb3csIHVybCk7CiB9CiAKLUV4Y2VwdGlvbk9yPHZvaWQ+ IExvY2F0aW9uOjpyZXBsYWNlKERPTVdpbmRvdyYgYWN0aXZlV2luZG93LCBET01XaW5kb3cmIGZp cnN0V2luZG93LCBjb25zdCBTdHJpbmcmIHVybFN0cmluZykKK0V4Y2VwdGlvbk9yPHZvaWQ+IExv Y2F0aW9uOjpyZXBsYWNlKERPTVdpbmRvdyYgaW5jdW1iZW50V2luZG93LCBET01XaW5kb3cmIGZp cnN0V2luZG93LCBjb25zdCBTdHJpbmcmIHVybFN0cmluZykKIHsKICAgICBhdXRvKiBmcmFtZSA9 IHRoaXMtPmZyYW1lKCk7CiAgICAgaWYgKCFmcmFtZSkKQEAgLTIzNCwyMSArMjM0LDIxIEBAIEV4 Y2VwdGlvbk9yPHZvaWQ+IExvY2F0aW9uOjpyZXBsYWNlKERPTVdpbmRvdyYgYWN0aXZlV2luZG93 LCBET01XaW5kb3cmIGZpcnN0V2luCiAgICAgICAgIHJldHVybiBFeGNlcHRpb24geyBTeW50YXhF cnJvciB9OwogCiAgICAgLy8gV2UgY2FsbCBET01XaW5kb3c6OnNldExvY2F0aW9uIGRpcmVjdGx5 IGhlcmUgYmVjYXVzZSByZXBsYWNlKCkgYWx3YXlzIG9wZXJhdGVzIG9uIHRoZSBjdXJyZW50IGZy YW1lLgotICAgIGZyYW1lLT5kb2N1bWVudCgpLT5kb21XaW5kb3coKS0+c2V0TG9jYXRpb24oYWN0 aXZlV2luZG93LCBjb21wbGV0ZWRVUkwsIExvY2tIaXN0b3J5QW5kQmFja0ZvcndhcmRMaXN0KTsK KyAgICBmcmFtZS0+ZG9jdW1lbnQoKS0+ZG9tV2luZG93KCktPnNldExvY2F0aW9uKGluY3VtYmVu dFdpbmRvdywgY29tcGxldGVkVVJMLCBMb2NrSGlzdG9yeUFuZEJhY2tGb3J3YXJkTGlzdCk7CiAg ICAgcmV0dXJuIHsgfTsKIH0KIAotdm9pZCBMb2NhdGlvbjo6cmVsb2FkKERPTVdpbmRvdyYgYWN0 aXZlV2luZG93KQordm9pZCBMb2NhdGlvbjo6cmVsb2FkKERPTVdpbmRvdyYgaW5jdW1iZW50V2lu ZG93KQogewogICAgIGF1dG8qIGZyYW1lID0gdGhpcy0+ZnJhbWUoKTsKICAgICBpZiAoIWZyYW1l KQogICAgICAgICByZXR1cm47CiAKLSAgICBBU1NFUlQoYWN0aXZlV2luZG93LmRvY3VtZW50KCkp OworICAgIEFTU0VSVChpbmN1bWJlbnRXaW5kb3cuZG9jdW1lbnQoKSk7CiAgICAgQVNTRVJUKGZy YW1lLT5kb2N1bWVudCgpKTsKICAgICBBU1NFUlQoZnJhbWUtPmRvY3VtZW50KCktPmRvbVdpbmRv dygpKTsKIAotICAgIGF1dG8mIGFjdGl2ZURvY3VtZW50ID0gKmFjdGl2ZVdpbmRvdy5kb2N1bWVu dCgpOworICAgIGF1dG8mIGFjdGl2ZURvY3VtZW50ID0gKmluY3VtYmVudFdpbmRvdy5kb2N1bWVu dCgpOwogICAgIGF1dG8mIHRhcmdldERvY3VtZW50ID0gKmZyYW1lLT5kb2N1bWVudCgpOwogCiAg ICAgLy8gRklYTUU6IEl0J3Mgbm90IGNsZWFyIHRoaXMgY3Jvc3Mtb3JpZ2luIHNlY3VyaXR5IGNo ZWNrIGlzIHZhbHVhYmxlLgpAQCAtMjU2LDcgKzI1Niw3IEBAIHZvaWQgTG9jYXRpb246OnJlbG9h ZChET01XaW5kb3cmIGFjdGl2ZVdpbmRvdykKICAgICAvLyBPdGhlciBsb2NhdGlvbiBvcGVyYXRp b25zIHNpbXBseSBibG9jayB1c2Ugb2YgSmF2YVNjcmlwdCBVUkxzIGNyb3NzIG9yaWdpbi4KICAg ICBpZiAoIWFjdGl2ZURvY3VtZW50LnNlY3VyaXR5T3JpZ2luKCkuaXNTYW1lT3JpZ2luRG9tYWlu KHRhcmdldERvY3VtZW50LnNlY3VyaXR5T3JpZ2luKCkpKSB7CiAgICAgICAgIGF1dG8mIHRhcmdl dFdpbmRvdyA9ICp0YXJnZXREb2N1bWVudC5kb21XaW5kb3coKTsKLSAgICAgICAgdGFyZ2V0V2lu ZG93LnByaW50RXJyb3JNZXNzYWdlKHRhcmdldFdpbmRvdy5jcm9zc0RvbWFpbkFjY2Vzc0Vycm9y TWVzc2FnZShhY3RpdmVXaW5kb3csIEluY2x1ZGVUYXJnZXRPcmlnaW46OlllcykpOworICAgICAg ICB0YXJnZXRXaW5kb3cucHJpbnRFcnJvck1lc3NhZ2UodGFyZ2V0V2luZG93LmNyb3NzRG9tYWlu QWNjZXNzRXJyb3JNZXNzYWdlKGluY3VtYmVudFdpbmRvdywgSW5jbHVkZVRhcmdldE9yaWdpbjo6 WWVzKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTI2Niw3ICsyNjYsNyBAQCB2b2lk IExvY2F0aW9uOjpyZWxvYWQoRE9NV2luZG93JiBhY3RpdmVXaW5kb3cpCiAgICAgZnJhbWUtPm5h dmlnYXRpb25TY2hlZHVsZXIoKS5zY2hlZHVsZVJlZnJlc2goYWN0aXZlRG9jdW1lbnQpOwogfQog Ci1FeGNlcHRpb25Pcjx2b2lkPiBMb2NhdGlvbjo6c2V0TG9jYXRpb24oRE9NV2luZG93JiBhY3Rp dmVXaW5kb3csIERPTVdpbmRvdyYgZmlyc3RXaW5kb3csIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5n KQorRXhjZXB0aW9uT3I8dm9pZD4gTG9jYXRpb246OnNldExvY2F0aW9uKERPTVdpbmRvdyYgaW5j dW1iZW50V2luZG93LCBET01XaW5kb3cmIGZpcnN0V2luZG93LCBjb25zdCBTdHJpbmcmIHVybFN0 cmluZykKIHsKICAgICBhdXRvKiBmcmFtZSA9IHRoaXMtPmZyYW1lKCk7CiAgICAgQVNTRVJUKGZy YW1lKTsKQEAgLTI3NSwxNyArMjc1LDIyIEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IExvY2F0aW9uOjpz ZXRMb2NhdGlvbihET01XaW5kb3cmIGFjdGl2ZVdpbmRvdywgRE9NV2luZG93JiBmaXJzCiAgICAg aWYgKCFmaXJzdEZyYW1lIHx8ICFmaXJzdEZyYW1lLT5kb2N1bWVudCgpKQogICAgICAgICByZXR1 cm4geyB9OwogCisgICAgLy8gRklYTUU6IFVzaW5nIGZpcnN0V2luZG93IHRvIGNvbXBsZXRlIHRo ZSBVUkwgaXMgd3JvbmcuIFBlciB0aGUgc3BlY2lmaWNhdGlvbiwgd2Ugc2hvdWxkIGJlIHVzaW5n IHRoZSBlbnRyeSB3aW5kb3c6CisgICAgLy8gaHR0cHM6Ly9odG1sLnNwZWMud2hhdHdnLm9yZy8j ZW50cnktc2V0dGluZ3Mtb2JqZWN0CisgICAgLy8gQmxpbmsgc2VlbXMgdG8gYmUgdXNpbmcgdjgn cyBHZXRFbnRlcmVkT3JNaWNyb3Rhc2tDb250ZXh0KCkuCiAgICAgVVJMIGNvbXBsZXRlZFVSTCA9 IGZpcnN0RnJhbWUtPmRvY3VtZW50KCktPmNvbXBsZXRlVVJMKHVybFN0cmluZyk7CisKKwogICAg IC8vIEZJWE1FOiBUaGUgc3BlY2lmaWNhdGlvbiBzYXlzIHRvIHRocm93IGEgU3ludGF4RXJyb3Ig aWYgdGhlIFVSTCBpcyBub3QgdmFsaWQuCiAgICAgaWYgKGNvbXBsZXRlZFVSTC5pc051bGwoKSkK ICAgICAgICAgcmV0dXJuIHsgfTsKIAotICAgIGlmICghYWN0aXZlV2luZG93LmRvY3VtZW50KCkt PmNhbk5hdmlnYXRlKGZyYW1lLCBjb21wbGV0ZWRVUkwpKQorICAgIGlmICghaW5jdW1iZW50V2lu ZG93LmRvY3VtZW50KCktPmNhbk5hdmlnYXRlKGZyYW1lLCBjb21wbGV0ZWRVUkwpKQogICAgICAg ICByZXR1cm4gRXhjZXB0aW9uIHsgU2VjdXJpdHlFcnJvciB9OwogCiAgICAgQVNTRVJUKGZyYW1l LT5kb2N1bWVudCgpKTsKICAgICBBU1NFUlQoZnJhbWUtPmRvY3VtZW50KCktPmRvbVdpbmRvdygp KTsKLSAgICBmcmFtZS0+ZG9jdW1lbnQoKS0+ZG9tV2luZG93KCktPnNldExvY2F0aW9uKGFjdGl2 ZVdpbmRvdywgY29tcGxldGVkVVJMKTsKKyAgICBmcmFtZS0+ZG9jdW1lbnQoKS0+ZG9tV2luZG93 KCktPnNldExvY2F0aW9uKGluY3VtYmVudFdpbmRvdywgY29tcGxldGVkVVJMKTsKICAgICByZXR1 cm4geyB9OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0xvY2F0aW9uLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0xvY2F0aW9uLmgKaW5kZXggNDlkYmY3NTEyYmJiMWE5MmE2 ZjM5MjAyM2ZlZTgwZTdjZWVjNmM2My4uYjc5Zjg0YjZkMDYzMTgzNzY3MDU4MmQ5ZmJlM2JjOWYy OWZjMmM1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9Mb2NhdGlvbi5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvTG9jYXRpb24uaApAQCAtNDIsMjYgKzQyLDI2IEBAIGNsYXNz IExvY2F0aW9uIGZpbmFsIDogcHVibGljIFNjcmlwdFdyYXBwYWJsZSwgcHVibGljIFJlZkNvdW50 ZWQ8TG9jYXRpb24+LCBwdWJsCiBwdWJsaWM6CiAgICAgc3RhdGljIFJlZjxMb2NhdGlvbj4gY3Jl YXRlKERPTVdpbmRvdyYgd2luZG93KSB7IHJldHVybiBhZG9wdFJlZigqbmV3IExvY2F0aW9uKHdp bmRvdykpOyB9CiAKLSAgICBFeGNlcHRpb25Pcjx2b2lkPiBzZXRIcmVmKERPTVdpbmRvdyYgYWN0 aXZlV2luZG93LCBET01XaW5kb3cmIGZpcnN0V2luZG93LCBjb25zdCBTdHJpbmcmKTsKKyAgICBF eGNlcHRpb25Pcjx2b2lkPiBzZXRIcmVmKERPTVdpbmRvdyYgaW5jdW1iZW50V2luZG93LCBET01X aW5kb3cmIGZpcnN0V2luZG93LCBjb25zdCBTdHJpbmcmKTsKICAgICBTdHJpbmcgaHJlZigpIGNv bnN0OwogCi0gICAgRXhjZXB0aW9uT3I8dm9pZD4gYXNzaWduKERPTVdpbmRvdyYgYWN0aXZlV2lu ZG93LCBET01XaW5kb3cmIGZpcnN0V2luZG93LCBjb25zdCBTdHJpbmcmKTsKLSAgICBFeGNlcHRp b25Pcjx2b2lkPiByZXBsYWNlKERPTVdpbmRvdyYgYWN0aXZlV2luZG93LCBET01XaW5kb3cmIGZp cnN0V2luZG93LCBjb25zdCBTdHJpbmcmKTsKLSAgICB2b2lkIHJlbG9hZChET01XaW5kb3cmIGFj dGl2ZVdpbmRvdyk7CisgICAgRXhjZXB0aW9uT3I8dm9pZD4gYXNzaWduKERPTVdpbmRvdyYgaW5j dW1iZW50V2luZG93LCBET01XaW5kb3cmIGZpcnN0V2luZG93LCBjb25zdCBTdHJpbmcmKTsKKyAg ICBFeGNlcHRpb25Pcjx2b2lkPiByZXBsYWNlKERPTVdpbmRvdyYgaW5jdW1iZW50V2luZG93LCBE T01XaW5kb3cmIGZpcnN0V2luZG93LCBjb25zdCBTdHJpbmcmKTsKKyAgICB2b2lkIHJlbG9hZChE T01XaW5kb3cmIGluY3VtYmVudFdpbmRvdyk7CiAKLSAgICBFeGNlcHRpb25Pcjx2b2lkPiBzZXRQ cm90b2NvbChET01XaW5kb3cmIGFjdGl2ZVdpbmRvdywgRE9NV2luZG93JiBmaXJzdFdpbmRvdywg Y29uc3QgU3RyaW5nJik7CisgICAgRXhjZXB0aW9uT3I8dm9pZD4gc2V0UHJvdG9jb2woRE9NV2lu ZG93JiBpbmN1bWJlbnRXaW5kb3csIERPTVdpbmRvdyYgZmlyc3RXaW5kb3csIGNvbnN0IFN0cmlu ZyYpOwogICAgIFN0cmluZyBwcm90b2NvbCgpIGNvbnN0OwotICAgIEV4Y2VwdGlvbk9yPHZvaWQ+ IHNldEhvc3QoRE9NV2luZG93JiBhY3RpdmVXaW5kb3csIERPTVdpbmRvdyYgZmlyc3RXaW5kb3cs IGNvbnN0IFN0cmluZyYpOworICAgIEV4Y2VwdGlvbk9yPHZvaWQ+IHNldEhvc3QoRE9NV2luZG93 JiBpbmN1bWJlbnRXaW5kb3csIERPTVdpbmRvdyYgZmlyc3RXaW5kb3csIGNvbnN0IFN0cmluZyYp OwogICAgIFdFQkNPUkVfRVhQT1JUIFN0cmluZyBob3N0KCkgY29uc3Q7Ci0gICAgRXhjZXB0aW9u T3I8dm9pZD4gc2V0SG9zdG5hbWUoRE9NV2luZG93JiBhY3RpdmVXaW5kb3csIERPTVdpbmRvdyYg Zmlyc3RXaW5kb3csIGNvbnN0IFN0cmluZyYpOworICAgIEV4Y2VwdGlvbk9yPHZvaWQ+IHNldEhv c3RuYW1lKERPTVdpbmRvdyYgaW5jdW1iZW50V2luZG93LCBET01XaW5kb3cmIGZpcnN0V2luZG93 LCBjb25zdCBTdHJpbmcmKTsKICAgICBTdHJpbmcgaG9zdG5hbWUoKSBjb25zdDsKLSAgICBFeGNl cHRpb25Pcjx2b2lkPiBzZXRQb3J0KERPTVdpbmRvdyYgYWN0aXZlV2luZG93LCBET01XaW5kb3cm IGZpcnN0V2luZG93LCBjb25zdCBTdHJpbmcmKTsKKyAgICBFeGNlcHRpb25Pcjx2b2lkPiBzZXRQ b3J0KERPTVdpbmRvdyYgaW5jdW1iZW50V2luZG93LCBET01XaW5kb3cmIGZpcnN0V2luZG93LCBj b25zdCBTdHJpbmcmKTsKICAgICBTdHJpbmcgcG9ydCgpIGNvbnN0OwotICAgIEV4Y2VwdGlvbk9y PHZvaWQ+IHNldFBhdGhuYW1lKERPTVdpbmRvdyYgYWN0aXZlV2luZG93LCBET01XaW5kb3cmIGZp cnN0V2luZG93LCBjb25zdCBTdHJpbmcmKTsKKyAgICBFeGNlcHRpb25Pcjx2b2lkPiBzZXRQYXRo bmFtZShET01XaW5kb3cmIGluY3VtYmVudFdpbmRvdywgRE9NV2luZG93JiBmaXJzdFdpbmRvdywg Y29uc3QgU3RyaW5nJik7CiAgICAgU3RyaW5nIHBhdGhuYW1lKCkgY29uc3Q7Ci0gICAgRXhjZXB0 aW9uT3I8dm9pZD4gc2V0U2VhcmNoKERPTVdpbmRvdyYgYWN0aXZlV2luZG93LCBET01XaW5kb3cm IGZpcnN0V2luZG93LCBjb25zdCBTdHJpbmcmKTsKKyAgICBFeGNlcHRpb25Pcjx2b2lkPiBzZXRT ZWFyY2goRE9NV2luZG93JiBpbmN1bWJlbnRXaW5kb3csIERPTVdpbmRvdyYgZmlyc3RXaW5kb3cs IGNvbnN0IFN0cmluZyYpOwogICAgIFN0cmluZyBzZWFyY2goKSBjb25zdDsKLSAgICBFeGNlcHRp b25Pcjx2b2lkPiBzZXRIYXNoKERPTVdpbmRvdyYgYWN0aXZlV2luZG93LCBET01XaW5kb3cmIGZp cnN0V2luZG93LCBjb25zdCBTdHJpbmcmKTsKKyAgICBFeGNlcHRpb25Pcjx2b2lkPiBzZXRIYXNo KERPTVdpbmRvdyYgaW5jdW1iZW50V2luZG93LCBET01XaW5kb3cmIGZpcnN0V2luZG93LCBjb25z dCBTdHJpbmcmKTsKICAgICBTdHJpbmcgaGFzaCgpIGNvbnN0OwogICAgIFN0cmluZyBvcmlnaW4o KSBjb25zdDsKIApAQCAtNzIsNyArNzIsNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIGV4cGxp Y2l0IExvY2F0aW9uKERPTVdpbmRvdyYpOwogCi0gICAgRXhjZXB0aW9uT3I8dm9pZD4gc2V0TG9j YXRpb24oRE9NV2luZG93JiBhY3RpdmVXaW5kb3csIERPTVdpbmRvdyYgZmlyc3RXaW5kb3csIGNv bnN0IFN0cmluZyYpOworICAgIEV4Y2VwdGlvbk9yPHZvaWQ+IHNldExvY2F0aW9uKERPTVdpbmRv dyYgaW5jdW1iZW50V2luZG93LCBET01XaW5kb3cmIGZpcnN0V2luZG93LCBjb25zdCBTdHJpbmcm KTsKIAogICAgIGNvbnN0IFVSTCYgdXJsKCkgY29uc3Q7CiB9Owo= 434230 2021-07-26 13:15:26 -0700 2021-07-26 14:19:27 -0700 Patch bug-228295-20210726131525.patch text/plain 12972 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMjk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGJkZGIzZjNhMjJkMTgz YTJjN2M3NDVhOGVlZGMyY2FkMDM4MzQwNC4uNDY3YzM4OGQwZWU4ZjYxZjRjODYwNWE5NzBkNjc2 NzM0ODYxMzMzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA3LTI2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1lIGFjdGl2ZVdpbmRv dyB0byBpbmN1bWJlbnRXaW5kb3cgaW4gdGhlIExvY2F0aW9uIGNsYXNzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjgyOTUKKworICAgICAgICBSZXZp ZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBSZW5hbWUgYWN0aXZlV2luZG93IHRvIGlu Y3VtYmVudFdpbmRvdyBpbiB0aGUgTG9jYXRpb24gY2xhc3MsIHNpbmNlIHRoaXMgaXMgdGhlIG5h bWluZyB1c2VkCisgICAgICAgIGJvdGggaW4gdGhlIEhUTUwgc3BlY2lmaWNhdGlvbiBhbmQgTG9j YXRpb24uaWRsLgorCisgICAgICAgICogcGFnZS9Mb2NhdGlvbi5jcHA6CisgICAgICAgIChXZWJD b3JlOjpMb2NhdGlvbjo6c2V0SHJlZik6CisgICAgICAgIChXZWJDb3JlOjpMb2NhdGlvbjo6c2V0 UHJvdG9jb2wpOgorICAgICAgICAoV2ViQ29yZTo6TG9jYXRpb246OnNldEhvc3QpOgorICAgICAg ICAoV2ViQ29yZTo6TG9jYXRpb246OnNldEhvc3RuYW1lKToKKyAgICAgICAgKFdlYkNvcmU6Okxv Y2F0aW9uOjpzZXRQb3J0KToKKyAgICAgICAgKFdlYkNvcmU6OkxvY2F0aW9uOjpzZXRQYXRobmFt ZSk6CisgICAgICAgIChXZWJDb3JlOjpMb2NhdGlvbjo6c2V0U2VhcmNoKToKKyAgICAgICAgKFdl YkNvcmU6OkxvY2F0aW9uOjpzZXRIYXNoKToKKyAgICAgICAgKFdlYkNvcmU6OkxvY2F0aW9uOjph c3NpZ24pOgorICAgICAgICAoV2ViQ29yZTo6TG9jYXRpb246OnJlcGxhY2UpOgorICAgICAgICAo V2ViQ29yZTo6TG9jYXRpb246OnJlbG9hZCk6CisgICAgICAgIChXZWJDb3JlOjpMb2NhdGlvbjo6 c2V0TG9jYXRpb24pOgorICAgICAgICAqIHBhZ2UvTG9jYXRpb24uaDoKKwogMjAyMS0wNy0yNiAg SmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBBbGwgaG9t ZSBzY3JlZW4gd2ViIGFwcHMgcmVzdW1lIHdoZW4gYW55IGhvbWUgc2NyZWVuIHdlYiBhcHAgaXMg Zm9yZWdyb3VuZGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0xvY2F0aW9uLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTG9jYXRpb24uY3BwCmluZGV4IDA5NWU0NzQ4NWYzYmM0 NTY0MDIzYjExZjk5OWI5NjQ2MDIxMDA1MDcuLjY0ODViMjcwNGFlNDBjNzA5NzEzYjZkODRjOGIx NTM5MmFjMTBjYzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTG9jYXRpb24uY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTG9jYXRpb24uY3BwCkBAIC0xMjIsMTQgKzEyMiwx NCBAQCBTdHJpbmcgTG9jYXRpb246Omhhc2goKSBjb25zdAogICAgIHJldHVybiB1cmwoKS5mcmFn bWVudElkZW50aWZpZXIoKS5pc0VtcHR5KCkgPyBlbXB0eVN0cmluZygpIDogdXJsKCkuZnJhZ21l bnRJZGVudGlmaWVyV2l0aExlYWRpbmdOdW1iZXJTaWduKCkudG9TdHJpbmcoKTsKIH0KIAotRXhj ZXB0aW9uT3I8dm9pZD4gTG9jYXRpb246OnNldEhyZWYoRE9NV2luZG93JiBhY3RpdmVXaW5kb3cs IERPTVdpbmRvdyYgZmlyc3RXaW5kb3csIGNvbnN0IFN0cmluZyYgdXJsKQorRXhjZXB0aW9uT3I8 dm9pZD4gTG9jYXRpb246OnNldEhyZWYoRE9NV2luZG93JiBpbmN1bWJlbnRXaW5kb3csIERPTVdp bmRvdyYgZmlyc3RXaW5kb3csIGNvbnN0IFN0cmluZyYgdXJsKQogewogICAgIGlmICghZnJhbWUo KSkKICAgICAgICAgcmV0dXJuIHsgfTsKLSAgICByZXR1cm4gc2V0TG9jYXRpb24oYWN0aXZlV2lu ZG93LCBmaXJzdFdpbmRvdywgdXJsKTsKKyAgICByZXR1cm4gc2V0TG9jYXRpb24oaW5jdW1iZW50 V2luZG93LCBmaXJzdFdpbmRvdywgdXJsKTsKIH0KIAotRXhjZXB0aW9uT3I8dm9pZD4gTG9jYXRp b246OnNldFByb3RvY29sKERPTVdpbmRvdyYgYWN0aXZlV2luZG93LCBET01XaW5kb3cmIGZpcnN0 V2luZG93LCBjb25zdCBTdHJpbmcmIHByb3RvY29sKQorRXhjZXB0aW9uT3I8dm9pZD4gTG9jYXRp b246OnNldFByb3RvY29sKERPTVdpbmRvdyYgaW5jdW1iZW50V2luZG93LCBET01XaW5kb3cmIGZp cnN0V2luZG93LCBjb25zdCBTdHJpbmcmIHByb3RvY29sKQogewogICAgIGF1dG8qIGZyYW1lID0g dGhpcy0+ZnJhbWUoKTsKICAgICBpZiAoIWZyYW1lKQpAQCAtMTM3LDYwICsxMzcsNjAgQEAgRXhj ZXB0aW9uT3I8dm9pZD4gTG9jYXRpb246OnNldFByb3RvY29sKERPTVdpbmRvdyYgYWN0aXZlV2lu ZG93LCBET01XaW5kb3cmIGZpcnMKICAgICBVUkwgdXJsID0gZnJhbWUtPmRvY3VtZW50KCktPnVy bCgpOwogICAgIGlmICghdXJsLnNldFByb3RvY29sKHByb3RvY29sKSkKICAgICAgICAgcmV0dXJu IEV4Y2VwdGlvbiB7IFN5bnRheEVycm9yIH07Ci0gICAgcmV0dXJuIHNldExvY2F0aW9uKGFjdGl2 ZVdpbmRvdywgZmlyc3RXaW5kb3csIHVybC5zdHJpbmcoKSk7CisgICAgcmV0dXJuIHNldExvY2F0 aW9uKGluY3VtYmVudFdpbmRvdywgZmlyc3RXaW5kb3csIHVybC5zdHJpbmcoKSk7CiB9CiAKLUV4 Y2VwdGlvbk9yPHZvaWQ+IExvY2F0aW9uOjpzZXRIb3N0KERPTVdpbmRvdyYgYWN0aXZlV2luZG93 LCBET01XaW5kb3cmIGZpcnN0V2luZG93LCBjb25zdCBTdHJpbmcmIGhvc3QpCitFeGNlcHRpb25P cjx2b2lkPiBMb2NhdGlvbjo6c2V0SG9zdChET01XaW5kb3cmIGluY3VtYmVudFdpbmRvdywgRE9N V2luZG93JiBmaXJzdFdpbmRvdywgY29uc3QgU3RyaW5nJiBob3N0KQogewogICAgIGF1dG8qIGZy YW1lID0gdGhpcy0+ZnJhbWUoKTsKICAgICBpZiAoIWZyYW1lKQogICAgICAgICByZXR1cm4geyB9 OwogICAgIFVSTCB1cmwgPSBmcmFtZS0+ZG9jdW1lbnQoKS0+dXJsKCk7CiAgICAgdXJsLnNldEhv c3RBbmRQb3J0KGhvc3QpOwotICAgIHJldHVybiBzZXRMb2NhdGlvbihhY3RpdmVXaW5kb3csIGZp cnN0V2luZG93LCB1cmwuc3RyaW5nKCkpOworICAgIHJldHVybiBzZXRMb2NhdGlvbihpbmN1bWJl bnRXaW5kb3csIGZpcnN0V2luZG93LCB1cmwuc3RyaW5nKCkpOwogfQogCi1FeGNlcHRpb25Pcjx2 b2lkPiBMb2NhdGlvbjo6c2V0SG9zdG5hbWUoRE9NV2luZG93JiBhY3RpdmVXaW5kb3csIERPTVdp bmRvdyYgZmlyc3RXaW5kb3csIGNvbnN0IFN0cmluZyYgaG9zdG5hbWUpCitFeGNlcHRpb25Pcjx2 b2lkPiBMb2NhdGlvbjo6c2V0SG9zdG5hbWUoRE9NV2luZG93JiBpbmN1bWJlbnRXaW5kb3csIERP TVdpbmRvdyYgZmlyc3RXaW5kb3csIGNvbnN0IFN0cmluZyYgaG9zdG5hbWUpCiB7CiAgICAgYXV0 byogZnJhbWUgPSB0aGlzLT5mcmFtZSgpOwogICAgIGlmICghZnJhbWUpCiAgICAgICAgIHJldHVy biB7IH07CiAgICAgVVJMIHVybCA9IGZyYW1lLT5kb2N1bWVudCgpLT51cmwoKTsKICAgICB1cmwu c2V0SG9zdChob3N0bmFtZSk7Ci0gICAgcmV0dXJuIHNldExvY2F0aW9uKGFjdGl2ZVdpbmRvdywg Zmlyc3RXaW5kb3csIHVybC5zdHJpbmcoKSk7CisgICAgcmV0dXJuIHNldExvY2F0aW9uKGluY3Vt YmVudFdpbmRvdywgZmlyc3RXaW5kb3csIHVybC5zdHJpbmcoKSk7CiB9CiAKLUV4Y2VwdGlvbk9y PHZvaWQ+IExvY2F0aW9uOjpzZXRQb3J0KERPTVdpbmRvdyYgYWN0aXZlV2luZG93LCBET01XaW5k b3cmIGZpcnN0V2luZG93LCBjb25zdCBTdHJpbmcmIHBvcnRTdHJpbmcpCitFeGNlcHRpb25Pcjx2 b2lkPiBMb2NhdGlvbjo6c2V0UG9ydChET01XaW5kb3cmIGluY3VtYmVudFdpbmRvdywgRE9NV2lu ZG93JiBmaXJzdFdpbmRvdywgY29uc3QgU3RyaW5nJiBwb3J0U3RyaW5nKQogewogICAgIGF1dG8q IGZyYW1lID0gdGhpcy0+ZnJhbWUoKTsKICAgICBpZiAoIWZyYW1lKQogICAgICAgICByZXR1cm4g eyB9OwogICAgIFVSTCB1cmwgPSBmcmFtZS0+ZG9jdW1lbnQoKS0+dXJsKCk7CiAgICAgdXJsLnNl dFBvcnQocGFyc2VJbnRlZ2VyPHVpbnQxNl90Pihwb3J0U3RyaW5nKSk7Ci0gICAgcmV0dXJuIHNl dExvY2F0aW9uKGFjdGl2ZVdpbmRvdywgZmlyc3RXaW5kb3csIHVybC5zdHJpbmcoKSk7CisgICAg cmV0dXJuIHNldExvY2F0aW9uKGluY3VtYmVudFdpbmRvdywgZmlyc3RXaW5kb3csIHVybC5zdHJp bmcoKSk7CiB9CiAKLUV4Y2VwdGlvbk9yPHZvaWQ+IExvY2F0aW9uOjpzZXRQYXRobmFtZShET01X aW5kb3cmIGFjdGl2ZVdpbmRvdywgRE9NV2luZG93JiBmaXJzdFdpbmRvdywgY29uc3QgU3RyaW5n JiBwYXRobmFtZSkKK0V4Y2VwdGlvbk9yPHZvaWQ+IExvY2F0aW9uOjpzZXRQYXRobmFtZShET01X aW5kb3cmIGluY3VtYmVudFdpbmRvdywgRE9NV2luZG93JiBmaXJzdFdpbmRvdywgY29uc3QgU3Ry aW5nJiBwYXRobmFtZSkKIHsKICAgICBhdXRvKiBmcmFtZSA9IHRoaXMtPmZyYW1lKCk7CiAgICAg aWYgKCFmcmFtZSkKICAgICAgICAgcmV0dXJuIHsgfTsKICAgICBVUkwgdXJsID0gZnJhbWUtPmRv Y3VtZW50KCktPnVybCgpOwogICAgIHVybC5zZXRQYXRoKHBhdGhuYW1lKTsKLSAgICByZXR1cm4g c2V0TG9jYXRpb24oYWN0aXZlV2luZG93LCBmaXJzdFdpbmRvdywgdXJsLnN0cmluZygpKTsKKyAg ICByZXR1cm4gc2V0TG9jYXRpb24oaW5jdW1iZW50V2luZG93LCBmaXJzdFdpbmRvdywgdXJsLnN0 cmluZygpKTsKIH0KIAotRXhjZXB0aW9uT3I8dm9pZD4gTG9jYXRpb246OnNldFNlYXJjaChET01X aW5kb3cmIGFjdGl2ZVdpbmRvdywgRE9NV2luZG93JiBmaXJzdFdpbmRvdywgY29uc3QgU3RyaW5n JiBzZWFyY2gpCitFeGNlcHRpb25Pcjx2b2lkPiBMb2NhdGlvbjo6c2V0U2VhcmNoKERPTVdpbmRv dyYgaW5jdW1iZW50V2luZG93LCBET01XaW5kb3cmIGZpcnN0V2luZG93LCBjb25zdCBTdHJpbmcm IHNlYXJjaCkKIHsKICAgICBhdXRvKiBmcmFtZSA9IHRoaXMtPmZyYW1lKCk7CiAgICAgaWYgKCFm cmFtZSkKICAgICAgICAgcmV0dXJuIHsgfTsKICAgICBVUkwgdXJsID0gZnJhbWUtPmRvY3VtZW50 KCktPnVybCgpOwogICAgIHVybC5zZXRRdWVyeShzZWFyY2gpOwotICAgIHJldHVybiBzZXRMb2Nh dGlvbihhY3RpdmVXaW5kb3csIGZpcnN0V2luZG93LCB1cmwuc3RyaW5nKCkpOworICAgIHJldHVy biBzZXRMb2NhdGlvbihpbmN1bWJlbnRXaW5kb3csIGZpcnN0V2luZG93LCB1cmwuc3RyaW5nKCkp OwogfQogCi1FeGNlcHRpb25Pcjx2b2lkPiBMb2NhdGlvbjo6c2V0SGFzaChET01XaW5kb3cmIGFj dGl2ZVdpbmRvdywgRE9NV2luZG93JiBmaXJzdFdpbmRvdywgY29uc3QgU3RyaW5nJiBoYXNoKQor RXhjZXB0aW9uT3I8dm9pZD4gTG9jYXRpb246OnNldEhhc2goRE9NV2luZG93JiBpbmN1bWJlbnRX aW5kb3csIERPTVdpbmRvdyYgZmlyc3RXaW5kb3csIGNvbnN0IFN0cmluZyYgaGFzaCkKIHsKICAg ICBhdXRvKiBmcmFtZSA9IHRoaXMtPmZyYW1lKCk7CiAgICAgaWYgKCFmcmFtZSkKQEAgLTIwNywx NyArMjA3LDE3IEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IExvY2F0aW9uOjpzZXRIYXNoKERPTVdpbmRv dyYgYWN0aXZlV2luZG93LCBET01XaW5kb3cmIGZpcnN0V2luCiAgICAgLy8gY2FzZXMgd2hlcmUg ZnJhZ21lbnQgaWRlbnRpZmllcnMgYXJlIGlnbm9yZWQgb3IgaW52YWxpZC4gCiAgICAgaWYgKGVx dWFsSWdub3JpbmdOdWxsaXR5KG9sZEZyYWdtZW50SWRlbnRpZmllciwgdXJsLmZyYWdtZW50SWRl bnRpZmllcigpKSkKICAgICAgICAgcmV0dXJuIHsgfTsKLSAgICByZXR1cm4gc2V0TG9jYXRpb24o YWN0aXZlV2luZG93LCBmaXJzdFdpbmRvdywgdXJsLnN0cmluZygpKTsKKyAgICByZXR1cm4gc2V0 TG9jYXRpb24oaW5jdW1iZW50V2luZG93LCBmaXJzdFdpbmRvdywgdXJsLnN0cmluZygpKTsKIH0K IAotRXhjZXB0aW9uT3I8dm9pZD4gTG9jYXRpb246OmFzc2lnbihET01XaW5kb3cmIGFjdGl2ZVdp bmRvdywgRE9NV2luZG93JiBmaXJzdFdpbmRvdywgY29uc3QgU3RyaW5nJiB1cmwpCitFeGNlcHRp b25Pcjx2b2lkPiBMb2NhdGlvbjo6YXNzaWduKERPTVdpbmRvdyYgaW5jdW1iZW50V2luZG93LCBE T01XaW5kb3cmIGZpcnN0V2luZG93LCBjb25zdCBTdHJpbmcmIHVybCkKIHsKICAgICBpZiAoIWZy YW1lKCkpCiAgICAgICAgIHJldHVybiB7IH07Ci0gICAgcmV0dXJuIHNldExvY2F0aW9uKGFjdGl2 ZVdpbmRvdywgZmlyc3RXaW5kb3csIHVybCk7CisgICAgcmV0dXJuIHNldExvY2F0aW9uKGluY3Vt YmVudFdpbmRvdywgZmlyc3RXaW5kb3csIHVybCk7CiB9CiAKLUV4Y2VwdGlvbk9yPHZvaWQ+IExv Y2F0aW9uOjpyZXBsYWNlKERPTVdpbmRvdyYgYWN0aXZlV2luZG93LCBET01XaW5kb3cmIGZpcnN0 V2luZG93LCBjb25zdCBTdHJpbmcmIHVybFN0cmluZykKK0V4Y2VwdGlvbk9yPHZvaWQ+IExvY2F0 aW9uOjpyZXBsYWNlKERPTVdpbmRvdyYgaW5jdW1iZW50V2luZG93LCBET01XaW5kb3cmIGZpcnN0 V2luZG93LCBjb25zdCBTdHJpbmcmIHVybFN0cmluZykKIHsKICAgICBhdXRvKiBmcmFtZSA9IHRo aXMtPmZyYW1lKCk7CiAgICAgaWYgKCFmcmFtZSkKQEAgLTIzNCwyMSArMjM0LDIxIEBAIEV4Y2Vw dGlvbk9yPHZvaWQ+IExvY2F0aW9uOjpyZXBsYWNlKERPTVdpbmRvdyYgYWN0aXZlV2luZG93LCBE T01XaW5kb3cmIGZpcnN0V2luCiAgICAgICAgIHJldHVybiBFeGNlcHRpb24geyBTeW50YXhFcnJv ciB9OwogCiAgICAgLy8gV2UgY2FsbCBET01XaW5kb3c6OnNldExvY2F0aW9uIGRpcmVjdGx5IGhl cmUgYmVjYXVzZSByZXBsYWNlKCkgYWx3YXlzIG9wZXJhdGVzIG9uIHRoZSBjdXJyZW50IGZyYW1l LgotICAgIGZyYW1lLT5kb2N1bWVudCgpLT5kb21XaW5kb3coKS0+c2V0TG9jYXRpb24oYWN0aXZl V2luZG93LCBjb21wbGV0ZWRVUkwsIExvY2tIaXN0b3J5QW5kQmFja0ZvcndhcmRMaXN0KTsKKyAg ICBmcmFtZS0+ZG9jdW1lbnQoKS0+ZG9tV2luZG93KCktPnNldExvY2F0aW9uKGluY3VtYmVudFdp bmRvdywgY29tcGxldGVkVVJMLCBMb2NrSGlzdG9yeUFuZEJhY2tGb3J3YXJkTGlzdCk7CiAgICAg cmV0dXJuIHsgfTsKIH0KIAotdm9pZCBMb2NhdGlvbjo6cmVsb2FkKERPTVdpbmRvdyYgYWN0aXZl V2luZG93KQordm9pZCBMb2NhdGlvbjo6cmVsb2FkKERPTVdpbmRvdyYgaW5jdW1iZW50V2luZG93 KQogewogICAgIGF1dG8qIGZyYW1lID0gdGhpcy0+ZnJhbWUoKTsKICAgICBpZiAoIWZyYW1lKQog ICAgICAgICByZXR1cm47CiAKLSAgICBBU1NFUlQoYWN0aXZlV2luZG93LmRvY3VtZW50KCkpOwor ICAgIEFTU0VSVChpbmN1bWJlbnRXaW5kb3cuZG9jdW1lbnQoKSk7CiAgICAgQVNTRVJUKGZyYW1l LT5kb2N1bWVudCgpKTsKICAgICBBU1NFUlQoZnJhbWUtPmRvY3VtZW50KCktPmRvbVdpbmRvdygp KTsKIAotICAgIGF1dG8mIGFjdGl2ZURvY3VtZW50ID0gKmFjdGl2ZVdpbmRvdy5kb2N1bWVudCgp OworICAgIGF1dG8mIGFjdGl2ZURvY3VtZW50ID0gKmluY3VtYmVudFdpbmRvdy5kb2N1bWVudCgp OwogICAgIGF1dG8mIHRhcmdldERvY3VtZW50ID0gKmZyYW1lLT5kb2N1bWVudCgpOwogCiAgICAg Ly8gRklYTUU6IEl0J3Mgbm90IGNsZWFyIHRoaXMgY3Jvc3Mtb3JpZ2luIHNlY3VyaXR5IGNoZWNr IGlzIHZhbHVhYmxlLgpAQCAtMjU2LDcgKzI1Niw3IEBAIHZvaWQgTG9jYXRpb246OnJlbG9hZChE T01XaW5kb3cmIGFjdGl2ZVdpbmRvdykKICAgICAvLyBPdGhlciBsb2NhdGlvbiBvcGVyYXRpb25z IHNpbXBseSBibG9jayB1c2Ugb2YgSmF2YVNjcmlwdCBVUkxzIGNyb3NzIG9yaWdpbi4KICAgICBp ZiAoIWFjdGl2ZURvY3VtZW50LnNlY3VyaXR5T3JpZ2luKCkuaXNTYW1lT3JpZ2luRG9tYWluKHRh cmdldERvY3VtZW50LnNlY3VyaXR5T3JpZ2luKCkpKSB7CiAgICAgICAgIGF1dG8mIHRhcmdldFdp bmRvdyA9ICp0YXJnZXREb2N1bWVudC5kb21XaW5kb3coKTsKLSAgICAgICAgdGFyZ2V0V2luZG93 LnByaW50RXJyb3JNZXNzYWdlKHRhcmdldFdpbmRvdy5jcm9zc0RvbWFpbkFjY2Vzc0Vycm9yTWVz c2FnZShhY3RpdmVXaW5kb3csIEluY2x1ZGVUYXJnZXRPcmlnaW46OlllcykpOworICAgICAgICB0 YXJnZXRXaW5kb3cucHJpbnRFcnJvck1lc3NhZ2UodGFyZ2V0V2luZG93LmNyb3NzRG9tYWluQWNj ZXNzRXJyb3JNZXNzYWdlKGluY3VtYmVudFdpbmRvdywgSW5jbHVkZVRhcmdldE9yaWdpbjo6WWVz KSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTI2Niw3ICsyNjYsNyBAQCB2b2lkIExv Y2F0aW9uOjpyZWxvYWQoRE9NV2luZG93JiBhY3RpdmVXaW5kb3cpCiAgICAgZnJhbWUtPm5hdmln YXRpb25TY2hlZHVsZXIoKS5zY2hlZHVsZVJlZnJlc2goYWN0aXZlRG9jdW1lbnQpOwogfQogCi1F eGNlcHRpb25Pcjx2b2lkPiBMb2NhdGlvbjo6c2V0TG9jYXRpb24oRE9NV2luZG93JiBhY3RpdmVX aW5kb3csIERPTVdpbmRvdyYgZmlyc3RXaW5kb3csIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nKQor RXhjZXB0aW9uT3I8dm9pZD4gTG9jYXRpb246OnNldExvY2F0aW9uKERPTVdpbmRvdyYgaW5jdW1i ZW50V2luZG93LCBET01XaW5kb3cmIGZpcnN0V2luZG93LCBjb25zdCBTdHJpbmcmIHVybFN0cmlu ZykKIHsKICAgICBhdXRvKiBmcmFtZSA9IHRoaXMtPmZyYW1lKCk7CiAgICAgQVNTRVJUKGZyYW1l KTsKQEAgLTI3NSwxNyArMjc1LDIxIEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IExvY2F0aW9uOjpzZXRM b2NhdGlvbihET01XaW5kb3cmIGFjdGl2ZVdpbmRvdywgRE9NV2luZG93JiBmaXJzCiAgICAgaWYg KCFmaXJzdEZyYW1lIHx8ICFmaXJzdEZyYW1lLT5kb2N1bWVudCgpKQogICAgICAgICByZXR1cm4g eyB9OwogCisgICAgLy8gRklYTUU6IFVzaW5nIGZpcnN0V2luZG93IHRvIGNvbXBsZXRlIHRoZSBV UkwgaXMgd3JvbmcuIFBlciB0aGUgc3BlY2lmaWNhdGlvbiwgd2Ugc2hvdWxkIGJlIHVzaW5nIHRo ZSBlbnRyeSB3aW5kb3c6CisgICAgLy8gaHR0cHM6Ly9odG1sLnNwZWMud2hhdHdnLm9yZy8jZW50 cnktc2V0dGluZ3Mtb2JqZWN0CisgICAgLy8gQmxpbmsgc2VlbXMgdG8gYmUgdXNpbmcgdjgncyBH ZXRFbnRlcmVkT3JNaWNyb3Rhc2tDb250ZXh0KCkuCiAgICAgVVJMIGNvbXBsZXRlZFVSTCA9IGZp cnN0RnJhbWUtPmRvY3VtZW50KCktPmNvbXBsZXRlVVJMKHVybFN0cmluZyk7CisKICAgICAvLyBG SVhNRTogVGhlIHNwZWNpZmljYXRpb24gc2F5cyB0byB0aHJvdyBhIFN5bnRheEVycm9yIGlmIHRo ZSBVUkwgaXMgbm90IHZhbGlkLgogICAgIGlmIChjb21wbGV0ZWRVUkwuaXNOdWxsKCkpCiAgICAg ICAgIHJldHVybiB7IH07CiAKLSAgICBpZiAoIWFjdGl2ZVdpbmRvdy5kb2N1bWVudCgpLT5jYW5O YXZpZ2F0ZShmcmFtZSwgY29tcGxldGVkVVJMKSkKKyAgICBpZiAoIWluY3VtYmVudFdpbmRvdy5k b2N1bWVudCgpLT5jYW5OYXZpZ2F0ZShmcmFtZSwgY29tcGxldGVkVVJMKSkKICAgICAgICAgcmV0 dXJuIEV4Y2VwdGlvbiB7IFNlY3VyaXR5RXJyb3IgfTsKIAogICAgIEFTU0VSVChmcmFtZS0+ZG9j dW1lbnQoKSk7CiAgICAgQVNTRVJUKGZyYW1lLT5kb2N1bWVudCgpLT5kb21XaW5kb3coKSk7Ci0g ICAgZnJhbWUtPmRvY3VtZW50KCktPmRvbVdpbmRvdygpLT5zZXRMb2NhdGlvbihhY3RpdmVXaW5k b3csIGNvbXBsZXRlZFVSTCk7CisgICAgZnJhbWUtPmRvY3VtZW50KCktPmRvbVdpbmRvdygpLT5z ZXRMb2NhdGlvbihpbmN1bWJlbnRXaW5kb3csIGNvbXBsZXRlZFVSTCk7CiAgICAgcmV0dXJuIHsg fTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Mb2NhdGlvbi5oIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9Mb2NhdGlvbi5oCmluZGV4IDQ5ZGJmNzUxMmJiYjFhOTJhNmYzOTIw MjNmZWU4MGU3Y2VlYzZjNjMuLmI3OWY4NGI2ZDA2MzE4Mzc2NzA1ODJkOWZiZTNiYzlmMjlmYzJj NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTG9jYXRpb24uaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0xvY2F0aW9uLmgKQEAgLTQyLDI2ICs0MiwyNiBAQCBjbGFzcyBMb2Nh dGlvbiBmaW5hbCA6IHB1YmxpYyBTY3JpcHRXcmFwcGFibGUsIHB1YmxpYyBSZWZDb3VudGVkPExv Y2F0aW9uPiwgcHVibAogcHVibGljOgogICAgIHN0YXRpYyBSZWY8TG9jYXRpb24+IGNyZWF0ZShE T01XaW5kb3cmIHdpbmRvdykgeyByZXR1cm4gYWRvcHRSZWYoKm5ldyBMb2NhdGlvbih3aW5kb3cp KTsgfQogCi0gICAgRXhjZXB0aW9uT3I8dm9pZD4gc2V0SHJlZihET01XaW5kb3cmIGFjdGl2ZVdp bmRvdywgRE9NV2luZG93JiBmaXJzdFdpbmRvdywgY29uc3QgU3RyaW5nJik7CisgICAgRXhjZXB0 aW9uT3I8dm9pZD4gc2V0SHJlZihET01XaW5kb3cmIGluY3VtYmVudFdpbmRvdywgRE9NV2luZG93 JiBmaXJzdFdpbmRvdywgY29uc3QgU3RyaW5nJik7CiAgICAgU3RyaW5nIGhyZWYoKSBjb25zdDsK IAotICAgIEV4Y2VwdGlvbk9yPHZvaWQ+IGFzc2lnbihET01XaW5kb3cmIGFjdGl2ZVdpbmRvdywg RE9NV2luZG93JiBmaXJzdFdpbmRvdywgY29uc3QgU3RyaW5nJik7Ci0gICAgRXhjZXB0aW9uT3I8 dm9pZD4gcmVwbGFjZShET01XaW5kb3cmIGFjdGl2ZVdpbmRvdywgRE9NV2luZG93JiBmaXJzdFdp bmRvdywgY29uc3QgU3RyaW5nJik7Ci0gICAgdm9pZCByZWxvYWQoRE9NV2luZG93JiBhY3RpdmVX aW5kb3cpOworICAgIEV4Y2VwdGlvbk9yPHZvaWQ+IGFzc2lnbihET01XaW5kb3cmIGluY3VtYmVu dFdpbmRvdywgRE9NV2luZG93JiBmaXJzdFdpbmRvdywgY29uc3QgU3RyaW5nJik7CisgICAgRXhj ZXB0aW9uT3I8dm9pZD4gcmVwbGFjZShET01XaW5kb3cmIGluY3VtYmVudFdpbmRvdywgRE9NV2lu ZG93JiBmaXJzdFdpbmRvdywgY29uc3QgU3RyaW5nJik7CisgICAgdm9pZCByZWxvYWQoRE9NV2lu ZG93JiBpbmN1bWJlbnRXaW5kb3cpOwogCi0gICAgRXhjZXB0aW9uT3I8dm9pZD4gc2V0UHJvdG9j b2woRE9NV2luZG93JiBhY3RpdmVXaW5kb3csIERPTVdpbmRvdyYgZmlyc3RXaW5kb3csIGNvbnN0 IFN0cmluZyYpOworICAgIEV4Y2VwdGlvbk9yPHZvaWQ+IHNldFByb3RvY29sKERPTVdpbmRvdyYg aW5jdW1iZW50V2luZG93LCBET01XaW5kb3cmIGZpcnN0V2luZG93LCBjb25zdCBTdHJpbmcmKTsK ICAgICBTdHJpbmcgcHJvdG9jb2woKSBjb25zdDsKLSAgICBFeGNlcHRpb25Pcjx2b2lkPiBzZXRI b3N0KERPTVdpbmRvdyYgYWN0aXZlV2luZG93LCBET01XaW5kb3cmIGZpcnN0V2luZG93LCBjb25z dCBTdHJpbmcmKTsKKyAgICBFeGNlcHRpb25Pcjx2b2lkPiBzZXRIb3N0KERPTVdpbmRvdyYgaW5j dW1iZW50V2luZG93LCBET01XaW5kb3cmIGZpcnN0V2luZG93LCBjb25zdCBTdHJpbmcmKTsKICAg ICBXRUJDT1JFX0VYUE9SVCBTdHJpbmcgaG9zdCgpIGNvbnN0OwotICAgIEV4Y2VwdGlvbk9yPHZv aWQ+IHNldEhvc3RuYW1lKERPTVdpbmRvdyYgYWN0aXZlV2luZG93LCBET01XaW5kb3cmIGZpcnN0 V2luZG93LCBjb25zdCBTdHJpbmcmKTsKKyAgICBFeGNlcHRpb25Pcjx2b2lkPiBzZXRIb3N0bmFt ZShET01XaW5kb3cmIGluY3VtYmVudFdpbmRvdywgRE9NV2luZG93JiBmaXJzdFdpbmRvdywgY29u c3QgU3RyaW5nJik7CiAgICAgU3RyaW5nIGhvc3RuYW1lKCkgY29uc3Q7Ci0gICAgRXhjZXB0aW9u T3I8dm9pZD4gc2V0UG9ydChET01XaW5kb3cmIGFjdGl2ZVdpbmRvdywgRE9NV2luZG93JiBmaXJz dFdpbmRvdywgY29uc3QgU3RyaW5nJik7CisgICAgRXhjZXB0aW9uT3I8dm9pZD4gc2V0UG9ydChE T01XaW5kb3cmIGluY3VtYmVudFdpbmRvdywgRE9NV2luZG93JiBmaXJzdFdpbmRvdywgY29uc3Qg U3RyaW5nJik7CiAgICAgU3RyaW5nIHBvcnQoKSBjb25zdDsKLSAgICBFeGNlcHRpb25Pcjx2b2lk PiBzZXRQYXRobmFtZShET01XaW5kb3cmIGFjdGl2ZVdpbmRvdywgRE9NV2luZG93JiBmaXJzdFdp bmRvdywgY29uc3QgU3RyaW5nJik7CisgICAgRXhjZXB0aW9uT3I8dm9pZD4gc2V0UGF0aG5hbWUo RE9NV2luZG93JiBpbmN1bWJlbnRXaW5kb3csIERPTVdpbmRvdyYgZmlyc3RXaW5kb3csIGNvbnN0 IFN0cmluZyYpOwogICAgIFN0cmluZyBwYXRobmFtZSgpIGNvbnN0OwotICAgIEV4Y2VwdGlvbk9y PHZvaWQ+IHNldFNlYXJjaChET01XaW5kb3cmIGFjdGl2ZVdpbmRvdywgRE9NV2luZG93JiBmaXJz dFdpbmRvdywgY29uc3QgU3RyaW5nJik7CisgICAgRXhjZXB0aW9uT3I8dm9pZD4gc2V0U2VhcmNo KERPTVdpbmRvdyYgaW5jdW1iZW50V2luZG93LCBET01XaW5kb3cmIGZpcnN0V2luZG93LCBjb25z dCBTdHJpbmcmKTsKICAgICBTdHJpbmcgc2VhcmNoKCkgY29uc3Q7Ci0gICAgRXhjZXB0aW9uT3I8 dm9pZD4gc2V0SGFzaChET01XaW5kb3cmIGFjdGl2ZVdpbmRvdywgRE9NV2luZG93JiBmaXJzdFdp bmRvdywgY29uc3QgU3RyaW5nJik7CisgICAgRXhjZXB0aW9uT3I8dm9pZD4gc2V0SGFzaChET01X aW5kb3cmIGluY3VtYmVudFdpbmRvdywgRE9NV2luZG93JiBmaXJzdFdpbmRvdywgY29uc3QgU3Ry aW5nJik7CiAgICAgU3RyaW5nIGhhc2goKSBjb25zdDsKICAgICBTdHJpbmcgb3JpZ2luKCkgY29u c3Q7CiAKQEAgLTcyLDcgKzcyLDcgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBleHBsaWNpdCBM b2NhdGlvbihET01XaW5kb3cmKTsKIAotICAgIEV4Y2VwdGlvbk9yPHZvaWQ+IHNldExvY2F0aW9u KERPTVdpbmRvdyYgYWN0aXZlV2luZG93LCBET01XaW5kb3cmIGZpcnN0V2luZG93LCBjb25zdCBT dHJpbmcmKTsKKyAgICBFeGNlcHRpb25Pcjx2b2lkPiBzZXRMb2NhdGlvbihET01XaW5kb3cmIGlu Y3VtYmVudFdpbmRvdywgRE9NV2luZG93JiBmaXJzdFdpbmRvdywgY29uc3QgU3RyaW5nJik7CiAK ICAgICBjb25zdCBVUkwmIHVybCgpIGNvbnN0OwogfTsK