235035 2022-01-10 10:25:40 -0800 Add support for a -shouldWrap property when injecting Live Text 2022-01-10 18:18:23 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh akeerthi bdakin cdumez esprehn+autocc ews-watchlist hi kangil.han megan_gardner thorton webkit-bug-importer oldest_to_newest 1829528 0 wenson_hsieh 2022-01-10 10:25:40 -0800 rdar://85139146 1829578 1 448782 wenson_hsieh 2022-01-10 11:48:35 -0800 Created attachment 448782 Patch 1829604 2 448790 wenson_hsieh 2022-01-10 12:59:05 -0800 Created attachment 448790 Fix iOS build 1829656 3 448790 wenson_hsieh 2022-01-10 15:41:45 -0800 Comment on attachment 448790 Fix iOS build Thanks for taking a look! 1829658 4 ews-feeder 2022-01-10 15:49:50 -0800 Committed r287863 (245907@main): <https://commits.webkit.org/245907@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 448790. 1829685 5 wenson_hsieh 2022-01-10 17:05:23 -0800 Reopening to attach new patch. 1829686 6 448815 wenson_hsieh 2022-01-10 17:05:25 -0800 Created attachment 448815 Followup 1829708 7 ews-feeder 2022-01-10 18:18:19 -0800 Committed r287866 (245910@main): <https://commits.webkit.org/245910@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 448815. 448782 2022-01-10 11:48:35 -0800 2022-01-10 13:38:12 -0800 Patch bug-235035-20220110114834.patch text/plain 16258 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3ODI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGE0NGVmMzk4OTgzMDIy YzI0ZWNiNGM3OWFhZTY5MjA1NTE1N2Q2ZC4uNTkwOGQwYjY3YTc3NDM4OWE5NzY2Y2NmYzY0NDFm ODljMDFhZmEzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIyLTAxLTEwICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBzdXBwb3J0 IGZvciBhIC1zaG91bGRXcmFwIHByb3BlcnR5IHdoZW4gaW5qZWN0aW5nIExpdmUgVGV4dAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1MDM1CisgICAg ICAgIHJkYXI6Ly84NTEzOTE0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZCBzdXBwb3J0IGZvciBhIG5ldyBwcm9wZXJ0eSBvbiBWS1dLTGluZUlu Zm8gdG8gaW5kaWNhdGUgd2hldGhlciBvciBub3QgdGhlIGxpbmUgc2hvdWxkIHdyYXAuIElmIHNl dCB0byB0cnVlLAorICAgICAgICB3ZSB3aWxsIGF2b2lkIGFkZGluZyBhIGBicmAgZWxlbWVudCBh dCB0aGUgZW5kIG9mIHRoZSBgZGl2LmltYWdlLW92ZXJsYXktbGluZWAgdGhhdCBjb3JyZXNwb25k cyB0byB0aGUgbGluZSBvZgorICAgICAgICByZWNvZ25pemVkIHRleHQgaW4gdGhlIGltYWdlIG92 ZXJsYXk7IGN1cnJlbnRseSwgd2UgYWx3YXlzIGFkZCB0aGlzIHRyYWlsaW5nIGBicmAuCisKKyAg ICAgICAgVGVzdDogZmFzdC9pbWFnZXMvdGV4dC1yZWNvZ25pdGlvbi9pbWFnZS1vdmVybGF5LWxp bmUtd3JhcHBpbmcuaHRtbAorCisgICAgICAgICogZG9tL0ltYWdlT3ZlcmxheS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJbWFnZU92ZXJsYXk6OnVwZGF0ZVN1YnRyZWUpOgorCisgICAgICAgIENv bnN1bHQgdGhlIGZsYWcgd2hlbiBjb252ZXJ0aW5nIGVhY2ggVGV4dFJlY29nbml0aW9uTGluZURh dGEgaW50byBzaGFkb3cgRE9NIGVsZW1lbnRzLgorCisgICAgICAgICogcGxhdGZvcm0vVGV4dFJl Y29nbml0aW9uUmVzdWx0Lmg6CisKKyAgICAgICAgQWRkIHRoZSBuZXcgYm9vbGVhbiBmbGFnIHRv IFRleHRSZWNvZ25pdGlvbkxpbmVEYXRhLCBhbmQgYWRkIGVuY29kaW5nL2RlY29kaW5nIHN1cHBv cnQuCisKKyAgICAgICAgKFdlYkNvcmU6OlRleHRSZWNvZ25pdGlvbkxpbmVEYXRhOjpUZXh0UmVj b2duaXRpb25MaW5lRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0UmVjb2duaXRpb25MaW5l RGF0YTo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlRleHRSZWNvZ25pdGlvbkxp bmVEYXRhOjpkZWNvZGUpOgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6Om1ha2VEYXRhRm9yTGluZSk6CisKKyAgICAgICAgQWRkIGEgd2F5IHRvIHNw ZWNpZnkgYSB2YWx1ZSBmb3IgYHNob3VsZFdyYXBgLCB3aGVuIHVzaW5nIGBpbnRlcm5hbHNgIHRv IGluamVjdCBpbWFnZSBvdmVybGF5IGNvbnRlbnQgaW4gbGF5b3V0CisgICAgICAgIGFuZCBBUEkg dGVzdHMuCisKKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5oOgorICAgICAgICAqIHRlc3Rp bmcvSW50ZXJuYWxzLmlkbDoKKwogMjAyMi0wMS0xMCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hz aWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBNb2RhbCBjb250YWluZXIgb2JzZXJ2ZXIgc2hvdWxk IGNsYXNzaWZ5IGVsZW1lbnRzIHRoYXQgYXJlIHN0eWxlZCBsaWtlIGNsaWNrYWJsZSBjb250cm9s cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJD b3JlL1BBTC9DaGFuZ2VMb2cKaW5kZXggMDk4NWFkMDZmMjc5NDkzNjg1MTI2ZTE2Y2UyMjAxOGY0 NTU0ZDA5OC4uN2Q0MzI4ZjRhOWIyMTZlNjNiMGRmNTlmYjRmMTA5NjEwZDgxYWRlMSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9Q QUwvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjItMDEtMTAgIFdlbnNvbiBIc2llaCAg PHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIHN1cHBvcnQgZm9yIGEgLXNo b3VsZFdyYXAgcHJvcGVydHkgd2hlbiBpbmplY3RpbmcgTGl2ZSBUZXh0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUwMzUKKyAgICAgICAgcmRhcjov Lzg1MTM5MTQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQWRkIGEgZm9yd2FyZCBzdGFnaW5nIGRlY2xhcmF0aW9uIGZvciB0aGUgbmV3IFNQSSBwcm9w ZXJ0eS4KKworICAgICAgICAqIHBhbC9zcGkvY29jb2EvVmlzaW9uS2l0Q29yZVNQSS5oOgorCiAy MDIyLTAxLTA3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyODc2OTguCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGZlZWFh YjhiYWY3ODcyZTQzYzU2MDA2MTEyY2Q4OTU3ODVmZDRlNjQuLjlkYTliMDM2YWEwNGUyMmQyMTk4 NjdhZWUwMGI0NWRlYjZmNDFlNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjItMDEt MTAgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgQWRk IHN1cHBvcnQgZm9yIGEgLXNob3VsZFdyYXAgcHJvcGVydHkgd2hlbiBpbmplY3RpbmcgTGl2ZSBU ZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUw MzUKKyAgICAgICAgcmRhcjovLzg1MTM5MTQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQ29uc3VsdCB0aGUgbmV3IFNQSSBwcm9wZXJ0eSAoYmVoaW5k IGEgcnVudGltZSBzZWxlY3RvciBjaGVjayksIGFuZCBwYXNzIHRoZSBib29sZWFuIGZsYWcgdGhy b3VnaCB0aGUKKyAgICAgICAgVGV4dFJlY29nbml0aW9uUmVzdWx0LgorCisgICAgICAgICogUGxh dGZvcm0vY29jb2EvVGV4dFJlY29nbml0aW9uVXRpbGl0aWVzLm1tOgorICAgICAgICAoV2ViS2l0 OjptYWtlVGV4dFJlY29nbml0aW9uUmVzdWx0KToKKwogMjAyMi0wMS0wOCAgVHlsZXIgV2lsY29j ayAgPHR5bGVyX3dAYXBwbGUuY29tPgogCiAgICAgICAgIEFYOiBBY2Nlc3NpYmlsaXR5T2JqZWN0 OjpzZXRGb2N1c2VkKHRydWUpIHNob3VsZCBtYWtlIHRoZSB3ZWJwYWdlIGZvY3VzZWQsIGFuZCBt YWtlIHdlYiBjb250ZW50IHRoZSBmaXJzdCByZXNwb25kZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL1Zpc2lvbktpdENvcmVTUEkuaCBiL1NvdXJjZS9XZWJD b3JlL1BBTC9wYWwvc3BpL2NvY29hL1Zpc2lvbktpdENvcmVTUEkuaAppbmRleCA5MGVhNzQ3NjQx Y2VhZjhiMzVlYTNiZWU2NGY2NDM0ZWUzZjE0YmM5Li44ODU1NTVlNTg2ZDFlZDA1Njc4Y2RlYTEz MjkzNzg5MTNlMjU3ODE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9j b2NvYS9WaXNpb25LaXRDb3JlU1BJLmgKKysrIGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkv Y29jb2EvVmlzaW9uS2l0Q29yZVNQSS5oCkBAIC0xNDYsNiArMTQ2LDEwIEBAIE5TX0FTU1VNRV9O T05OVUxMX0VORAogCiAjZW5kaWYKIAorQGludGVyZmFjZSBWS1dLTGluZUluZm8gKFN0YWdpbmdf ODUxMzkxMDEpCitAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIEJPT0wgc2hvdWxkV3Jh cDsKK0BlbmQKKwogI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCiAjaW5jbHVkZSA8V2ViS2l0 QWRkaXRpb25zL1Zpc2lvbktpdENvcmVTUElBZGRpdGlvbnMuaD4KICNlbmRpZgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvZG9tL0ltYWdlT3ZlcmxheS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9k b20vSW1hZ2VPdmVybGF5LmNwcAppbmRleCA5ZGI1ZWEwZjRkNjdjMDM4OTRhOGE0Y2QyMjY3Y2Ez ZDU2Njg5YWI4Li44NmQ1OWE5YmE3ZjBjZmIyZWUzMjhjMzY0ZDVhYmUxMWQyY2Y4NzRlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vSW1hZ2VPdmVybGF5LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9kb20vSW1hZ2VPdmVybGF5LmNwcApAQCAtMTkyLDYgKzE5Miw3IEBAIEludFJlY3Qg Y29udGFpbmVyUmVjdChIVE1MRWxlbWVudCYgZWxlbWVudCkKIHN0cnVjdCBMaW5lRWxlbWVudHMg ewogICAgIFJlZjxIVE1MRGl2RWxlbWVudD4gbGluZTsKICAgICBWZWN0b3I8UmVmPEhUTUxFbGVt ZW50Pj4gY2hpbGRyZW47CisgICAgUmVmUHRyPEhUTUxCUkVsZW1lbnQ+IGxpbmVCcmVhazsKIH07 CiAKIHN0cnVjdCBFbGVtZW50cyB7CkBAIC0yNTMsMTAgKzI1NCwxMCBAQCBzdGF0aWMgRWxlbWVu dHMgdXBkYXRlU3VidHJlZShIVE1MRWxlbWVudCYgZWxlbWVudCwgY29uc3QgVGV4dFJlY29nbml0 aW9uUmVzdWx0JgogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBBU1NFUlQoY2xhc3Nlcy5j b250YWlucyhpbWFnZU92ZXJsYXlMaW5lQ2xhc3MoKSkpOwotICAgICAgICAgICAgTGluZUVsZW1l bnRzIGxpbmVFbGVtZW50cyB7IGNoaWxkRWxlbWVudCwgeyB9IH07CisgICAgICAgICAgICBWZWN0 b3I8UmVmPEhUTUxFbGVtZW50Pj4gbGluZUNoaWxkcmVuOwogICAgICAgICAgICAgZm9yIChhdXRv JiB0ZXh0IDogY2hpbGRyZW5PZlR5cGU8SFRNTERpdkVsZW1lbnQ+KGNoaWxkRWxlbWVudCkpCi0g ICAgICAgICAgICAgICAgbGluZUVsZW1lbnRzLmNoaWxkcmVuLmFwcGVuZCh0ZXh0KTsKLSAgICAg ICAgICAgIGVsZW1lbnRzLmxpbmVzLmFwcGVuZChXVEZNb3ZlKGxpbmVFbGVtZW50cykpOworICAg ICAgICAgICAgICAgIGxpbmVDaGlsZHJlbi5hcHBlbmQodGV4dCk7CisgICAgICAgICAgICBlbGVt ZW50cy5saW5lcy5hcHBlbmQoeyBjaGlsZEVsZW1lbnQsIFdURk1vdmUobGluZUNoaWxkcmVuKSwg Y2hpbGRyZW5PZlR5cGU8SFRNTEJSRWxlbWVudD4oY2hpbGRFbGVtZW50KS5maXJzdCgpIH0pOwog ICAgICAgICB9CiAKICAgICAgICAgYm9vbCBjYW5Vc2VFeGlzdGluZ0VsZW1lbnRzID0gKFsmXSB7 CkBAIC0yNzAsOCArMjcxLDE0IEBAIHN0YXRpYyBFbGVtZW50cyB1cGRhdGVTdWJ0cmVlKEhUTUxF bGVtZW50JiBlbGVtZW50LCBjb25zdCBUZXh0UmVjb2duaXRpb25SZXN1bHQmCiAgICAgICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgICAgICAgICBmb3IgKHNpemVfdCBsaW5lSW5kZXgg PSAwOyBsaW5lSW5kZXggPCByZXN1bHQubGluZXMuc2l6ZSgpOyArK2xpbmVJbmRleCkgewotICAg ICAgICAgICAgICAgIGF1dG8mIGNoaWxkUmVzdWx0cyA9IHJlc3VsdC5saW5lc1tsaW5lSW5kZXhd LmNoaWxkcmVuOwotICAgICAgICAgICAgICAgIGF1dG8mIGNoaWxkVGV4dEVsZW1lbnRzID0gZWxl bWVudHMubGluZXNbbGluZUluZGV4XS5jaGlsZHJlbjsKKyAgICAgICAgICAgICAgICBhdXRvJiBs aW5lUmVzdWx0ID0gcmVzdWx0LmxpbmVzW2xpbmVJbmRleF07CisgICAgICAgICAgICAgICAgYXV0 byYgY2hpbGRSZXN1bHRzID0gbGluZVJlc3VsdC5jaGlsZHJlbjsKKworICAgICAgICAgICAgICAg IGF1dG8mIGxpbmVFbGVtZW50cyA9IGVsZW1lbnRzLmxpbmVzW2xpbmVJbmRleF07CisgICAgICAg ICAgICAgICAgYXV0byYgY2hpbGRUZXh0RWxlbWVudHMgPSBsaW5lRWxlbWVudHMuY2hpbGRyZW47 CisgICAgICAgICAgICAgICAgaWYgKGxpbmVSZXN1bHQuc2hvdWxkV3JhcCAhPSAhbGluZUVsZW1l bnRzLmxpbmVCcmVhaykKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAg ICAgICAgICAgICAgaWYgKGNoaWxkUmVzdWx0cy5zaXplKCkgIT0gY2hpbGRUZXh0RWxlbWVudHMu c2l6ZSgpKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKQEAgLTMyOCw3ICsz MzUsMTEgQEAgc3RhdGljIEVsZW1lbnRzIHVwZGF0ZVN1YnRyZWUoSFRNTEVsZW1lbnQmIGVsZW1l bnQsIGNvbnN0IFRleHRSZWNvZ25pdGlvblJlc3VsdCYKICAgICAgICAgICAgICAgICBsaW5lRWxl bWVudHMuY2hpbGRyZW4udW5jaGVja2VkQXBwZW5kKFdURk1vdmUodGV4dENvbnRhaW5lcikpOwog ICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBsaW5lQ29udGFpbmVyLT5hcHBlbmRDaGlsZChI VE1MQlJFbGVtZW50OjpjcmVhdGUoZG9jdW1lbnQuZ2V0KCkpKTsKKyAgICAgICAgICAgIGlmICgh bGluZS5zaG91bGRXcmFwKSB7CisgICAgICAgICAgICAgICAgbGluZUVsZW1lbnRzLmxpbmVCcmVh ayA9IEhUTUxCUkVsZW1lbnQ6OmNyZWF0ZShkb2N1bWVudC5nZXQoKSk7CisgICAgICAgICAgICAg ICAgbGluZUNvbnRhaW5lci0+YXBwZW5kQ2hpbGQoKmxpbmVFbGVtZW50cy5saW5lQnJlYWspOwor ICAgICAgICAgICAgfQorCiAgICAgICAgICAgICBlbGVtZW50cy5saW5lcy51bmNoZWNrZWRBcHBl bmQoV1RGTW92ZShsaW5lRWxlbWVudHMpKTsKICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9UZXh0UmVjb2duaXRpb25SZXN1bHQuaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL1RleHRSZWNvZ25pdGlvblJlc3VsdC5oCmluZGV4IGUwOTlmMTQ1OTZjMjIx ODQ3MDY2Yzk1NjI0YjhiOGE5N2QwZTVkYjUuLjYxYjUwNWIxOTI5ZTVmNTAwOGU4NWFjNDNhYTNl ZjBlYjkyZGU5OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1RleHRSZWNv Z25pdGlvblJlc3VsdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1RleHRSZWNvZ25p dGlvblJlc3VsdC5oCkBAIC04MSwxNCArODEsMTYgQEAgdGVtcGxhdGU8Y2xhc3MgRGVjb2Rlcj4g c3RkOjpvcHRpb25hbDxUZXh0UmVjb2duaXRpb25Xb3JkRGF0YT4gVGV4dFJlY29nbml0aW9uV28K IH0KIAogc3RydWN0IFRleHRSZWNvZ25pdGlvbkxpbmVEYXRhIHsKLSAgICBUZXh0UmVjb2duaXRp b25MaW5lRGF0YShGbG9hdFF1YWQmJiBxdWFkLCBWZWN0b3I8VGV4dFJlY29nbml0aW9uV29yZERh dGE+JiYgdGhlQ2hpbGRyZW4pCisgICAgVGV4dFJlY29nbml0aW9uTGluZURhdGEoRmxvYXRRdWFk JiYgcXVhZCwgVmVjdG9yPFRleHRSZWNvZ25pdGlvbldvcmREYXRhPiYmIHRoZUNoaWxkcmVuLCBi b29sIHdyYXApCiAgICAgICAgIDogbm9ybWFsaXplZFF1YWQoV1RGTW92ZShxdWFkKSkKICAgICAg ICAgLCBjaGlsZHJlbihXVEZNb3ZlKHRoZUNoaWxkcmVuKSkKKyAgICAgICAgLCBzaG91bGRXcmFw KHdyYXApCiAgICAgewogICAgIH0KIAogICAgIEZsb2F0UXVhZCBub3JtYWxpemVkUXVhZDsKICAg ICBWZWN0b3I8VGV4dFJlY29nbml0aW9uV29yZERhdGE+IGNoaWxkcmVuOworICAgIGJvb2wgc2hv dWxkV3JhcCB7IGZhbHNlIH07CiAKICAgICB0ZW1wbGF0ZTxjbGFzcyBFbmNvZGVyPiB2b2lkIGVu Y29kZShFbmNvZGVyJikgY29uc3Q7CiAgICAgdGVtcGxhdGU8Y2xhc3MgRGVjb2Rlcj4gc3RhdGlj IHN0ZDo6b3B0aW9uYWw8VGV4dFJlY29nbml0aW9uTGluZURhdGE+IGRlY29kZShEZWNvZGVyJik7 CkBAIC0xMTQsNiArMTE2LDcgQEAgdGVtcGxhdGU8Y2xhc3MgRW5jb2Rlcj4gdm9pZCBUZXh0UmVj b2duaXRpb25MaW5lRGF0YTo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIpIGMKIHsKICAgICBlbmNv ZGVyIDw8IG5vcm1hbGl6ZWRRdWFkOwogICAgIGVuY29kZXIgPDwgY2hpbGRyZW47CisgICAgZW5j b2RlciA8PCBzaG91bGRXcmFwOwogfQogCiB0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPiBzdGQ6Om9w dGlvbmFsPFRleHRSZWNvZ25pdGlvbkxpbmVEYXRhPiBUZXh0UmVjb2duaXRpb25MaW5lRGF0YTo6 ZGVjb2RlKERlY29kZXImIGRlY29kZXIpCkBAIC0xMjgsNyArMTMxLDEyIEBAIHRlbXBsYXRlPGNs YXNzIERlY29kZXI+IHN0ZDo6b3B0aW9uYWw8VGV4dFJlY29nbml0aW9uTGluZURhdGE+IFRleHRS ZWNvZ25pdGlvbkxpCiAgICAgaWYgKCFjaGlsZHJlbikKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVs bG9wdDsKIAotICAgIHJldHVybiB7eyBXVEZNb3ZlKCpub3JtYWxpemVkUXVhZCksIFdURk1vdmUo KmNoaWxkcmVuKSB9fTsKKyAgICBzdGQ6Om9wdGlvbmFsPGJvb2w+IHNob3VsZFdyYXA7CisgICAg ZGVjb2RlciA+PiBzaG91bGRXcmFwOworICAgIGlmICghc2hvdWxkV3JhcCkKKyAgICAgICAgcmV0 dXJuIHN0ZDo6bnVsbG9wdDsKKworICAgIHJldHVybiB7IHsgV1RGTW92ZSgqbm9ybWFsaXplZFF1 YWQpLCBXVEZNb3ZlKCpjaGlsZHJlbiksICpzaG91bGRXcmFwIH0gfTsKIH0KIAogc3RydWN0IFRl eHRSZWNvZ25pdGlvbkJsb2NrRGF0YSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0 aW5nL0ludGVybmFscy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAK aW5kZXggYjA0NjI3NTFhNDQ2NWY0MjliOTc4NGIxNDM3YzNiM2RiZmEwNjRhMS4uZmIzZDBjMjM2 NjUzM2VmNThiN2FkYzZiODIyYmM2ZjhhZmE5MDU3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50 ZXJuYWxzLmNwcApAQCAtNTc2OSw3ICs1NzY5LDggQEAgc3RhdGljIFRleHRSZWNvZ25pdGlvbkxp bmVEYXRhIG1ha2VEYXRhRm9yTGluZShjb25zdCBJbnRlcm5hbHM6OkltYWdlT3ZlcmxheUxpbmUK ICAgICAgICAgZ2V0UXVhZDxJbnRlcm5hbHM6OkltYWdlT3ZlcmxheUxpbmU+KGxpbmUpLAogICAg ICAgICBsaW5lLmNoaWxkcmVuLm1hcChbXShhdXRvJiB0ZXh0Q2hpbGQpIC0+IFRleHRSZWNvZ25p dGlvbldvcmREYXRhIHsKICAgICAgICAgICAgIHJldHVybiB7IHRleHRDaGlsZC50ZXh0LCBnZXRR dWFkPEludGVybmFsczo6SW1hZ2VPdmVybGF5VGV4dD4odGV4dENoaWxkKSwgdGV4dENoaWxkLmhh c0xlYWRpbmdXaGl0ZXNwYWNlIH07Ci0gICAgICAgIH0pCisgICAgICAgIH0pLAorICAgICAgICBs aW5lLnNob3VsZFdyYXAKICAgICB9OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90 ZXN0aW5nL0ludGVybmFscy5oIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaApp bmRleCAyNmY1NzNlMDBjNTUxMTM0YjhiMmNkN2I2MTYzM2YxMTA4YjMxZDM2Li43MGRkMTUzMGMx NjEwNWIxZTljM2VkNDk5OTlmY2ZiZWVhZmRkOWM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS90ZXN0aW5nL0ludGVybmFscy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJu YWxzLmgKQEAgLTkyMiw2ICs5MjIsNyBAQCBwdWJsaWM6CiAgICAgICAgIFJlZlB0cjxET01Qb2lu dFJlYWRPbmx5PiBib3R0b21SaWdodDsKICAgICAgICAgUmVmUHRyPERPTVBvaW50UmVhZE9ubHk+ IGJvdHRvbUxlZnQ7CiAgICAgICAgIFZlY3RvcjxJbWFnZU92ZXJsYXlUZXh0PiBjaGlsZHJlbjsK KyAgICAgICAgYm9vbCBzaG91bGRXcmFwIHsgZmFsc2UgfTsKIAogICAgICAgICB+SW1hZ2VPdmVy bGF5TGluZSgpOwogICAgIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0lu dGVybmFscy5pZGwgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwKaW5kZXgg MjEyNjI2ODkzMDMyZDAzNzhlYzkwZDE3MjZhYmY1OThjNmQ4YjY1ZC4uNjUyYTZkYjNiYzZkYmM1 YTFhN2VlYjYwZGUzYTcyMWRhYTAxMjU5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVz dGluZy9JbnRlcm5hbHMuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxz LmlkbApAQCAtMjkyLDYgKzI5Miw3IEBAIGVudW0gSEVWQ1BhcmFtZXRlckNvZGVjIHsKICAgICBy ZXF1aXJlZCBET01Qb2ludFJlYWRPbmx5IGJvdHRvbVJpZ2h0OwogICAgIHJlcXVpcmVkIERPTVBv aW50UmVhZE9ubHkgYm90dG9tTGVmdDsKICAgICBzZXF1ZW5jZTxJbWFnZU92ZXJsYXlUZXh0PiBj aGlsZHJlbjsKKyAgICBib29sZWFuIHNob3VsZFdyYXAgPSBmYWxzZTsKIH07CiAKIFsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vY29jb2EvVGV4dFJlY29nbml0aW9uVXRpbGl0 aWVzLm1tIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9jb2NvYS9UZXh0UmVjb2duaXRpb25VdGls aXRpZXMubW0KaW5kZXggMTU5YzlkMzI4ZTVhNDNkMzhiODMzNjgwZmIwOGU3M2IzYzk0YjkxYS4u MGZkZGRhZjdjMzBlMjNiNGFjNGI1YmQxYTFiMzNmNGM3Njk5MWViZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9QbGF0Zm9ybS9jb2NvYS9UZXh0UmVjb2duaXRpb25VdGlsaXRpZXMubW0KKysr IGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9jb2NvYS9UZXh0UmVjb2duaXRpb25VdGlsaXRpZXMu bW0KQEAgLTExNCw3ICsxMTQsMTEgQEAgVGV4dFJlY29nbml0aW9uUmVzdWx0IG1ha2VUZXh0UmVj b2duaXRpb25SZXN1bHQoVktJbWFnZUFuYWx5c2lzICphbmFseXNpcykKICAgICAgICAgICAgIHNl YXJjaExvY2F0aW9uID0gbWF0Y2hMb2NhdGlvbiArIGNoaWxkVGV4dC5sZW5ndGgoKTsKICAgICAg ICAgICAgIGNoaWxkcmVuLnVuY2hlY2tlZEFwcGVuZCh7IFdURk1vdmUoY2hpbGRUZXh0KSwgZmxv YXRRdWFkKGNoaWxkLnF1YWQpLCBoYXNMZWFkaW5nV2hpdGVzcGFjZSB9KTsKICAgICAgICAgfQot ICAgICAgICByZXN1bHQubGluZXMudW5jaGVja2VkQXBwZW5kKHsgZmxvYXRRdWFkKGxpbmUucXVh ZCksIFdURk1vdmUoY2hpbGRyZW4pIH0pOworICAgICAgICByZXN1bHQubGluZXMudW5jaGVja2Vk QXBwZW5kKHsKKyAgICAgICAgICAgIGZsb2F0UXVhZChsaW5lLnF1YWQpLAorICAgICAgICAgICAg V1RGTW92ZShjaGlsZHJlbiksCisgICAgICAgICAgICBbbGluZSByZXNwb25kc1RvU2VsZWN0b3I6 QHNlbGVjdG9yKHNob3VsZFdyYXApXSAmJiBbbGluZSBzaG91bGRXcmFwXQorICAgICAgICB9KTsK ICAgICAgICAgaXNGaXJzdExpbmUgPSBmYWxzZTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyM2EyOTlmMDNj MTk5NWJjMzc0Y2ZiMjdlNmI1ZDYzZWIzNTNiNDMxLi5iN2FkOWFlOWUwMzFmMTA2YTU1YzgwMmZl ZDJiNDBmNzUzMDYwNDM2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjItMDEtMTAgIFdlbnNv biBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIHN1cHBvcnQg Zm9yIGEgLXNob3VsZFdyYXAgcHJvcGVydHkgd2hlbiBpbmplY3RpbmcgTGl2ZSBUZXh0CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUwMzUKKyAgICAg ICAgcmRhcjovLzg1MTM5MTQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWRkIGEgbGF5b3V0IHRlc3QgdG8gZXhlcmNpc2UgdGhlIGNoYW5nZXMuIFNl ZSBXZWJDb3JlL0NoYW5nZUxvZyBmb3IgbW9yZSBkZXRhaWxzLgorCisgICAgICAgICogZmFzdC9p bWFnZXMvdGV4dC1yZWNvZ25pdGlvbi9pbWFnZS1vdmVybGF5LWxpbmUtd3JhcHBpbmctZXhwZWN0 ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2ltYWdlcy90ZXh0LXJlY29nbml0aW9uL2lt YWdlLW92ZXJsYXktbGluZS13cmFwcGluZy5odG1sOiBBZGRlZC4KKwogMjAyMi0wMS0wOSAgWmly YW4gU3VuICA8enN1bkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtjc3MtZ3JpZF0gUmVzeW5jIHdl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQgdGVzdHMgZnJvbSB1cHN0cmVhbQpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9pbWFnZXMvdGV4dC1yZWNvZ25pdGlvbi9pbWFnZS1vdmVy bGF5LWxpbmUtd3JhcHBpbmctZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9pbWFnZXMv dGV4dC1yZWNvZ25pdGlvbi9pbWFnZS1vdmVybGF5LWxpbmUtd3JhcHBpbmctZXhwZWN0ZWQudHh0 Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLjdiNjM0YTEzNzFhODY1NDJlNTQ4MTM4NDAzOGM5MTRhMmMwOTVkY2QKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2ltYWdlcy90ZXh0LXJlY29nbml0aW9u L2ltYWdlLW92ZXJsYXktbGluZS13cmFwcGluZy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw2IEBA CisKK1BBU1MgdGV4dGFyZWEudmFsdWUgaXMgInRoaXMgaXMgYSB0ZXN0XG5mb28iCitQQVNTIHN1 Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvZmFzdC9pbWFnZXMvdGV4dC1yZWNvZ25pdGlvbi9pbWFnZS1vdmVybGF5LWxp bmUtd3JhcHBpbmcuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvaW1hZ2VzL3RleHQtcmVjb2duaXRp b24vaW1hZ2Utb3ZlcmxheS1saW5lLXdyYXBwaW5nLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uM2Y1OGQyZTE4 ZGYzMDQ1MGZkYWE5YmFkZThiOGNhYWJjY2U2ODE2NQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2Zhc3QvaW1hZ2VzL3RleHQtcmVjb2duaXRpb24vaW1hZ2Utb3ZlcmxheS1saW5lLXdy YXBwaW5nLmh0bWwKQEAgLTAsMCArMSw5NiBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxo ZWFkPgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LmpzIj48L3Njcmlw dD4KKzxzdHlsZT4KK2JvZHksIGh0bWwgeworICAgIG1hcmdpbjogMDsKK30KK2ltZyB7CisgICAg d2lkdGg6IDMwMHB4OworICAgIGhlaWdodDogMzAwcHg7Cit9Cis8L3N0eWxlPgorPC9oZWFkPgor PGJvZHk+Cis8dGV4dGFyZWE+PC90ZXh0YXJlYT4KKzxpbWcgc3JjPSIuLi9yZXNvdXJjZXMvZ3Jl ZW4tNDAweDQwMC5wbmciPjwvaW1nPgorPHByZSBpZD0iY29uc29sZSI+PC9wcmU+Cis8c2NyaXB0 PgorYWRkRXZlbnRMaXN0ZW5lcigibG9hZCIsICgpID0+IHsKKyAgICBjb25zdCBpbWFnZSA9IGRv Y3VtZW50LnF1ZXJ5U2VsZWN0b3IoImltZyIpOworICAgIGludGVybmFscy5pbnN0YWxsSW1hZ2VP dmVybGF5KGltYWdlLCBbCisgICAgICAgIHsKKyAgICAgICAgICAgIHRvcExlZnQgOiBuZXcgRE9N UG9pbnRSZWFkT25seSgwLCAwKSwKKyAgICAgICAgICAgIHRvcFJpZ2h0IDogbmV3IERPTVBvaW50 UmVhZE9ubHkoMSwgMCksCisgICAgICAgICAgICBib3R0b21SaWdodCA6IG5ldyBET01Qb2ludFJl YWRPbmx5KDEsIDAuMyksCisgICAgICAgICAgICBib3R0b21MZWZ0IDogbmV3IERPTVBvaW50UmVh ZE9ubHkoMCwgMC4zKSwKKyAgICAgICAgICAgIHNob3VsZFdyYXA6IHRydWUsCisgICAgICAgICAg ICBjaGlsZHJlbjogWworICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgdGV4 dCA6ICJ0aGlzIiwKKyAgICAgICAgICAgICAgICAgICAgdG9wTGVmdCA6IG5ldyBET01Qb2ludFJl YWRPbmx5KDAsIDApLAorICAgICAgICAgICAgICAgICAgICB0b3BSaWdodCA6IG5ldyBET01Qb2lu dFJlYWRPbmx5KDAuNywgMCksCisgICAgICAgICAgICAgICAgICAgIGJvdHRvbVJpZ2h0IDogbmV3 IERPTVBvaW50UmVhZE9ubHkoMC43LCAwLjMpLAorICAgICAgICAgICAgICAgICAgICBib3R0b21M ZWZ0IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMCwgMC4zKSwKKyAgICAgICAgICAgICAgICB9LAor ICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgdGV4dCA6ICJpcyIsCisgICAg ICAgICAgICAgICAgICAgIHRvcExlZnQgOiBuZXcgRE9NUG9pbnRSZWFkT25seSgwLjcsIDApLAor ICAgICAgICAgICAgICAgICAgICB0b3BSaWdodCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDEsIDAp LAorICAgICAgICAgICAgICAgICAgICBib3R0b21SaWdodCA6IG5ldyBET01Qb2ludFJlYWRPbmx5 KDEsIDAuMyksCisgICAgICAgICAgICAgICAgICAgIGJvdHRvbUxlZnQgOiBuZXcgRE9NUG9pbnRS ZWFkT25seSgwLjcsIDAuMyksCisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgXSwKKyAg ICAgICAgfSwKKyAgICAgICAgeworICAgICAgICAgICAgdG9wTGVmdCA6IG5ldyBET01Qb2ludFJl YWRPbmx5KDAsIDAuMyksCisgICAgICAgICAgICB0b3BSaWdodCA6IG5ldyBET01Qb2ludFJlYWRP bmx5KDEsIDAuMyksCisgICAgICAgICAgICBib3R0b21SaWdodCA6IG5ldyBET01Qb2ludFJlYWRP bmx5KDEsIDAuNyksCisgICAgICAgICAgICBib3R0b21MZWZ0IDogbmV3IERPTVBvaW50UmVhZE9u bHkoMCwgMC43KSwKKyAgICAgICAgICAgIGNoaWxkcmVuOiBbCisgICAgICAgICAgICAgICAgewor ICAgICAgICAgICAgICAgICAgICB0ZXh0IDogImEiLAorICAgICAgICAgICAgICAgICAgICB0b3BM ZWZ0IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMCwgMC4zKSwKKyAgICAgICAgICAgICAgICAgICAg dG9wUmlnaHQgOiBuZXcgRE9NUG9pbnRSZWFkT25seSgwLjMsIDAuMyksCisgICAgICAgICAgICAg ICAgICAgIGJvdHRvbVJpZ2h0IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMC4zLCAwLjcpLAorICAg ICAgICAgICAgICAgICAgICBib3R0b21MZWZ0IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMCwgMC43 KSwKKyAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAg ICAgICAgdGV4dCA6ICJ0ZXN0IiwKKyAgICAgICAgICAgICAgICAgICAgdG9wTGVmdCA6IG5ldyBE T01Qb2ludFJlYWRPbmx5KDAuMywgMC4zKSwKKyAgICAgICAgICAgICAgICAgICAgdG9wUmlnaHQg OiBuZXcgRE9NUG9pbnRSZWFkT25seSgxLCAwLjMpLAorICAgICAgICAgICAgICAgICAgICBib3R0 b21SaWdodCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDEsIDAuNyksCisgICAgICAgICAgICAgICAg ICAgIGJvdHRvbUxlZnQgOiBuZXcgRE9NUG9pbnRSZWFkT25seSgwLjMsIDAuNyksCisgICAgICAg ICAgICAgICAgfQorICAgICAgICAgICAgXSwKKyAgICAgICAgfSwKKyAgICAgICAgeworICAgICAg ICAgICAgdG9wTGVmdCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDAsIDAuNyksCisgICAgICAgICAg ICB0b3BSaWdodCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDAuNywgMC43KSwKKyAgICAgICAgICAg IGJvdHRvbVJpZ2h0IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMC43LCAxKSwKKyAgICAgICAgICAg IGJvdHRvbUxlZnQgOiBuZXcgRE9NUG9pbnRSZWFkT25seSgwLCAxKSwKKyAgICAgICAgICAgIGNo aWxkcmVuOiBbCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICB0ZXh0IDog ImZvbyIsCisgICAgICAgICAgICAgICAgICAgIHRvcExlZnQgOiBuZXcgRE9NUG9pbnRSZWFkT25s eSgwLCAwLjcpLAorICAgICAgICAgICAgICAgICAgICB0b3BSaWdodCA6IG5ldyBET01Qb2ludFJl YWRPbmx5KDAuNywgMC43KSwKKyAgICAgICAgICAgICAgICAgICAgYm90dG9tUmlnaHQgOiBuZXcg RE9NUG9pbnRSZWFkT25seSgwLjcsIDEpLAorICAgICAgICAgICAgICAgICAgICBib3R0b21MZWZ0 IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMCwgMSksCisgICAgICAgICAgICAgICAgfQorICAgICAg ICAgICAgXSwKKyAgICAgICAgfQorICAgIF0pOworCisgICAgZ2V0U2VsZWN0aW9uKCkuc2VsZWN0 QWxsQ2hpbGRyZW4oaW50ZXJuYWxzLnNoYWRvd1Jvb3QoaW1hZ2UpLmdldEVsZW1lbnRCeUlkKCJp bWFnZS1vdmVybGF5IikpOworICAgIGRvY3VtZW50LmV4ZWNDb21tYW5kKCJDb3B5Iik7CisKKyAg ICB0ZXh0YXJlYSA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoInRleHRhcmVhIik7CisgICAgdGV4 dGFyZWEuZm9jdXMoKTsKKworICAgIGRvY3VtZW50LmV4ZWNDb21tYW5kKCJQYXN0ZSIpOworICAg IHNob3VsZEJlRXF1YWxUb1N0cmluZygidGV4dGFyZWEudmFsdWUiLCAidGhpcyBpcyBhIHRlc3Rc bmZvbyIpOworfSk7Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KXCBObyBuZXdsaW5lIGF0 IGVuZCBvZiBmaWxlCg== 448790 2022-01-10 12:59:05 -0800 2022-01-10 17:05:21 -0800 Fix iOS build bug-235035-20220110125904.patch text/plain 16921 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3ODI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGE0NGVmMzk4OTgzMDIy YzI0ZWNiNGM3OWFhZTY5MjA1NTE1N2Q2ZC4uNTkwOGQwYjY3YTc3NDM4OWE5NzY2Y2NmYzY0NDFm ODljMDFhZmEzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIyLTAxLTEwICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBzdXBwb3J0 IGZvciBhIC1zaG91bGRXcmFwIHByb3BlcnR5IHdoZW4gaW5qZWN0aW5nIExpdmUgVGV4dAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1MDM1CisgICAg ICAgIHJkYXI6Ly84NTEzOTE0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZCBzdXBwb3J0IGZvciBhIG5ldyBwcm9wZXJ0eSBvbiBWS1dLTGluZUlu Zm8gdG8gaW5kaWNhdGUgd2hldGhlciBvciBub3QgdGhlIGxpbmUgc2hvdWxkIHdyYXAuIElmIHNl dCB0byB0cnVlLAorICAgICAgICB3ZSB3aWxsIGF2b2lkIGFkZGluZyBhIGBicmAgZWxlbWVudCBh dCB0aGUgZW5kIG9mIHRoZSBgZGl2LmltYWdlLW92ZXJsYXktbGluZWAgdGhhdCBjb3JyZXNwb25k cyB0byB0aGUgbGluZSBvZgorICAgICAgICByZWNvZ25pemVkIHRleHQgaW4gdGhlIGltYWdlIG92 ZXJsYXk7IGN1cnJlbnRseSwgd2UgYWx3YXlzIGFkZCB0aGlzIHRyYWlsaW5nIGBicmAuCisKKyAg ICAgICAgVGVzdDogZmFzdC9pbWFnZXMvdGV4dC1yZWNvZ25pdGlvbi9pbWFnZS1vdmVybGF5LWxp bmUtd3JhcHBpbmcuaHRtbAorCisgICAgICAgICogZG9tL0ltYWdlT3ZlcmxheS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJbWFnZU92ZXJsYXk6OnVwZGF0ZVN1YnRyZWUpOgorCisgICAgICAgIENv bnN1bHQgdGhlIGZsYWcgd2hlbiBjb252ZXJ0aW5nIGVhY2ggVGV4dFJlY29nbml0aW9uTGluZURh dGEgaW50byBzaGFkb3cgRE9NIGVsZW1lbnRzLgorCisgICAgICAgICogcGxhdGZvcm0vVGV4dFJl Y29nbml0aW9uUmVzdWx0Lmg6CisKKyAgICAgICAgQWRkIHRoZSBuZXcgYm9vbGVhbiBmbGFnIHRv IFRleHRSZWNvZ25pdGlvbkxpbmVEYXRhLCBhbmQgYWRkIGVuY29kaW5nL2RlY29kaW5nIHN1cHBv cnQuCisKKyAgICAgICAgKFdlYkNvcmU6OlRleHRSZWNvZ25pdGlvbkxpbmVEYXRhOjpUZXh0UmVj b2duaXRpb25MaW5lRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0UmVjb2duaXRpb25MaW5l RGF0YTo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlRleHRSZWNvZ25pdGlvbkxp bmVEYXRhOjpkZWNvZGUpOgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6Om1ha2VEYXRhRm9yTGluZSk6CisKKyAgICAgICAgQWRkIGEgd2F5IHRvIHNw ZWNpZnkgYSB2YWx1ZSBmb3IgYHNob3VsZFdyYXBgLCB3aGVuIHVzaW5nIGBpbnRlcm5hbHNgIHRv IGluamVjdCBpbWFnZSBvdmVybGF5IGNvbnRlbnQgaW4gbGF5b3V0CisgICAgICAgIGFuZCBBUEkg dGVzdHMuCisKKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5oOgorICAgICAgICAqIHRlc3Rp bmcvSW50ZXJuYWxzLmlkbDoKKwogMjAyMi0wMS0xMCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hz aWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBNb2RhbCBjb250YWluZXIgb2JzZXJ2ZXIgc2hvdWxk IGNsYXNzaWZ5IGVsZW1lbnRzIHRoYXQgYXJlIHN0eWxlZCBsaWtlIGNsaWNrYWJsZSBjb250cm9s cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJD b3JlL1BBTC9DaGFuZ2VMb2cKaW5kZXggMDk4NWFkMDZmMjc5NDkzNjg1MTI2ZTE2Y2UyMjAxOGY0 NTU0ZDA5OC4uN2Q0MzI4ZjRhOWIyMTZlNjNiMGRmNTlmYjRmMTA5NjEwZDgxYWRlMSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9Q QUwvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjItMDEtMTAgIFdlbnNvbiBIc2llaCAg PHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIHN1cHBvcnQgZm9yIGEgLXNo b3VsZFdyYXAgcHJvcGVydHkgd2hlbiBpbmplY3RpbmcgTGl2ZSBUZXh0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUwMzUKKyAgICAgICAgcmRhcjov Lzg1MTM5MTQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQWRkIGEgZm9yd2FyZCBzdGFnaW5nIGRlY2xhcmF0aW9uIGZvciB0aGUgbmV3IFNQSSBwcm9w ZXJ0eS4KKworICAgICAgICAqIHBhbC9zcGkvY29jb2EvVmlzaW9uS2l0Q29yZVNQSS5oOgorCiAy MDIyLTAxLTA3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyODc2OTguCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGZlZWFh YjhiYWY3ODcyZTQzYzU2MDA2MTEyY2Q4OTU3ODVmZDRlNjQuLjlkYTliMDM2YWEwNGUyMmQyMTk4 NjdhZWUwMGI0NWRlYjZmNDFlNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjItMDEt MTAgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgQWRk IHN1cHBvcnQgZm9yIGEgLXNob3VsZFdyYXAgcHJvcGVydHkgd2hlbiBpbmplY3RpbmcgTGl2ZSBU ZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUw MzUKKyAgICAgICAgcmRhcjovLzg1MTM5MTQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQ29uc3VsdCB0aGUgbmV3IFNQSSBwcm9wZXJ0eSAoYmVoaW5k IGEgcnVudGltZSBzZWxlY3RvciBjaGVjayksIGFuZCBwYXNzIHRoZSBib29sZWFuIGZsYWcgdGhy b3VnaCB0aGUKKyAgICAgICAgVGV4dFJlY29nbml0aW9uUmVzdWx0LgorCisgICAgICAgICogUGxh dGZvcm0vY29jb2EvVGV4dFJlY29nbml0aW9uVXRpbGl0aWVzLm1tOgorICAgICAgICAoV2ViS2l0 OjptYWtlVGV4dFJlY29nbml0aW9uUmVzdWx0KToKKwogMjAyMi0wMS0wOCAgVHlsZXIgV2lsY29j ayAgPHR5bGVyX3dAYXBwbGUuY29tPgogCiAgICAgICAgIEFYOiBBY2Nlc3NpYmlsaXR5T2JqZWN0 OjpzZXRGb2N1c2VkKHRydWUpIHNob3VsZCBtYWtlIHRoZSB3ZWJwYWdlIGZvY3VzZWQsIGFuZCBt YWtlIHdlYiBjb250ZW50IHRoZSBmaXJzdCByZXNwb25kZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL1Zpc2lvbktpdENvcmVTUEkuaCBiL1NvdXJjZS9XZWJD b3JlL1BBTC9wYWwvc3BpL2NvY29hL1Zpc2lvbktpdENvcmVTUEkuaAppbmRleCA5MGVhNzQ3NjQx Y2VhZjhiMzVlYTNiZWU2NGY2NDM0ZWUzZjE0YmM5Li44ODU1NTVlNTg2ZDFlZDA1Njc4Y2RlYTEz MjkzNzg5MTNlMjU3ODE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9j b2NvYS9WaXNpb25LaXRDb3JlU1BJLmgKKysrIGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkv Y29jb2EvVmlzaW9uS2l0Q29yZVNQSS5oCkBAIC0xNDYsNiArMTQ2LDEwIEBAIE5TX0FTU1VNRV9O T05OVUxMX0VORAogCiAjZW5kaWYKIAorQGludGVyZmFjZSBWS1dLTGluZUluZm8gKFN0YWdpbmdf ODUxMzkxMDEpCitAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIEJPT0wgc2hvdWxkV3Jh cDsKK0BlbmQKKwogI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCiAjaW5jbHVkZSA8V2ViS2l0 QWRkaXRpb25zL1Zpc2lvbktpdENvcmVTUElBZGRpdGlvbnMuaD4KICNlbmRpZgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvZG9tL0ltYWdlT3ZlcmxheS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9k b20vSW1hZ2VPdmVybGF5LmNwcAppbmRleCA5ZGI1ZWEwZjRkNjdjMDM4OTRhOGE0Y2QyMjY3Y2Ez ZDU2Njg5YWI4Li5lYTdlODk0NmZiMzRmYWM2OGMxNzc5Y2ZmYjQxMTM3ZTRlOGI4YmQ4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vSW1hZ2VPdmVybGF5LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9kb20vSW1hZ2VPdmVybGF5LmNwcApAQCAtMTkyLDYgKzE5Miw3IEBAIEludFJlY3Qg Y29udGFpbmVyUmVjdChIVE1MRWxlbWVudCYgZWxlbWVudCkKIHN0cnVjdCBMaW5lRWxlbWVudHMg ewogICAgIFJlZjxIVE1MRGl2RWxlbWVudD4gbGluZTsKICAgICBWZWN0b3I8UmVmPEhUTUxFbGVt ZW50Pj4gY2hpbGRyZW47CisgICAgUmVmUHRyPEhUTUxCUkVsZW1lbnQ+IGxpbmVCcmVhazsKIH07 CiAKIHN0cnVjdCBFbGVtZW50cyB7CkBAIC0yNTMsMTAgKzI1NCwxMCBAQCBzdGF0aWMgRWxlbWVu dHMgdXBkYXRlU3VidHJlZShIVE1MRWxlbWVudCYgZWxlbWVudCwgY29uc3QgVGV4dFJlY29nbml0 aW9uUmVzdWx0JgogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBBU1NFUlQoY2xhc3Nlcy5j b250YWlucyhpbWFnZU92ZXJsYXlMaW5lQ2xhc3MoKSkpOwotICAgICAgICAgICAgTGluZUVsZW1l bnRzIGxpbmVFbGVtZW50cyB7IGNoaWxkRWxlbWVudCwgeyB9IH07CisgICAgICAgICAgICBWZWN0 b3I8UmVmPEhUTUxFbGVtZW50Pj4gbGluZUNoaWxkcmVuOwogICAgICAgICAgICAgZm9yIChhdXRv JiB0ZXh0IDogY2hpbGRyZW5PZlR5cGU8SFRNTERpdkVsZW1lbnQ+KGNoaWxkRWxlbWVudCkpCi0g ICAgICAgICAgICAgICAgbGluZUVsZW1lbnRzLmNoaWxkcmVuLmFwcGVuZCh0ZXh0KTsKLSAgICAg ICAgICAgIGVsZW1lbnRzLmxpbmVzLmFwcGVuZChXVEZNb3ZlKGxpbmVFbGVtZW50cykpOworICAg ICAgICAgICAgICAgIGxpbmVDaGlsZHJlbi5hcHBlbmQodGV4dCk7CisgICAgICAgICAgICBlbGVt ZW50cy5saW5lcy5hcHBlbmQoeyBjaGlsZEVsZW1lbnQsIFdURk1vdmUobGluZUNoaWxkcmVuKSwg Y2hpbGRyZW5PZlR5cGU8SFRNTEJSRWxlbWVudD4oY2hpbGRFbGVtZW50KS5maXJzdCgpIH0pOwog ICAgICAgICB9CiAKICAgICAgICAgYm9vbCBjYW5Vc2VFeGlzdGluZ0VsZW1lbnRzID0gKFsmXSB7 CkBAIC0yNzAsOCArMjcxLDE0IEBAIHN0YXRpYyBFbGVtZW50cyB1cGRhdGVTdWJ0cmVlKEhUTUxF bGVtZW50JiBlbGVtZW50LCBjb25zdCBUZXh0UmVjb2duaXRpb25SZXN1bHQmCiAgICAgICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgICAgICAgICBmb3IgKHNpemVfdCBsaW5lSW5kZXgg PSAwOyBsaW5lSW5kZXggPCByZXN1bHQubGluZXMuc2l6ZSgpOyArK2xpbmVJbmRleCkgewotICAg ICAgICAgICAgICAgIGF1dG8mIGNoaWxkUmVzdWx0cyA9IHJlc3VsdC5saW5lc1tsaW5lSW5kZXhd LmNoaWxkcmVuOwotICAgICAgICAgICAgICAgIGF1dG8mIGNoaWxkVGV4dEVsZW1lbnRzID0gZWxl bWVudHMubGluZXNbbGluZUluZGV4XS5jaGlsZHJlbjsKKyAgICAgICAgICAgICAgICBhdXRvJiBs aW5lUmVzdWx0ID0gcmVzdWx0LmxpbmVzW2xpbmVJbmRleF07CisgICAgICAgICAgICAgICAgYXV0 byYgY2hpbGRSZXN1bHRzID0gbGluZVJlc3VsdC5jaGlsZHJlbjsKKworICAgICAgICAgICAgICAg IGF1dG8mIGxpbmVFbGVtZW50cyA9IGVsZW1lbnRzLmxpbmVzW2xpbmVJbmRleF07CisgICAgICAg ICAgICAgICAgYXV0byYgY2hpbGRUZXh0RWxlbWVudHMgPSBsaW5lRWxlbWVudHMuY2hpbGRyZW47 CisgICAgICAgICAgICAgICAgaWYgKGxpbmVSZXN1bHQuc2hvdWxkV3JhcCAhPSAhbGluZUVsZW1l bnRzLmxpbmVCcmVhaykKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAg ICAgICAgICAgICAgaWYgKGNoaWxkUmVzdWx0cy5zaXplKCkgIT0gY2hpbGRUZXh0RWxlbWVudHMu c2l6ZSgpKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKQEAgLTMxNyw3ICsz MjQsNyBAQCBzdGF0aWMgRWxlbWVudHMgdXBkYXRlU3VidHJlZShIVE1MRWxlbWVudCYgZWxlbWVu dCwgY29uc3QgVGV4dFJlY29nbml0aW9uUmVzdWx0JgogICAgICAgICAgICAgYXV0byBsaW5lQ29u dGFpbmVyID0gSFRNTERpdkVsZW1lbnQ6OmNyZWF0ZShkb2N1bWVudC5nZXQoKSk7CiAgICAgICAg ICAgICBsaW5lQ29udGFpbmVyLT5jbGFzc0xpc3QoKS5hZGQoaW1hZ2VPdmVybGF5TGluZUNsYXNz KCkpOwogICAgICAgICAgICAgcm9vdENvbnRhaW5lci0+YXBwZW5kQ2hpbGQobGluZUNvbnRhaW5l cik7Ci0gICAgICAgICAgICBMaW5lRWxlbWVudHMgbGluZUVsZW1lbnRzIHsgbGluZUNvbnRhaW5l ciwgeyB9IH07CisgICAgICAgICAgICBMaW5lRWxlbWVudHMgbGluZUVsZW1lbnRzIHsgbGluZUNv bnRhaW5lciwgeyB9LCB7IH0gfTsKICAgICAgICAgICAgIGxpbmVFbGVtZW50cy5jaGlsZHJlbi5y ZXNlcnZlSW5pdGlhbENhcGFjaXR5KGxpbmUuY2hpbGRyZW4uc2l6ZSgpKTsKICAgICAgICAgICAg IGZvciAoc2l6ZV90IGNoaWxkSW5kZXggPSAwOyBjaGlsZEluZGV4IDwgbGluZS5jaGlsZHJlbi5z aXplKCk7ICsrY2hpbGRJbmRleCkgewogICAgICAgICAgICAgICAgIGF1dG8mIGNoaWxkID0gbGlu ZS5jaGlsZHJlbltjaGlsZEluZGV4XTsKQEAgLTMyOCw3ICszMzUsMTEgQEAgc3RhdGljIEVsZW1l bnRzIHVwZGF0ZVN1YnRyZWUoSFRNTEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IFRleHRSZWNvZ25p dGlvblJlc3VsdCYKICAgICAgICAgICAgICAgICBsaW5lRWxlbWVudHMuY2hpbGRyZW4udW5jaGVj a2VkQXBwZW5kKFdURk1vdmUodGV4dENvbnRhaW5lcikpOwogICAgICAgICAgICAgfQogCi0gICAg ICAgICAgICBsaW5lQ29udGFpbmVyLT5hcHBlbmRDaGlsZChIVE1MQlJFbGVtZW50OjpjcmVhdGUo ZG9jdW1lbnQuZ2V0KCkpKTsKKyAgICAgICAgICAgIGlmICghbGluZS5zaG91bGRXcmFwKSB7Cisg ICAgICAgICAgICAgICAgbGluZUVsZW1lbnRzLmxpbmVCcmVhayA9IEhUTUxCUkVsZW1lbnQ6OmNy ZWF0ZShkb2N1bWVudC5nZXQoKSk7CisgICAgICAgICAgICAgICAgbGluZUNvbnRhaW5lci0+YXBw ZW5kQ2hpbGQoKmxpbmVFbGVtZW50cy5saW5lQnJlYWspOworICAgICAgICAgICAgfQorCiAgICAg ICAgICAgICBlbGVtZW50cy5saW5lcy51bmNoZWNrZWRBcHBlbmQoV1RGTW92ZShsaW5lRWxlbWVu dHMpKTsKICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9U ZXh0UmVjb2duaXRpb25SZXN1bHQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1RleHRSZWNv Z25pdGlvblJlc3VsdC5oCmluZGV4IGUwOTlmMTQ1OTZjMjIxODQ3MDY2Yzk1NjI0YjhiOGE5N2Qw ZTVkYjUuLjYxYjUwNWIxOTI5ZTVmNTAwOGU4NWFjNDNhYTNlZjBlYjkyZGU5OTIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1RleHRSZWNvZ25pdGlvblJlc3VsdC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1RleHRSZWNvZ25pdGlvblJlc3VsdC5oCkBAIC04MSwx NCArODEsMTYgQEAgdGVtcGxhdGU8Y2xhc3MgRGVjb2Rlcj4gc3RkOjpvcHRpb25hbDxUZXh0UmVj b2duaXRpb25Xb3JkRGF0YT4gVGV4dFJlY29nbml0aW9uV28KIH0KIAogc3RydWN0IFRleHRSZWNv Z25pdGlvbkxpbmVEYXRhIHsKLSAgICBUZXh0UmVjb2duaXRpb25MaW5lRGF0YShGbG9hdFF1YWQm JiBxdWFkLCBWZWN0b3I8VGV4dFJlY29nbml0aW9uV29yZERhdGE+JiYgdGhlQ2hpbGRyZW4pCisg ICAgVGV4dFJlY29nbml0aW9uTGluZURhdGEoRmxvYXRRdWFkJiYgcXVhZCwgVmVjdG9yPFRleHRS ZWNvZ25pdGlvbldvcmREYXRhPiYmIHRoZUNoaWxkcmVuLCBib29sIHdyYXApCiAgICAgICAgIDog bm9ybWFsaXplZFF1YWQoV1RGTW92ZShxdWFkKSkKICAgICAgICAgLCBjaGlsZHJlbihXVEZNb3Zl KHRoZUNoaWxkcmVuKSkKKyAgICAgICAgLCBzaG91bGRXcmFwKHdyYXApCiAgICAgewogICAgIH0K IAogICAgIEZsb2F0UXVhZCBub3JtYWxpemVkUXVhZDsKICAgICBWZWN0b3I8VGV4dFJlY29nbml0 aW9uV29yZERhdGE+IGNoaWxkcmVuOworICAgIGJvb2wgc2hvdWxkV3JhcCB7IGZhbHNlIH07CiAK ICAgICB0ZW1wbGF0ZTxjbGFzcyBFbmNvZGVyPiB2b2lkIGVuY29kZShFbmNvZGVyJikgY29uc3Q7 CiAgICAgdGVtcGxhdGU8Y2xhc3MgRGVjb2Rlcj4gc3RhdGljIHN0ZDo6b3B0aW9uYWw8VGV4dFJl Y29nbml0aW9uTGluZURhdGE+IGRlY29kZShEZWNvZGVyJik7CkBAIC0xMTQsNiArMTE2LDcgQEAg dGVtcGxhdGU8Y2xhc3MgRW5jb2Rlcj4gdm9pZCBUZXh0UmVjb2duaXRpb25MaW5lRGF0YTo6ZW5j b2RlKEVuY29kZXImIGVuY29kZXIpIGMKIHsKICAgICBlbmNvZGVyIDw8IG5vcm1hbGl6ZWRRdWFk OwogICAgIGVuY29kZXIgPDwgY2hpbGRyZW47CisgICAgZW5jb2RlciA8PCBzaG91bGRXcmFwOwog fQogCiB0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPiBzdGQ6Om9wdGlvbmFsPFRleHRSZWNvZ25pdGlv bkxpbmVEYXRhPiBUZXh0UmVjb2duaXRpb25MaW5lRGF0YTo6ZGVjb2RlKERlY29kZXImIGRlY29k ZXIpCkBAIC0xMjgsNyArMTMxLDEyIEBAIHRlbXBsYXRlPGNsYXNzIERlY29kZXI+IHN0ZDo6b3B0 aW9uYWw8VGV4dFJlY29nbml0aW9uTGluZURhdGE+IFRleHRSZWNvZ25pdGlvbkxpCiAgICAgaWYg KCFjaGlsZHJlbikKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKIAotICAgIHJldHVybiB7 eyBXVEZNb3ZlKCpub3JtYWxpemVkUXVhZCksIFdURk1vdmUoKmNoaWxkcmVuKSB9fTsKKyAgICBz dGQ6Om9wdGlvbmFsPGJvb2w+IHNob3VsZFdyYXA7CisgICAgZGVjb2RlciA+PiBzaG91bGRXcmFw OworICAgIGlmICghc2hvdWxkV3JhcCkKKyAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKKwor ICAgIHJldHVybiB7IHsgV1RGTW92ZSgqbm9ybWFsaXplZFF1YWQpLCBXVEZNb3ZlKCpjaGlsZHJl biksICpzaG91bGRXcmFwIH0gfTsKIH0KIAogc3RydWN0IFRleHRSZWNvZ25pdGlvbkJsb2NrRGF0 YSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAgYi9T b3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKaW5kZXggYjA0NjI3NTFhNDQ2NWY0 MjliOTc4NGIxNDM3YzNiM2RiZmEwNjRhMS4uZmIzZDBjMjM2NjUzM2VmNThiN2FkYzZiODIyYmM2 ZjhhZmE5MDU3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcApAQCAtNTc2OSw3 ICs1NzY5LDggQEAgc3RhdGljIFRleHRSZWNvZ25pdGlvbkxpbmVEYXRhIG1ha2VEYXRhRm9yTGlu ZShjb25zdCBJbnRlcm5hbHM6OkltYWdlT3ZlcmxheUxpbmUKICAgICAgICAgZ2V0UXVhZDxJbnRl cm5hbHM6OkltYWdlT3ZlcmxheUxpbmU+KGxpbmUpLAogICAgICAgICBsaW5lLmNoaWxkcmVuLm1h cChbXShhdXRvJiB0ZXh0Q2hpbGQpIC0+IFRleHRSZWNvZ25pdGlvbldvcmREYXRhIHsKICAgICAg ICAgICAgIHJldHVybiB7IHRleHRDaGlsZC50ZXh0LCBnZXRRdWFkPEludGVybmFsczo6SW1hZ2VP dmVybGF5VGV4dD4odGV4dENoaWxkKSwgdGV4dENoaWxkLmhhc0xlYWRpbmdXaGl0ZXNwYWNlIH07 Ci0gICAgICAgIH0pCisgICAgICAgIH0pLAorICAgICAgICBsaW5lLnNob3VsZFdyYXAKICAgICB9 OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oIGIv U291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaAppbmRleCAyNmY1NzNlMDBjNTUxMTM0 YjhiMmNkN2I2MTYzM2YxMTA4YjMxZDM2Li43MGRkMTUzMGMxNjEwNWIxZTljM2VkNDk5OTlmY2Zi ZWVhZmRkOWM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgKQEAgLTkyMiw2ICs5MjIs NyBAQCBwdWJsaWM6CiAgICAgICAgIFJlZlB0cjxET01Qb2ludFJlYWRPbmx5PiBib3R0b21SaWdo dDsKICAgICAgICAgUmVmUHRyPERPTVBvaW50UmVhZE9ubHk+IGJvdHRvbUxlZnQ7CiAgICAgICAg IFZlY3RvcjxJbWFnZU92ZXJsYXlUZXh0PiBjaGlsZHJlbjsKKyAgICAgICAgYm9vbCBzaG91bGRX cmFwIHsgZmFsc2UgfTsKIAogICAgICAgICB+SW1hZ2VPdmVybGF5TGluZSgpOwogICAgIH07CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwgYi9Tb3VyY2Uv V2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwKaW5kZXggMjEyNjI2ODkzMDMyZDAzNzhlYzkw ZDE3MjZhYmY1OThjNmQ4YjY1ZC4uNjUyYTZkYjNiYzZkYmM1YTFhN2VlYjYwZGUzYTcyMWRhYTAx MjU5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRsCisr KyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmlkbApAQCAtMjkyLDYgKzI5Miw3 IEBAIGVudW0gSEVWQ1BhcmFtZXRlckNvZGVjIHsKICAgICByZXF1aXJlZCBET01Qb2ludFJlYWRP bmx5IGJvdHRvbVJpZ2h0OwogICAgIHJlcXVpcmVkIERPTVBvaW50UmVhZE9ubHkgYm90dG9tTGVm dDsKICAgICBzZXF1ZW5jZTxJbWFnZU92ZXJsYXlUZXh0PiBjaGlsZHJlbjsKKyAgICBib29sZWFu IHNob3VsZFdyYXAgPSBmYWxzZTsKIH07CiAKIFsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv UGxhdGZvcm0vY29jb2EvVGV4dFJlY29nbml0aW9uVXRpbGl0aWVzLm1tIGIvU291cmNlL1dlYktp dC9QbGF0Zm9ybS9jb2NvYS9UZXh0UmVjb2duaXRpb25VdGlsaXRpZXMubW0KaW5kZXggMTU5Yzlk MzI4ZTVhNDNkMzhiODMzNjgwZmIwOGU3M2IzYzk0YjkxYS4uMGZkZGRhZjdjMzBlMjNiNGFjNGI1 YmQxYTFiMzNmNGM3Njk5MWViZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9j b2NvYS9UZXh0UmVjb2duaXRpb25VdGlsaXRpZXMubW0KKysrIGIvU291cmNlL1dlYktpdC9QbGF0 Zm9ybS9jb2NvYS9UZXh0UmVjb2duaXRpb25VdGlsaXRpZXMubW0KQEAgLTExNCw3ICsxMTQsMTEg QEAgVGV4dFJlY29nbml0aW9uUmVzdWx0IG1ha2VUZXh0UmVjb2duaXRpb25SZXN1bHQoVktJbWFn ZUFuYWx5c2lzICphbmFseXNpcykKICAgICAgICAgICAgIHNlYXJjaExvY2F0aW9uID0gbWF0Y2hM b2NhdGlvbiArIGNoaWxkVGV4dC5sZW5ndGgoKTsKICAgICAgICAgICAgIGNoaWxkcmVuLnVuY2hl Y2tlZEFwcGVuZCh7IFdURk1vdmUoY2hpbGRUZXh0KSwgZmxvYXRRdWFkKGNoaWxkLnF1YWQpLCBo YXNMZWFkaW5nV2hpdGVzcGFjZSB9KTsKICAgICAgICAgfQotICAgICAgICByZXN1bHQubGluZXMu dW5jaGVja2VkQXBwZW5kKHsgZmxvYXRRdWFkKGxpbmUucXVhZCksIFdURk1vdmUoY2hpbGRyZW4p IH0pOworICAgICAgICByZXN1bHQubGluZXMudW5jaGVja2VkQXBwZW5kKHsKKyAgICAgICAgICAg IGZsb2F0UXVhZChsaW5lLnF1YWQpLAorICAgICAgICAgICAgV1RGTW92ZShjaGlsZHJlbiksCisg ICAgICAgICAgICBbbGluZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHNob3VsZFdyYXAp XSAmJiBbbGluZSBzaG91bGRXcmFwXQorICAgICAgICB9KTsKICAgICAgICAgaXNGaXJzdExpbmUg PSBmYWxzZTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyM2EyOTlmMDNjMTk5NWJjMzc0Y2ZiMjdlNmI1ZDYz ZWIzNTNiNDMxLi5iN2FkOWFlOWUwMzFmMTA2YTU1YzgwMmZlZDJiNDBmNzUzMDYwNDM2IDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTYgQEAKKzIwMjItMDEtMTAgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2ll aEBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIHN1cHBvcnQgZm9yIGEgLXNob3VsZFdyYXAgcHJv cGVydHkgd2hlbiBpbmplY3RpbmcgTGl2ZSBUZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUwMzUKKyAgICAgICAgcmRhcjovLzg1MTM5MTQ2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgbGF5 b3V0IHRlc3QgdG8gZXhlcmNpc2UgdGhlIGNoYW5nZXMuIFNlZSBXZWJDb3JlL0NoYW5nZUxvZyBm b3IgbW9yZSBkZXRhaWxzLgorCisgICAgICAgICogZmFzdC9pbWFnZXMvdGV4dC1yZWNvZ25pdGlv bi9pbWFnZS1vdmVybGF5LWxpbmUtd3JhcHBpbmctZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAg ICAgKiBmYXN0L2ltYWdlcy90ZXh0LXJlY29nbml0aW9uL2ltYWdlLW92ZXJsYXktbGluZS13cmFw cGluZy5odG1sOiBBZGRlZC4KKwogMjAyMi0wMS0wOSAgWmlyYW4gU3VuICA8enN1bkBpZ2FsaWEu Y29tPgogCiAgICAgICAgIFtjc3MtZ3JpZF0gUmVzeW5jIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLWdyaWQgdGVzdHMgZnJvbSB1cHN0cmVhbQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC9pbWFnZXMvdGV4dC1yZWNvZ25pdGlvbi9pbWFnZS1vdmVybGF5LWxpbmUtd3JhcHBpbmctZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9pbWFnZXMvdGV4dC1yZWNvZ25pdGlvbi9pbWFn ZS1vdmVybGF5LWxpbmUtd3JhcHBpbmctZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjdiNjM0YTEz NzFhODY1NDJlNTQ4MTM4NDAzOGM5MTRhMmMwOTVkY2QKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9mYXN0L2ltYWdlcy90ZXh0LXJlY29nbml0aW9uL2ltYWdlLW92ZXJsYXktbGluZS13 cmFwcGluZy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw2IEBACisKK1BBU1MgdGV4dGFyZWEudmFs dWUgaXMgInRoaXMgaXMgYSB0ZXN0XG5mb28iCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0 cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9pbWFn ZXMvdGV4dC1yZWNvZ25pdGlvbi9pbWFnZS1vdmVybGF5LWxpbmUtd3JhcHBpbmcuaHRtbCBiL0xh eW91dFRlc3RzL2Zhc3QvaW1hZ2VzL3RleHQtcmVjb2duaXRpb24vaW1hZ2Utb3ZlcmxheS1saW5l LXdyYXBwaW5nLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uM2Y1OGQyZTE4ZGYzMDQ1MGZkYWE5YmFkZThiOGNh YWJjY2U2ODE2NQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvaW1hZ2VzL3Rl eHQtcmVjb2duaXRpb24vaW1hZ2Utb3ZlcmxheS1saW5lLXdyYXBwaW5nLmh0bWwKQEAgLTAsMCAr MSw5NiBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4u Ly4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LmpzIj48L3NjcmlwdD4KKzxzdHlsZT4KK2JvZHksIGh0 bWwgeworICAgIG1hcmdpbjogMDsKK30KK2ltZyB7CisgICAgd2lkdGg6IDMwMHB4OworICAgIGhl aWdodDogMzAwcHg7Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+Cis8dGV4dGFyZWE+PC90 ZXh0YXJlYT4KKzxpbWcgc3JjPSIuLi9yZXNvdXJjZXMvZ3JlZW4tNDAweDQwMC5wbmciPjwvaW1n PgorPHByZSBpZD0iY29uc29sZSI+PC9wcmU+Cis8c2NyaXB0PgorYWRkRXZlbnRMaXN0ZW5lcigi bG9hZCIsICgpID0+IHsKKyAgICBjb25zdCBpbWFnZSA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3Io ImltZyIpOworICAgIGludGVybmFscy5pbnN0YWxsSW1hZ2VPdmVybGF5KGltYWdlLCBbCisgICAg ICAgIHsKKyAgICAgICAgICAgIHRvcExlZnQgOiBuZXcgRE9NUG9pbnRSZWFkT25seSgwLCAwKSwK KyAgICAgICAgICAgIHRvcFJpZ2h0IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMSwgMCksCisgICAg ICAgICAgICBib3R0b21SaWdodCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDEsIDAuMyksCisgICAg ICAgICAgICBib3R0b21MZWZ0IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMCwgMC4zKSwKKyAgICAg ICAgICAgIHNob3VsZFdyYXA6IHRydWUsCisgICAgICAgICAgICBjaGlsZHJlbjogWworICAgICAg ICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgdGV4dCA6ICJ0aGlzIiwKKyAgICAgICAg ICAgICAgICAgICAgdG9wTGVmdCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDAsIDApLAorICAgICAg ICAgICAgICAgICAgICB0b3BSaWdodCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDAuNywgMCksCisg ICAgICAgICAgICAgICAgICAgIGJvdHRvbVJpZ2h0IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMC43 LCAwLjMpLAorICAgICAgICAgICAgICAgICAgICBib3R0b21MZWZ0IDogbmV3IERPTVBvaW50UmVh ZE9ubHkoMCwgMC4zKSwKKyAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgIHsKKyAg ICAgICAgICAgICAgICAgICAgdGV4dCA6ICJpcyIsCisgICAgICAgICAgICAgICAgICAgIHRvcExl ZnQgOiBuZXcgRE9NUG9pbnRSZWFkT25seSgwLjcsIDApLAorICAgICAgICAgICAgICAgICAgICB0 b3BSaWdodCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDEsIDApLAorICAgICAgICAgICAgICAgICAg ICBib3R0b21SaWdodCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDEsIDAuMyksCisgICAgICAgICAg ICAgICAgICAgIGJvdHRvbUxlZnQgOiBuZXcgRE9NUG9pbnRSZWFkT25seSgwLjcsIDAuMyksCisg ICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgXSwKKyAgICAgICAgfSwKKyAgICAgICAgewor ICAgICAgICAgICAgdG9wTGVmdCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDAsIDAuMyksCisgICAg ICAgICAgICB0b3BSaWdodCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDEsIDAuMyksCisgICAgICAg ICAgICBib3R0b21SaWdodCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDEsIDAuNyksCisgICAgICAg ICAgICBib3R0b21MZWZ0IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMCwgMC43KSwKKyAgICAgICAg ICAgIGNoaWxkcmVuOiBbCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICB0 ZXh0IDogImEiLAorICAgICAgICAgICAgICAgICAgICB0b3BMZWZ0IDogbmV3IERPTVBvaW50UmVh ZE9ubHkoMCwgMC4zKSwKKyAgICAgICAgICAgICAgICAgICAgdG9wUmlnaHQgOiBuZXcgRE9NUG9p bnRSZWFkT25seSgwLjMsIDAuMyksCisgICAgICAgICAgICAgICAgICAgIGJvdHRvbVJpZ2h0IDog bmV3IERPTVBvaW50UmVhZE9ubHkoMC4zLCAwLjcpLAorICAgICAgICAgICAgICAgICAgICBib3R0 b21MZWZ0IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMCwgMC43KSwKKyAgICAgICAgICAgICAgICB9 LAorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgdGV4dCA6ICJ0ZXN0IiwK KyAgICAgICAgICAgICAgICAgICAgdG9wTGVmdCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDAuMywg MC4zKSwKKyAgICAgICAgICAgICAgICAgICAgdG9wUmlnaHQgOiBuZXcgRE9NUG9pbnRSZWFkT25s eSgxLCAwLjMpLAorICAgICAgICAgICAgICAgICAgICBib3R0b21SaWdodCA6IG5ldyBET01Qb2lu dFJlYWRPbmx5KDEsIDAuNyksCisgICAgICAgICAgICAgICAgICAgIGJvdHRvbUxlZnQgOiBuZXcg RE9NUG9pbnRSZWFkT25seSgwLjMsIDAuNyksCisgICAgICAgICAgICAgICAgfQorICAgICAgICAg ICAgXSwKKyAgICAgICAgfSwKKyAgICAgICAgeworICAgICAgICAgICAgdG9wTGVmdCA6IG5ldyBE T01Qb2ludFJlYWRPbmx5KDAsIDAuNyksCisgICAgICAgICAgICB0b3BSaWdodCA6IG5ldyBET01Q b2ludFJlYWRPbmx5KDAuNywgMC43KSwKKyAgICAgICAgICAgIGJvdHRvbVJpZ2h0IDogbmV3IERP TVBvaW50UmVhZE9ubHkoMC43LCAxKSwKKyAgICAgICAgICAgIGJvdHRvbUxlZnQgOiBuZXcgRE9N UG9pbnRSZWFkT25seSgwLCAxKSwKKyAgICAgICAgICAgIGNoaWxkcmVuOiBbCisgICAgICAgICAg ICAgICAgeworICAgICAgICAgICAgICAgICAgICB0ZXh0IDogImZvbyIsCisgICAgICAgICAgICAg ICAgICAgIHRvcExlZnQgOiBuZXcgRE9NUG9pbnRSZWFkT25seSgwLCAwLjcpLAorICAgICAgICAg ICAgICAgICAgICB0b3BSaWdodCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDAuNywgMC43KSwKKyAg ICAgICAgICAgICAgICAgICAgYm90dG9tUmlnaHQgOiBuZXcgRE9NUG9pbnRSZWFkT25seSgwLjcs IDEpLAorICAgICAgICAgICAgICAgICAgICBib3R0b21MZWZ0IDogbmV3IERPTVBvaW50UmVhZE9u bHkoMCwgMSksCisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgXSwKKyAgICAgICAgfQor ICAgIF0pOworCisgICAgZ2V0U2VsZWN0aW9uKCkuc2VsZWN0QWxsQ2hpbGRyZW4oaW50ZXJuYWxz LnNoYWRvd1Jvb3QoaW1hZ2UpLmdldEVsZW1lbnRCeUlkKCJpbWFnZS1vdmVybGF5IikpOworICAg IGRvY3VtZW50LmV4ZWNDb21tYW5kKCJDb3B5Iik7CisKKyAgICB0ZXh0YXJlYSA9IGRvY3VtZW50 LnF1ZXJ5U2VsZWN0b3IoInRleHRhcmVhIik7CisgICAgdGV4dGFyZWEuZm9jdXMoKTsKKworICAg IGRvY3VtZW50LmV4ZWNDb21tYW5kKCJQYXN0ZSIpOworICAgIHNob3VsZEJlRXF1YWxUb1N0cmlu ZygidGV4dGFyZWEudmFsdWUiLCAidGhpcyBpcyBhIHRlc3RcbmZvbyIpOworfSk7Cis8L3Njcmlw dD4KKzwvYm9keT4KKzwvaHRtbD4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCg== 448815 2022-01-10 17:05:25 -0800 2022-01-10 18:18:21 -0800 Followup bug-235035-20220110170524.patch text/plain 11567 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3ODI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTkwOGQwYjY3YTc3NDM4 OWE5NzY2Y2NmYzY0NDFmODljMDFhZmEzMS4uNWU1OTkzYmY4YzRhZjQ5NDI4ZDc2NDQwM2U4YTUy MjA1ZTUzNTgxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDIyLTAxLTEwICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIEZvbGxvd3VwIHRv IHIyODc4NjMgLSBhZGp1c3QgbGluZSB3cmFwcGluZyBiZWhhdmlvciBpbiBpbWFnZSBvdmVybGF5 cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1MDM1 CisgICAgICAgIHJkYXI6Ly84NTEzOTE0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoZSBwcmV2aW91cyBjaGFuZ2UgSSBsYW5kZWQgaW4gcjI4Nzg2 MyB3YXMgd3JpdHRlbiB1bmRlciB0aGUgYXNzdW1wdGlvbiB0aGF0IGAtc2hvdWxkV3JhcGAgZGVz Y3JpYmVzIHdoZXRoZXIgb3IKKyAgICAgICAgbm90IGEgcmVjb2duaXplZCBsaW5lIG9mIHRleHQg c2hvdWxkIHdyYXAgdG8gdGhlIG5leHQgbGluZS4gSG93ZXZlciwgYWZ0ZXIgdHJ5aW5nIGl0IG91 dCwgaXQgc2VlbXMgdG8gaW5kaWNhdGUKKyAgICAgICAgd2hldGhlciBvciBub3QgdGhlIHByZXZp b3VzIGxpbmUgb2YgdGV4dCBzaG91bGQgd3JhcCB0byB0aGUgY3VycmVudCBsaW5lLiBBcyBhIHJl c3VsdCwgdGhlIGN1cnJlbnQgYWRvcHRpb24gb2YKKyAgICAgICAgdGhpcyBwcm9wZXJ0eSBpcyB3 cm9uZywgc2luY2UgdGhlIGxpbmUgd3JhcHBpbmcgaXMgb2ZmLWJ5LW9uZS4KKworICAgICAgICBG aXggdGhpcyBieSByZW5hbWluZyB0aGUgYHNob3VsZFdyYXBgIGJvb2xlYW4gZmxhZyBpbiBUZXh0 UmVjb2duaXRpb25MaW5lRGF0YSB0byB0aGUgbXVjaCBsZXNzIGFtYmlndW91cyBuYW1lCisgICAg ICAgIGBoYXNUcmFpbGluZ05ld2xpbmVgLCBhbmQgc2V0IGBoYXNUcmFpbGluZ05ld2xpbmVgIGJh c2VkIG9uIHRoZSBgc2hvdWxkV3JhcGAgcHJvcGVydHkgb2YgdGhlICpuZXh0KgorICAgICAgICBW S1dLTGluZUluZm8uCisKKyAgICAgICAgKiBkb20vSW1hZ2VPdmVybGF5LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkltYWdlT3ZlcmxheTo6dXBkYXRlU3VidHJlZSk6CisKKyAgICAgICAgQXZvaWQg YSBwb3RlbnRpYWxseSBldmVuLW1vcmUtY29uZnVzaW5nIGAhPSAhIWAgaGVyZSBieSB1c2luZyBg c3RhdGljX2Nhc3Q8PmAgdG8gY2hlY2sgdGhlIG51bGxpdHkgb2YgdGhlCisgICAgICAgIGBSZWZQ dHJgLgorCisgICAgICAgICogcGxhdGZvcm0vVGV4dFJlY29nbml0aW9uUmVzdWx0Lmg6CisgICAg ICAgIChXZWJDb3JlOjpUZXh0UmVjb2duaXRpb25MaW5lRGF0YTo6VGV4dFJlY29nbml0aW9uTGlu ZURhdGEpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dFJlY29nbml0aW9uTGluZURhdGE6OmVuY29k ZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0UmVjb2duaXRpb25MaW5lRGF0YTo6ZGVj b2RlKToKKworICAgICAgICBNYWtlIHN1cmUgd2UgYWxzbyBmbGlwIHRoZSBkZWZhdWx0IGZyb20g YGZhbHNlYCB0byBgdHJ1ZWAsIHNpbmNlIGBoYXNUcmFpbGluZ05ld2xpbmVgIGlzIGludGVuZGVk IHRvIGhhdmUgdGhlCisgICAgICAgIG9wcG9zaXRlIGVmZmVjdCBhcyB0aGUgZXh0YW50IGBzaG91 bGRXcmFwYC4KKworICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6Om1ha2VEYXRhRm9yTGluZSk6CisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHMuaDoK KyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5pZGw6CisKIDIwMjItMDEtMTAgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIHN1cHBvcnQgZm9y IGEgLXNob3VsZFdyYXAgcHJvcGVydHkgd2hlbiBpbmplY3RpbmcgTGl2ZSBUZXh0CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmlu ZGV4IDlkYTliMDM2YWEwNGUyMmQyMTk4NjdhZWUwMGI0NWRlYjZmNDFlNGYuLmMxMGNiNjdjYjk2 YzVjNDI4YmM1NGFiODA3ZDVhYzUyOGMzNjdkMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMjItMDEtMTAgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAg ICAgICAgRm9sbG93dXAgdG8gcjI4Nzg2MyAtIGFkanVzdCBsaW5lIHdyYXBwaW5nIGJlaGF2aW9y IGluIGltYWdlIG92ZXJsYXlzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMzUwMzUKKyAgICAgICAgcmRhcjovLzg1MTM5MTQ2CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIHRoZSBgLXNob3VsZFdyYXBg IHByb3BlcnR5IHRvIGNvbXB1dGUgYGhhc1RyYWlsaW5nTmV3bGluZWAuIFNlZSBXZWJDb3JlL0No YW5nZUxvZyBmb3IgbW9yZSBkZXRhaWxzLgorCisgICAgICAgICogUGxhdGZvcm0vY29jb2EvVGV4 dFJlY29nbml0aW9uVXRpbGl0aWVzLm1tOgorICAgICAgICAoV2ViS2l0OjptYWtlVGV4dFJlY29n bml0aW9uUmVzdWx0KToKKwogMjAyMi0wMS0xMCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVo QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgc3VwcG9ydCBmb3IgYSAtc2hvdWxkV3JhcCBwcm9w ZXJ0eSB3aGVuIGluamVjdGluZyBMaXZlIFRleHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9JbWFnZU92ZXJsYXkuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0ltYWdlT3ZlcmxheS5j cHAKaW5kZXggZWE3ZTg5NDZmYjM0ZmFjNjhjMTc3OWNmZmI0MTEzN2U0ZThiOGJkOC4uNTgzZjFj MzM4MTg5MzEzNzlhNjk5YzA0NDQxZTAwZmQ1YWUwZDMwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZG9tL0ltYWdlT3ZlcmxheS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0ltYWdl T3ZlcmxheS5jcHAKQEAgLTI3Niw3ICsyNzYsNyBAQCBzdGF0aWMgRWxlbWVudHMgdXBkYXRlU3Vi dHJlZShIVE1MRWxlbWVudCYgZWxlbWVudCwgY29uc3QgVGV4dFJlY29nbml0aW9uUmVzdWx0Jgog CiAgICAgICAgICAgICAgICAgYXV0byYgbGluZUVsZW1lbnRzID0gZWxlbWVudHMubGluZXNbbGlu ZUluZGV4XTsKICAgICAgICAgICAgICAgICBhdXRvJiBjaGlsZFRleHRFbGVtZW50cyA9IGxpbmVF bGVtZW50cy5jaGlsZHJlbjsKLSAgICAgICAgICAgICAgICBpZiAobGluZVJlc3VsdC5zaG91bGRX cmFwICE9ICFsaW5lRWxlbWVudHMubGluZUJyZWFrKQorICAgICAgICAgICAgICAgIGlmIChsaW5l UmVzdWx0Lmhhc1RyYWlsaW5nTmV3bGluZSAhPSBzdGF0aWNfY2FzdDxib29sPihsaW5lRWxlbWVu dHMubGluZUJyZWFrKSkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAg ICAgICAgICAgICAgaWYgKGNoaWxkUmVzdWx0cy5zaXplKCkgIT0gY2hpbGRUZXh0RWxlbWVudHMu c2l6ZSgpKQpAQCAtMzM1LDcgKzMzNSw3IEBAIHN0YXRpYyBFbGVtZW50cyB1cGRhdGVTdWJ0cmVl KEhUTUxFbGVtZW50JiBlbGVtZW50LCBjb25zdCBUZXh0UmVjb2duaXRpb25SZXN1bHQmCiAgICAg ICAgICAgICAgICAgbGluZUVsZW1lbnRzLmNoaWxkcmVuLnVuY2hlY2tlZEFwcGVuZChXVEZNb3Zl KHRleHRDb250YWluZXIpKTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgaWYgKCFsaW5l LnNob3VsZFdyYXApIHsKKyAgICAgICAgICAgIGlmIChsaW5lLmhhc1RyYWlsaW5nTmV3bGluZSkg ewogICAgICAgICAgICAgICAgIGxpbmVFbGVtZW50cy5saW5lQnJlYWsgPSBIVE1MQlJFbGVtZW50 OjpjcmVhdGUoZG9jdW1lbnQuZ2V0KCkpOwogICAgICAgICAgICAgICAgIGxpbmVDb250YWluZXIt PmFwcGVuZENoaWxkKCpsaW5lRWxlbWVudHMubGluZUJyZWFrKTsKICAgICAgICAgICAgIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1RleHRSZWNvZ25pdGlvblJlc3VsdC5o IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVGV4dFJlY29nbml0aW9uUmVzdWx0LmgKaW5kZXgg NjFiNTA1YjE5MjllNWY1MDA4ZTg1YWM0M2FhM2VmMGViOTJkZTk5Mi4uNDU3YTFkNGY4OGEzYmMz YWRmNmQ5NTFhZTYwOGE1NTQzYThiMTJiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vVGV4dFJlY29nbml0aW9uUmVzdWx0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vVGV4dFJlY29nbml0aW9uUmVzdWx0LmgKQEAgLTgxLDE2ICs4MSwxNiBAQCB0ZW1wbGF0ZTxj bGFzcyBEZWNvZGVyPiBzdGQ6Om9wdGlvbmFsPFRleHRSZWNvZ25pdGlvbldvcmREYXRhPiBUZXh0 UmVjb2duaXRpb25XbwogfQogCiBzdHJ1Y3QgVGV4dFJlY29nbml0aW9uTGluZURhdGEgewotICAg IFRleHRSZWNvZ25pdGlvbkxpbmVEYXRhKEZsb2F0UXVhZCYmIHF1YWQsIFZlY3RvcjxUZXh0UmVj b2duaXRpb25Xb3JkRGF0YT4mJiB0aGVDaGlsZHJlbiwgYm9vbCB3cmFwKQorICAgIFRleHRSZWNv Z25pdGlvbkxpbmVEYXRhKEZsb2F0UXVhZCYmIHF1YWQsIFZlY3RvcjxUZXh0UmVjb2duaXRpb25X b3JkRGF0YT4mJiB0aGVDaGlsZHJlbiwgYm9vbCBuZXdsaW5lKQogICAgICAgICA6IG5vcm1hbGl6 ZWRRdWFkKFdURk1vdmUocXVhZCkpCiAgICAgICAgICwgY2hpbGRyZW4oV1RGTW92ZSh0aGVDaGls ZHJlbikpCi0gICAgICAgICwgc2hvdWxkV3JhcCh3cmFwKQorICAgICAgICAsIGhhc1RyYWlsaW5n TmV3bGluZShuZXdsaW5lKQogICAgIHsKICAgICB9CiAKICAgICBGbG9hdFF1YWQgbm9ybWFsaXpl ZFF1YWQ7CiAgICAgVmVjdG9yPFRleHRSZWNvZ25pdGlvbldvcmREYXRhPiBjaGlsZHJlbjsKLSAg ICBib29sIHNob3VsZFdyYXAgeyBmYWxzZSB9OworICAgIGJvb2wgaGFzVHJhaWxpbmdOZXdsaW5l IHsgdHJ1ZSB9OwogCiAgICAgdGVtcGxhdGU8Y2xhc3MgRW5jb2Rlcj4gdm9pZCBlbmNvZGUoRW5j b2RlciYpIGNvbnN0OwogICAgIHRlbXBsYXRlPGNsYXNzIERlY29kZXI+IHN0YXRpYyBzdGQ6Om9w dGlvbmFsPFRleHRSZWNvZ25pdGlvbkxpbmVEYXRhPiBkZWNvZGUoRGVjb2RlciYpOwpAQCAtMTE2 LDcgKzExNiw3IEBAIHRlbXBsYXRlPGNsYXNzIEVuY29kZXI+IHZvaWQgVGV4dFJlY29nbml0aW9u TGluZURhdGE6OmVuY29kZShFbmNvZGVyJiBlbmNvZGVyKSBjCiB7CiAgICAgZW5jb2RlciA8PCBu b3JtYWxpemVkUXVhZDsKICAgICBlbmNvZGVyIDw8IGNoaWxkcmVuOwotICAgIGVuY29kZXIgPDwg c2hvdWxkV3JhcDsKKyAgICBlbmNvZGVyIDw8IGhhc1RyYWlsaW5nTmV3bGluZTsKIH0KIAogdGVt cGxhdGU8Y2xhc3MgRGVjb2Rlcj4gc3RkOjpvcHRpb25hbDxUZXh0UmVjb2duaXRpb25MaW5lRGF0 YT4gVGV4dFJlY29nbml0aW9uTGluZURhdGE6OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyKQpAQCAt MTMxLDEyICsxMzEsMTIgQEAgdGVtcGxhdGU8Y2xhc3MgRGVjb2Rlcj4gc3RkOjpvcHRpb25hbDxU ZXh0UmVjb2duaXRpb25MaW5lRGF0YT4gVGV4dFJlY29nbml0aW9uTGkKICAgICBpZiAoIWNoaWxk cmVuKQogICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwogCi0gICAgc3RkOjpvcHRpb25hbDxi b29sPiBzaG91bGRXcmFwOwotICAgIGRlY29kZXIgPj4gc2hvdWxkV3JhcDsKLSAgICBpZiAoIXNo b3VsZFdyYXApCisgICAgc3RkOjpvcHRpb25hbDxib29sPiBoYXNUcmFpbGluZ05ld2xpbmU7Cisg ICAgZGVjb2RlciA+PiBoYXNUcmFpbGluZ05ld2xpbmU7CisgICAgaWYgKCFoYXNUcmFpbGluZ05l d2xpbmUpCiAgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CiAKLSAgICByZXR1cm4geyB7IFdU Rk1vdmUoKm5vcm1hbGl6ZWRRdWFkKSwgV1RGTW92ZSgqY2hpbGRyZW4pLCAqc2hvdWxkV3JhcCB9 IH07CisgICAgcmV0dXJuIHsgeyBXVEZNb3ZlKCpub3JtYWxpemVkUXVhZCksIFdURk1vdmUoKmNo aWxkcmVuKSwgKmhhc1RyYWlsaW5nTmV3bGluZSB9IH07CiB9CiAKIHN0cnVjdCBUZXh0UmVjb2du aXRpb25CbG9ja0RhdGEgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRl cm5hbHMuY3BwIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCmluZGV4IGZi M2QwYzIzNjY1MzNlZjU4YjdhZGM2YjgyMmJjNmY4YWZhOTA1NzcuLjM1YTY2ZTA5NWU3NWExMzQ3 OWM3YjFjNTYyY2UxMTkxYWIxZWUxOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3Rp bmcvSW50ZXJuYWxzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5j cHAKQEAgLTU3NzAsNyArNTc3MCw3IEBAIHN0YXRpYyBUZXh0UmVjb2duaXRpb25MaW5lRGF0YSBt YWtlRGF0YUZvckxpbmUoY29uc3QgSW50ZXJuYWxzOjpJbWFnZU92ZXJsYXlMaW5lCiAgICAgICAg IGxpbmUuY2hpbGRyZW4ubWFwKFtdKGF1dG8mIHRleHRDaGlsZCkgLT4gVGV4dFJlY29nbml0aW9u V29yZERhdGEgewogICAgICAgICAgICAgcmV0dXJuIHsgdGV4dENoaWxkLnRleHQsIGdldFF1YWQ8 SW50ZXJuYWxzOjpJbWFnZU92ZXJsYXlUZXh0Pih0ZXh0Q2hpbGQpLCB0ZXh0Q2hpbGQuaGFzTGVh ZGluZ1doaXRlc3BhY2UgfTsKICAgICAgICAgfSksCi0gICAgICAgIGxpbmUuc2hvdWxkV3JhcAor ICAgICAgICBsaW5lLmhhc1RyYWlsaW5nTmV3bGluZQogICAgIH07CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmggYi9Tb3VyY2UvV2ViQ29yZS90ZXN0 aW5nL0ludGVybmFscy5oCmluZGV4IDcwZGQxNTMwYzE2MTA1YjFlOWMzZWQ0OTk5OWZjZmJlZWFm ZGQ5YzkuLjg4ZDFmOWZjNjdkYTBjM2M1ODc5NjU5Njk1Yzc0ZGQ1NzJiZDkxYTYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgKKysrIGIvU291cmNlL1dlYkNv cmUvdGVzdGluZy9JbnRlcm5hbHMuaApAQCAtOTIyLDcgKzkyMiw3IEBAIHB1YmxpYzoKICAgICAg ICAgUmVmUHRyPERPTVBvaW50UmVhZE9ubHk+IGJvdHRvbVJpZ2h0OwogICAgICAgICBSZWZQdHI8 RE9NUG9pbnRSZWFkT25seT4gYm90dG9tTGVmdDsKICAgICAgICAgVmVjdG9yPEltYWdlT3Zlcmxh eVRleHQ+IGNoaWxkcmVuOwotICAgICAgICBib29sIHNob3VsZFdyYXAgeyBmYWxzZSB9OworICAg ICAgICBib29sIGhhc1RyYWlsaW5nTmV3bGluZSB7IHRydWUgfTsKIAogICAgICAgICB+SW1hZ2VP dmVybGF5TGluZSgpOwogICAgIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5n L0ludGVybmFscy5pZGwgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwKaW5k ZXggNjUyYTZkYjNiYzZkYmM1YTFhN2VlYjYwZGUzYTcyMWRhYTAxMjU5MS4uZjlhNWJiODIwOTYw YzQwYWQyNDNmZTdkMjIwZTFlYTczYWViOTI0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv dGVzdGluZy9JbnRlcm5hbHMuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJu YWxzLmlkbApAQCAtMjkyLDcgKzI5Miw3IEBAIGVudW0gSEVWQ1BhcmFtZXRlckNvZGVjIHsKICAg ICByZXF1aXJlZCBET01Qb2ludFJlYWRPbmx5IGJvdHRvbVJpZ2h0OwogICAgIHJlcXVpcmVkIERP TVBvaW50UmVhZE9ubHkgYm90dG9tTGVmdDsKICAgICBzZXF1ZW5jZTxJbWFnZU92ZXJsYXlUZXh0 PiBjaGlsZHJlbjsKLSAgICBib29sZWFuIHNob3VsZFdyYXAgPSBmYWxzZTsKKyAgICBib29sZWFu IGhhc1RyYWlsaW5nTmV3bGluZSA9IHRydWU7CiB9OwogCiBbCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1BsYXRmb3JtL2NvY29hL1RleHRSZWNvZ25pdGlvblV0aWxpdGllcy5tbSBiL1NvdXJj ZS9XZWJLaXQvUGxhdGZvcm0vY29jb2EvVGV4dFJlY29nbml0aW9uVXRpbGl0aWVzLm1tCmluZGV4 IDBmZGRkYWY3YzMwZTIzYjRhYzRiNWJkMWExYjMzZjRjNzY5OTFlYmYuLmUwZGNmMjkyNWE1MzBm MjVlMjdmNzliZWFiYTQ5Y2ZlNDY1YjRhZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxh dGZvcm0vY29jb2EvVGV4dFJlY29nbml0aW9uVXRpbGl0aWVzLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvUGxhdGZvcm0vY29jb2EvVGV4dFJlY29nbml0aW9uVXRpbGl0aWVzLm1tCkBAIC03OCwxMSAr NzgsMTIgQEAgc3RhdGljIFZlY3RvcjxGbG9hdFF1YWQ+IGZsb2F0UXVhZHMoTlNBcnJheTxWS1F1 YWQgKj4gKnZrUXVhZHMpCiAKIFRleHRSZWNvZ25pdGlvblJlc3VsdCBtYWtlVGV4dFJlY29nbml0 aW9uUmVzdWx0KFZLSW1hZ2VBbmFseXNpcyAqYW5hbHlzaXMpCiB7Ci0gICAgTlNBcnJheTxWS1dL VGV4dEluZm8gKj4gKmFsbExpbmVzID0gYW5hbHlzaXMuYWxsTGluZXM7CisgICAgTlNBcnJheTxW S1dLTGluZUluZm8gKj4gKmFsbExpbmVzID0gYW5hbHlzaXMuYWxsTGluZXM7CiAgICAgVGV4dFJl Y29nbml0aW9uUmVzdWx0IHJlc3VsdDsKICAgICByZXN1bHQubGluZXMucmVzZXJ2ZUluaXRpYWxD YXBhY2l0eShhbGxMaW5lcy5jb3VudCk7CiAKICAgICBib29sIGlzRmlyc3RMaW5lID0gdHJ1ZTsK KyAgICBzaXplX3QgbmV4dExpbmVJbmRleCA9IDE7CiAgICAgZm9yIChWS1dLTGluZUluZm8gKmxp bmUgaW4gYWxsTGluZXMpIHsKICAgICAgICAgVmVjdG9yPFRleHRSZWNvZ25pdGlvbldvcmREYXRh PiBjaGlsZHJlbjsKICAgICAgICAgTlNBcnJheTxWS1dLVGV4dEluZm8gKj4gKnZrQ2hpbGRyZW4g PSBsaW5lLmNoaWxkcmVuOwpAQCAtMTE0LDEyICsxMTUsMTIgQEAgVGV4dFJlY29nbml0aW9uUmVz dWx0IG1ha2VUZXh0UmVjb2duaXRpb25SZXN1bHQoVktJbWFnZUFuYWx5c2lzICphbmFseXNpcykK ICAgICAgICAgICAgIHNlYXJjaExvY2F0aW9uID0gbWF0Y2hMb2NhdGlvbiArIGNoaWxkVGV4dC5s ZW5ndGgoKTsKICAgICAgICAgICAgIGNoaWxkcmVuLnVuY2hlY2tlZEFwcGVuZCh7IFdURk1vdmUo Y2hpbGRUZXh0KSwgZmxvYXRRdWFkKGNoaWxkLnF1YWQpLCBoYXNMZWFkaW5nV2hpdGVzcGFjZSB9 KTsKICAgICAgICAgfQotICAgICAgICByZXN1bHQubGluZXMudW5jaGVja2VkQXBwZW5kKHsKLSAg ICAgICAgICAgIGZsb2F0UXVhZChsaW5lLnF1YWQpLAotICAgICAgICAgICAgV1RGTW92ZShjaGls ZHJlbiksCi0gICAgICAgICAgICBbbGluZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHNo b3VsZFdyYXApXSAmJiBbbGluZSBzaG91bGRXcmFwXQotICAgICAgICB9KTsKKyAgICAgICAgVktX S0xpbmVJbmZvICpuZXh0TGluZSA9IG5leHRMaW5lSW5kZXggPCBhbGxMaW5lcy5jb3VudCA/IGFs bExpbmVzW25leHRMaW5lSW5kZXhdIDogbmlsOworICAgICAgICAvLyBUaGUgYHNob3VsZFdyYXBg IHByb3BlcnR5IGluZGljYXRlcyB3aGV0aGVyIG9yIG5vdCBhIGxpbmUgc2hvdWxkIHdyYXAsIHJl bGF0aXZlIHRvIHRoZSBwcmV2aW91cyBsaW5lLgorICAgICAgICBib29sIGhhc1RyYWlsaW5nTmV3 bGluZSA9IG5leHRMaW5lICYmICghW25leHRMaW5lIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0 b3Ioc2hvdWxkV3JhcCldIHx8ICFbbmV4dExpbmUgc2hvdWxkV3JhcF0pOworICAgICAgICByZXN1 bHQubGluZXMudW5jaGVja2VkQXBwZW5kKHsgZmxvYXRRdWFkKGxpbmUucXVhZCksIFdURk1vdmUo Y2hpbGRyZW4pLCBoYXNUcmFpbGluZ05ld2xpbmUgfSk7CiAgICAgICAgIGlzRmlyc3RMaW5lID0g ZmFsc2U7CisgICAgICAgIG5leHRMaW5lSW5kZXgrKzsKICAgICB9CiAKICNpZiBFTkFCTEUoREFU QV9ERVRFQ1RJT04pCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKaW5kZXggYjdhZDlhZTllMDMxZjEwNmE1NWM4MDJmZWQyYjQwZjc1MzA2 MDQzNi4uMjNmMWU0NDBhYzFjMjQzMTkwY2I5OWI1MjZmOGE1YzJmZGJkNGMyZSAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE2IEBACisyMDIyLTAxLTEwICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBw bGUuY29tPgorCisgICAgICAgIEZvbGxvd3VwIHRvIHIyODc4NjMgLSBhZGp1c3QgbGluZSB3cmFw cGluZyBiZWhhdmlvciBpbiBpbWFnZSBvdmVybGF5cworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1MDM1CisgICAgICAgIHJkYXI6Ly84NTEzOTE0Ngor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgYSBz bGlnaHQgYWRqdXN0bWVudCB0byBhbiBleGlzdGluZyBsYXlvdXQgdGVzdCAoaS5lLiByZW5hbWUg YHNob3VsZFdyYXBgIHRvIGBoYXNUcmFpbGluZ05ld2xpbmVgKS4gU2VlCisgICAgICAgIFdlYkNv cmUvQ2hhbmdlTG9nIGZvciBtb3JlIGRldGFpbHMuCisKKyAgICAgICAgKiBmYXN0L2ltYWdlcy90 ZXh0LXJlY29nbml0aW9uL2ltYWdlLW92ZXJsYXktbGluZS13cmFwcGluZy5odG1sOgorCiAyMDIy LTAxLTEwICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAg IEFkZCBzdXBwb3J0IGZvciBhIC1zaG91bGRXcmFwIHByb3BlcnR5IHdoZW4gaW5qZWN0aW5nIExp dmUgVGV4dApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9pbWFnZXMvdGV4dC1yZWNvZ25p dGlvbi9pbWFnZS1vdmVybGF5LWxpbmUtd3JhcHBpbmcuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qv aW1hZ2VzL3RleHQtcmVjb2duaXRpb24vaW1hZ2Utb3ZlcmxheS1saW5lLXdyYXBwaW5nLmh0bWwK aW5kZXggM2Y1OGQyZTE4ZGYzMDQ1MGZkYWE5YmFkZThiOGNhYWJjY2U2ODE2NS4uYjA1OTg2YWE4 MmZlMDU1ZDUxYzk1YzRmZDY1YmQxODAxMTVkOTkyMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv ZmFzdC9pbWFnZXMvdGV4dC1yZWNvZ25pdGlvbi9pbWFnZS1vdmVybGF5LWxpbmUtd3JhcHBpbmcu aHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2ltYWdlcy90ZXh0LXJlY29nbml0aW9uL2ltYWdl LW92ZXJsYXktbGluZS13cmFwcGluZy5odG1sCkBAIC0yNSw3ICsyNSw3IEBAIGFkZEV2ZW50TGlz dGVuZXIoImxvYWQiLCAoKSA9PiB7CiAgICAgICAgICAgICB0b3BSaWdodCA6IG5ldyBET01Qb2lu dFJlYWRPbmx5KDEsIDApLAogICAgICAgICAgICAgYm90dG9tUmlnaHQgOiBuZXcgRE9NUG9pbnRS ZWFkT25seSgxLCAwLjMpLAogICAgICAgICAgICAgYm90dG9tTGVmdCA6IG5ldyBET01Qb2ludFJl YWRPbmx5KDAsIDAuMyksCi0gICAgICAgICAgICBzaG91bGRXcmFwOiB0cnVlLAorICAgICAgICAg ICAgaGFzVHJhaWxpbmdOZXdsaW5lOiBmYWxzZSwKICAgICAgICAgICAgIGNoaWxkcmVuOiBbCiAg ICAgICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICAgICB0ZXh0IDogInRoaXMiLAo=