204712 2019-11-29 20:38:04 -0800 [LFC][IFC] Add support for hyphenate-limit-lines 2019-11-30 07:16:31 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1594284 0 zalan 2019-11-29 20:38:04 -0800 ssia 1594285 1 webkit-bug-importer 2019-11-29 20:38:27 -0800 <rdar://problem/57536727> 1594286 2 384534 zalan 2019-11-29 20:46:37 -0800 Created attachment 384534 Patch 1594313 3 384534 commit-queue 2019-11-30 07:16:29 -0800 Comment on attachment 384534 Patch Clearing flags on attachment: 384534 Committed r252958: <https://trac.webkit.org/changeset/252958> 1594314 4 commit-queue 2019-11-30 07:16:31 -0800 All reviewed patches have been landed. Closing bug. 384534 2019-11-29 20:46:37 -0800 2019-11-30 07:16:29 -0800 Patch bug-204712-20191129204606.patch text/plain 18135 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyOTUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTRmZWNiMDEwNTJmODlj MjgyZDFlMzQ1OWVkYWJjNTZhMTM2YWJhMy4uZmZiOGZlMzZjZDk0MmY3YzZlZGM4M2QwMzY3MmU4 MGFjYmRhMjc4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE5LTExLTI5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgc3Vw cG9ydCBmb3IgaHlwaGVuYXRlLWxpbWl0LWxpbmVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDQ3MTIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU3 NTM2NzI3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE5vdyBJRkMgKGh5cGhlbmF0aW9uKWZlYXR1cmUgbWF0Y2hlcyBTTEwuIAorCisgICAgICAgICog bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGluZUxheW91 dCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpj b21wdXRlZEludHJpbnNpY1dpZHRoRm9yQ29uc3RyYWludCBjb25zdCk6CisgICAgICAgICogbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpMaW5lQnJlYWtlcjo6d29yZEJyZWFraW5nQmVoYXZpb3IgY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnJlYWtlcjo6dHJ5QnJlYWtpbmdUZXh0UnVu IGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnJl YWtlci5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnJlYWtlcjo6c2V0SHlwaGVu YXRpb25EaXNhYmxlZCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxh eW91dENvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lTGF5b3V0Q29u dGV4dDo6TGluZUxheW91dENvbnRleHQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5l TGF5b3V0Q29udGV4dDo6bGF5b3V0TGluZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Okxp bmVMYXlvdXRDb250ZXh0OjpjbG9zZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVM YXlvdXRDb250ZXh0Ojpwcm9jZXNzVW5jb21taXR0ZWRDb250ZW50KToKKyAgICAgICAgKiBsYXlv dXQvaW5saW5lZm9ybWF0dGluZy9MaW5lTGF5b3V0Q29udGV4dC5oOgorCiAyMDE5LTExLTI5ICBa YWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBBZGQg c3VwcG9ydCBmb3IgaHlwaGVuYXRlLWxpbWl0LWJlZm9yZSBhbmQgaHlwaGVuYXRlLWxpbWl0LWFm dGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggNTA5NzZhMDFmYmVk ZGYxZDMzYjM4OTZmNjI0OTQ5NjgwYjE0NDk4Mi4uNjVhYjk0MDA1YzA5YTg1OTFhMzQ4OGQyMTI0 NTk5OGJhMTI1OGUzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAt OTYsNyArOTYsNyBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsaW5lTGF5b3V0KGNv bnN0IFVzZWRIb3Jpem9udGFsVmFsdWVzJiB1c2VkSG9yaXpvbgogICAgIHVuc2lnbmVkIGxlYWRp bmdJbmxpbmVJdGVtSW5kZXggPSAwOwogICAgIE9wdGlvbmFsPExpbmVMYXlvdXRDb250ZXh0OjpQ YXJ0aWFsQ29udGVudD4gbGVhZGluZ1BhcnRpYWxDb250ZW50OwogICAgIGF1dG8gbGluZUJ1aWxk ZXIgPSBMaW5lQnVpbGRlciB7ICp0aGlzLCByb290KCkuc3R5bGUoKS50ZXh0QWxpZ24oKSwgTGlu ZUJ1aWxkZXI6OlNraXBBbGlnbm1lbnQ6Ok5vIH07Ci0gICAgYXV0byBsaW5lTGF5b3V0Q29udGV4 dCA9IExpbmVMYXlvdXRDb250ZXh0IHsgKnRoaXMsIGlubGluZUl0ZW1zIH07CisgICAgYXV0byBs aW5lTGF5b3V0Q29udGV4dCA9IExpbmVMYXlvdXRDb250ZXh0IHsgKnRoaXMsIHJvb3QoKSwgaW5s aW5lSXRlbXMgfTsKIAogICAgIHdoaWxlIChsZWFkaW5nSW5saW5lSXRlbUluZGV4IDwgaW5saW5l SXRlbXMuc2l6ZSgpKSB7CiAgICAgICAgIGxpbmVCdWlsZGVyLmluaXRpYWxpemUoY29uc3RyYWlu dHNGb3JMaW5lKHVzZWRIb3Jpem9udGFsVmFsdWVzLCBsaW5lTG9naWNhbFRvcCkpOwpAQCAtMTA3 LDExICsxMDcsMTEgQEAgdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGluZUxheW91dChj b25zdCBVc2VkSG9yaXpvbnRhbFZhbHVlcyYgdXNlZEhvcml6b24KICAgICAgICAgaWYgKGxpbmVD b250ZW50LnRyYWlsaW5nSW5saW5lSXRlbUluZGV4KSB7CiAgICAgICAgICAgICBsaW5lTG9naWNh bFRvcCA9IGxpbmVDb250ZW50LmxpbmVCb3gubG9naWNhbEJvdHRvbSgpOwogICAgICAgICAgICAg Ly8gV2hlbiB0aGUgdHJhaWxpbmcgY29udGVudCBpcyBwYXJ0aWFsLCB3ZSBuZWVkIHRvIHJldXNl IHRoZSBsYXN0IElubGluSXRlbS4KLSAgICAgICAgICAgIGlmIChsaW5lQ29udGVudC50cmFpbGlu Z1BhcnRpYWxDb250ZW50KSB7CisgICAgICAgICAgICBpZiAobGluZUNvbnRlbnQub3ZlcmZsb3dQ YXJ0aWFsQ29udGVudCkgewogICAgICAgICAgICAgICAgIGxlYWRpbmdJbmxpbmVJdGVtSW5kZXgg PSAqbGluZUNvbnRlbnQudHJhaWxpbmdJbmxpbmVJdGVtSW5kZXg7CiAgICAgICAgICAgICAgICAg Ly8gVHVybiBwcmV2aW91cyBsaW5lJ3Mgb3ZlcmZsb3cgY29udGVudCBsZW5ndGggaW50byB0aGUg bmV4dCBsaW5lJ3MgbGVhZGluZyBjb250ZW50IHBhcnRpYWwgbGVuZ3RoLgogICAgICAgICAgICAg ICAgIC8vICJzcDwtPmxpdGNvbnRlbnQiIC0+IG92ZXJmbG93IGxlbmd0aDogMTAgLT4gbGVhZGlu ZyBwYXJ0aWFsIGNvbnRlbnQgbGVuZ3RoOiAxMC4gCi0gICAgICAgICAgICAgICAgbGVhZGluZ1Bh cnRpYWxDb250ZW50ID0gTGluZUxheW91dENvbnRleHQ6OlBhcnRpYWxDb250ZW50IHsgbGluZUNv bnRlbnQudHJhaWxpbmdQYXJ0aWFsQ29udGVudC0+bGVuZ3RoIH07CisgICAgICAgICAgICAgICAg bGVhZGluZ1BhcnRpYWxDb250ZW50ID0gTGluZUxheW91dENvbnRleHQ6OlBhcnRpYWxDb250ZW50 IHsgbGluZUNvbnRlbnQub3ZlcmZsb3dQYXJ0aWFsQ29udGVudC0+bGVuZ3RoIH07CiAgICAgICAg ICAgICB9IGVsc2UKICAgICAgICAgICAgICAgICBsZWFkaW5nSW5saW5lSXRlbUluZGV4ID0gKmxp bmVDb250ZW50LnRyYWlsaW5nSW5saW5lSXRlbUluZGV4ICsgMTsKICAgICAgICAgfSBlbHNlIHsK QEAgLTIzNCw3ICsyMzQsNyBAQCBMYXlvdXRVbml0IElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpj b21wdXRlZEludHJpbnNpY1dpZHRoRm9yQ29uc3RyYWludChjb25zdCBVcwogICAgIExheW91dFVu aXQgbWF4aW11bUxpbmVXaWR0aDsKICAgICB1bnNpZ25lZCBsZWFkaW5nSW5saW5lSXRlbUluZGV4 ID0gMDsKICAgICBhdXRvIGxpbmVCdWlsZGVyID0gTGluZUJ1aWxkZXIgeyAqdGhpcywgcm9vdCgp LnN0eWxlKCkudGV4dEFsaWduKCksIExpbmVCdWlsZGVyOjpTa2lwQWxpZ25tZW50OjpZZXMgfTsK LSAgICBhdXRvIGxpbmVMYXlvdXRDb250ZXh0ID0gTGluZUxheW91dENvbnRleHQgeyAqdGhpcywg aW5saW5lSXRlbXMgfTsKKyAgICBhdXRvIGxpbmVMYXlvdXRDb250ZXh0ID0gTGluZUxheW91dENv bnRleHQgeyAqdGhpcywgcm9vdCgpLCBpbmxpbmVJdGVtcyB9OwogICAgIHdoaWxlIChsZWFkaW5n SW5saW5lSXRlbUluZGV4IDwgaW5saW5lSXRlbXMuc2l6ZSgpKSB7CiAgICAgICAgIC8vIE9ubHkg dGhlIGhvcml6dG9uYWwgYXZhaWxhYmxlIHdpZHRoIGlzIGNvbnN0cmFpbmVkIHdoZW4gY29tcHV0 aW5nIGludHJpbnNpYyB3aWR0aC4KICAgICAgICAgbGluZUJ1aWxkZXIuaW5pdGlhbGl6ZShMaW5l QnVpbGRlcjo6Q29uc3RyYWludHMgeyB7IH0sIHVzZWRIb3Jpem9udGFsVmFsdWVzLmNvbnN0cmFp bnRzLndpZHRoLCBmYWxzZSwgeyB9IH0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwCmluZGV4IDg4 OWFhMGJjMDk1MzM3M2QwZWEwODk2M2I4MzUxY2UyNDMxNTBlYjYuLjUzMGI4OTk1Y2EzNjg3ZjJm OTI4N2ZjZDQwYWZmMmJkYjM0YWY3MDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5jcHAKQEAgLTEy MSwxNCArMTIxLDE1IEBAIE9wdGlvbmFsPExpbmVCcmVha2VyOjpCcmVha2luZ0NvbnRleHQ6OlRy YWlsaW5nUGFydGlhbENvbnRlbnQ+IExpbmVCcmVha2VyOjp3b3JkCiAgICAgICAgIC8vIDxzcGFu IHN0eWxlPSJ3b3JkLWJyZWFrOiBrZWVwLWFsbCI+dGV4dGNvbnRlbnR3aXRobm9icmVhazwvc3Bh bj48c3Bhbj50ZXh0Y29udGVudHdpdGh5ZXNicmVhazwvc3Bhbj4KICAgICAgICAgLy8gV2hlbiB0 aGUgZmlyc3Qgc3BhbiBjb21wdXRlcyBsb25nZXIgdGhhbiB0aGUgYXZhaWxhYmxlIHNwYWNlLCBi eSB0aGUgdGltZSB3ZSBnZXQgdG8gdGhlIHNlY29uZCBzcGFuLCB0aGUgYWRqdXN0ZWQgYXZhaWxh YmxlIHNwYWNlIGJlY29tZXMgbmVnYXRpdmUuCiAgICAgICAgIGF1dG8gYWRqdXN0ZWRBdmFpbGFi bGVXaWR0aCA9IHN0ZDo6bWF4KExheW91dFVuaXQgeyB9LCBhdmFpbGFibGVXaWR0aCAtIHJ1bnNX aWR0aCArIHJ1bi5sb2dpY2FsV2lkdGgpOwotICAgICAgICBpZiAoYXV0byBzcGxpdExlbmd0aEFu ZFdpZHRoID0gdHJ5QnJlYWtpbmdUZXh0UnVuKHJ1biwgYWRqdXN0ZWRBdmFpbGFibGVXaWR0aCkp Ci0gICAgICAgICAgICByZXR1cm4gQnJlYWtpbmdDb250ZXh0OjpUcmFpbGluZ1BhcnRpYWxDb250 ZW50IHsgaSwgc3BsaXRMZW5ndGhBbmRXaWR0aC0+bGVuZ3RoLCBzcGxpdExlbmd0aEFuZFdpZHRo LT5sZWZ0TG9naWNhbFdpZHRoIH07CisgICAgICAgIGlmIChhdXRvIGxlZnRTaWRlID0gdHJ5QnJl YWtpbmdUZXh0UnVuKHJ1biwgYWRqdXN0ZWRBdmFpbGFibGVXaWR0aCkpCisgICAgICAgICAgICBy ZXR1cm4gQnJlYWtpbmdDb250ZXh0OjpUcmFpbGluZ1BhcnRpYWxDb250ZW50IHsgaSwgbGVmdFNp ZGUtPmxlbmd0aCwgbGVmdFNpZGUtPmxvZ2ljYWxXaWR0aCwgbGVmdFNpZGUtPmhhc0h5cGhlbiB9 OworICAgICAgICByZXR1cm4geyB9OwogICAgIH0KICAgICAvLyBXZSBkaWQgbm90IG1hbmFnZSB0 byBicmVhayBpbiB0aGlzIHNlcXVlbmNlIG9mIHJ1bnMuCiAgICAgcmV0dXJuIHsgfTsKIH0KIAot T3B0aW9uYWw8TGluZUJyZWFrZXI6OlNwbGl0TGVuZ3RoQW5kV2lkdGg+IExpbmVCcmVha2VyOjp0 cnlCcmVha2luZ1RleHRSdW4oY29uc3QgQ29udGVudDo6UnVuJiBvdmVyZmxvd1J1biwgTGF5b3V0 VW5pdCBhdmFpbGFibGVXaWR0aCkgY29uc3QKK09wdGlvbmFsPExpbmVCcmVha2VyOjpMZWZ0U2lk ZT4gTGluZUJyZWFrZXI6OnRyeUJyZWFraW5nVGV4dFJ1bihjb25zdCBDb250ZW50OjpSdW4mIG92 ZXJmbG93UnVuLCBMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoKSBjb25zdAogewogICAgIEFTU0VS VChvdmVyZmxvd1J1bi5pbmxpbmVJdGVtLmlzVGV4dCgpKTsKICAgICBhdXRvJiBzdHlsZSA9IG92 ZXJmbG93UnVuLmlubGluZUl0ZW0uc3R5bGUoKTsKQEAgLTEzOSwxMiArMTQwLDEyIEBAIE9wdGlv bmFsPExpbmVCcmVha2VyOjpTcGxpdExlbmd0aEFuZFdpZHRoPiBMaW5lQnJlYWtlcjo6dHJ5QnJl YWtpbmdUZXh0UnVuKGNvbnN0CiAgICAgaWYgKGJyZWFrV29yZHMgPT0gV29yZEJyZWFrOjpCcmVh a0FsbCkgewogICAgICAgICAvLyBGSVhNRTogUGFzcyBpbiB0aGUgY29udGVudCBsb2dpY2FsIGxl ZnQgdG8gYmUgYWJsZSB0byBtZWFzdXJlIHRhYnMuCiAgICAgICAgIGF1dG8gc3BsaXREYXRhID0g VGV4dFV0aWw6OnNwbGl0KGlubGluZVRleHRJdGVtLmxheW91dEJveCgpLCBpbmxpbmVUZXh0SXRl bS5zdGFydCgpLCBpbmxpbmVUZXh0SXRlbS5sZW5ndGgoKSwgb3ZlcmZsb3dSdW4ubG9naWNhbFdp ZHRoLCBhdmFpbGFibGVXaWR0aCwgeyB9KTsKLSAgICAgICAgcmV0dXJuIFNwbGl0TGVuZ3RoQW5k V2lkdGggeyBzcGxpdERhdGEubGVuZ3RoLCBzcGxpdERhdGEubG9naWNhbFdpZHRoIH07CisgICAg ICAgIHJldHVybiBMZWZ0U2lkZSB7IHNwbGl0RGF0YS5sZW5ndGgsIHNwbGl0RGF0YS5sb2dpY2Fs V2lkdGgsIGZhbHNlIH07CiAgICAgfQogICAgIC8vIEZpbmQgdGhlIGh5cGhlbiBwb3NpdGlvbiBh cyBmb2xsb3dzOgogICAgIC8vIDEuIFNwbGl0IHRoZSB0ZXh0IGJ5IHRha2luZyB0aGUgaHlwaGVu IHdpZHRoIGludG8gYWNjb3VudAogICAgIC8vIDIuIEZpbmQgdGhlIGxhc3QgaHlwaGVuIHBvc2l0 aW9uIGJlZm9yZSB0aGUgc3BsaXQgcG9zaXRpb24KLSAgICBpZiAoc3R5bGUuaHlwaGVucygpICE9 IEh5cGhlbnM6OkF1dG8gfHwgIWNhbkh5cGhlbmF0ZShzdHlsZS5sb2NhbGUoKSkpCisgICAgaWYg KG5faHlwaGVuYXRpb25Jc0Rpc2FibGVkIHx8IHN0eWxlLmh5cGhlbnMoKSAhPSBIeXBoZW5zOjpB dXRvIHx8ICFjYW5IeXBoZW5hdGUoc3R5bGUubG9jYWxlKCkpKQogICAgICAgICByZXR1cm4geyB9 OwogCiAgICAgYXV0byBydW5MZW5ndGggPSBpbmxpbmVUZXh0SXRlbS5sZW5ndGgoKTsKQEAgLTE3 Myw3ICsxNzQsNyBAQCBPcHRpb25hbDxMaW5lQnJlYWtlcjo6U3BsaXRMZW5ndGhBbmRXaWR0aD4g TGluZUJyZWFrZXI6OnRyeUJyZWFraW5nVGV4dFJ1bihjb25zdAogICAgIHVuc2lnbmVkIGh5cGhl bkxvY2F0aW9uID0gbGFzdEh5cGhlbkxvY2F0aW9uKFN0cmluZ1ZpZXcodGV4dENvbnRlbnQpLnN1 YnN0cmluZyhpbmxpbmVUZXh0SXRlbS5zdGFydCgpLCBpbmxpbmVUZXh0SXRlbS5sZW5ndGgoKSks IGh5cGhlbkJlZm9yZSwgc3R5bGUubG9jYWxlKCkpOwogICAgIGlmICghaHlwaGVuTG9jYXRpb24g fHwgaHlwaGVuTG9jYXRpb24gPCBsaW1pdEJlZm9yZSkKICAgICAgICAgcmV0dXJuIHsgfTsKLSAg ICByZXR1cm4gU3BsaXRMZW5ndGhBbmRXaWR0aCB7IGh5cGhlbkxvY2F0aW9uLCBUZXh0VXRpbDo6 d2lkdGgoaW5saW5lVGV4dEl0ZW0ubGF5b3V0Qm94KCksIGlubGluZVRleHRJdGVtLnN0YXJ0KCks IGh5cGhlbkxvY2F0aW9uKSB9OworICAgIHJldHVybiBMZWZ0U2lkZSB7IGh5cGhlbkxvY2F0aW9u LCBUZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4dEl0ZW0ubGF5b3V0Qm94KCksIGlubGluZVRleHRJ dGVtLnN0YXJ0KCksIGh5cGhlbkxvY2F0aW9uKSwgdHJ1ZSB9OwogfQogCiBib29sIExpbmVCcmVh a2VyOjpDb250ZW50Ojppc0F0Q29udGVudEJvdW5kYXJ5KGNvbnN0IElubGluZUl0ZW0mIGlubGlu ZUl0ZW0sIGNvbnN0IENvbnRlbnQmIGNvbnRlbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5oIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuaAppbmRleCAx ZjcyYWIxNDM0NGNjOWU1YzViMjQ3M2IzM2ZmODcyOWQ4NmNjOTNiLi4xMGNiODdkMzFiMDJkM2U0 M2I1ZjY4NjAzNmFkMzcyM2U4OWJiZjM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmgKQEAgLTQ0LDYg KzQ0LDcgQEAgcHVibGljOgogICAgICAgICAgICAgdW5zaWduZWQgcnVuSW5kZXggeyAwIH07CiAg ICAgICAgICAgICB1bnNpZ25lZCBsZW5ndGggeyAwIH07CiAgICAgICAgICAgICBMYXlvdXRVbml0 IGxvZ2ljYWxXaWR0aDsKKyAgICAgICAgICAgIGJvb2wgaGFzSHlwaGVuIHsgZmFsc2UgfTsKICAg ICAgICAgfTsKICAgICAgICAgT3B0aW9uYWw8VHJhaWxpbmdQYXJ0aWFsQ29udGVudD4gdHJhaWxp bmdQYXJ0aWFsQ29udGVudDsKICAgICB9OwpAQCAtODcsMTUgKzg4LDE4IEBAIHB1YmxpYzoKICAg ICBCcmVha2luZ0NvbnRleHQgYnJlYWtpbmdDb250ZXh0Rm9ySW5saW5lQ29udGVudChjb25zdCBD b250ZW50JiwgTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgTGF5b3V0VW5pdCB0cmFpbGluZ1Ry aW1tYWJsZVdpZHRoLCBib29sIGxpbmVJc0VtcHR5KTsKICAgICBib29sIHNob3VsZFdyYXBGbG9h dEJveChMYXlvdXRVbml0IGZsb2F0TG9naWNhbFdpZHRoLCBMYXlvdXRVbml0IGF2YWlsYWJsZVdp ZHRoLCBib29sIGxpbmVJc0VtcHR5KTsKIAotcHJpdmF0ZToKKyAgICB2b2lkIHNldEh5cGhlbmF0 aW9uRGlzYWJsZWQoKSB7IG5faHlwaGVuYXRpb25Jc0Rpc2FibGVkID0gdHJ1ZTsgfQogCitwcml2 YXRlOgogICAgIE9wdGlvbmFsPEJyZWFraW5nQ29udGV4dDo6VHJhaWxpbmdQYXJ0aWFsQ29udGVu dD4gd29yZEJyZWFraW5nQmVoYXZpb3IoY29uc3QgQ29udGVudDo6UnVuTGlzdCYsIExheW91dFVu aXQgYXZhaWxhYmxlV2lkdGgpIGNvbnN0OwotCi0gICAgc3RydWN0IFNwbGl0TGVuZ3RoQW5kV2lk dGggeworICAgIHN0cnVjdCBMZWZ0U2lkZSB7CiAgICAgICAgIHVuc2lnbmVkIGxlbmd0aCB7IDAg fTsKLSAgICAgICAgTGF5b3V0VW5pdCBsZWZ0TG9naWNhbFdpZHRoOworICAgICAgICBMYXlvdXRV bml0IGxvZ2ljYWxXaWR0aDsKKyAgICAgICAgYm9vbCBoYXNIeXBoZW4geyBmYWxzZSB9OwogICAg IH07Ci0gICAgT3B0aW9uYWw8U3BsaXRMZW5ndGhBbmRXaWR0aD4gdHJ5QnJlYWtpbmdUZXh0UnVu KGNvbnN0IENvbnRlbnQ6OlJ1biYgb3ZlcmZsb3dSdW4sIExheW91dFVuaXQgYXZhaWxhYmxlV2lk dGgpIGNvbnN0OworICAgIE9wdGlvbmFsPExlZnRTaWRlPiB0cnlCcmVha2luZ1RleHRSdW4oY29u c3QgQ29udGVudDo6UnVuJiBvdmVyZmxvd1J1biwgTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCkg Y29uc3Q7CisKKyAgICBib29sIG5faHlwaGVuYXRpb25Jc0Rpc2FibGVkIHsgZmFsc2UgfTsKIH07 CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0xpbmVMYXlvdXRDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0LmNwcAppbmRleCA0MzljMDk3MWE2M2ViNzMyNmIwMTk2 MjQ1NWU0MjllNjYxNTM1ZDY3Li44NTk2ZTMyMzEwMGRmMzA1NzgzZmM2M2FlOTc2YjQwNmQ4YTM3 ZjcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9M aW5lTGF5b3V0Q29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvTGluZUxheW91dENvbnRleHQuY3BwCkBAIC02Nyw4ICs2Nyw5IEBAIHN0YXRpYyBM YXlvdXRVbml0IGlubGluZUl0ZW1XaWR0aChjb25zdCBGb3JtYXR0aW5nQ29udGV4dCYgZm9ybWF0 dGluZ0NvbnRleHQsIGNvCiAgICAgcmV0dXJuIGJveEdlb21ldHJ5LndpZHRoKCk7CiB9CiAKLUxp bmVMYXlvdXRDb250ZXh0OjpMaW5lTGF5b3V0Q29udGV4dChjb25zdCBJbmxpbmVGb3JtYXR0aW5n Q29udGV4dCYgaW5saW5lRm9ybWF0dGluZ0NvbnRleHQsIGNvbnN0IElubGluZUl0ZW1zJiBpbmxp bmVJdGVtcykKK0xpbmVMYXlvdXRDb250ZXh0OjpMaW5lTGF5b3V0Q29udGV4dChjb25zdCBJbmxp bmVGb3JtYXR0aW5nQ29udGV4dCYgaW5saW5lRm9ybWF0dGluZ0NvbnRleHQsIGNvbnN0IENvbnRh aW5lciYgZm9ybWF0dGluZ0NvbnRleHRSb290LCBjb25zdCBJbmxpbmVJdGVtcyYgaW5saW5lSXRl bXMpCiAgICAgOiBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0KGlubGluZUZvcm1hdHRpbmdDb250 ZXh0KQorICAgICwgbV9mb3JtYXR0aW5nQ29udGV4dFJvb3QoZm9ybWF0dGluZ0NvbnRleHRSb290 KQogICAgICwgbV9pbmxpbmVJdGVtcyhpbmxpbmVJdGVtcykKIHsKIH0KQEAgLTgwLDcgKzgxLDcg QEAgTGluZUxheW91dENvbnRleHQ6OkxpbmVDb250ZW50IExpbmVMYXlvdXRDb250ZXh0OjpsYXlv dXRMaW5lKExpbmVCdWlsZGVyJiBsaW5lLAogICAgICAgICBtX3VuY29tbWl0dGVkQ29udGVudC5y ZXNldCgpOwogICAgICAgICBtX2xlYWRpbmdQYXJ0aWFsVGV4dEl0ZW0gPSB7IH07CiAgICAgICAg IG1fdHJhaWxpbmdQYXJ0aWFsVGV4dEl0ZW0gPSB7IH07Ci0gICAgICAgIG1fb3ZlcmZsb3dUZXh0 TGVuZ3RoID0geyB9OworICAgICAgICBtX292ZXJmbG93UGFydGlhbENvbnRlbnQgPSB7IH07CiAg ICAgfTsKICAgICBpbml0aWFsaXplKCk7CiAgICAgLy8gSXRlcmF0ZSB0aHJvdWdoIHRoZSBpbmxp bmUgY29udGVudCBhbmQgcGxhY2UgdGhlIGlubGluZSBib3hlcyBvbiB0aGUgY3VycmVudCBsaW5l LgpAQCAtMTI2LDEzICsxMjcsOSBAQCBMaW5lTGF5b3V0Q29udGV4dDo6TGluZUNvbnRlbnQgTGlu ZUxheW91dENvbnRleHQ6OmNsb3NlKExpbmVCdWlsZGVyJiBsaW5lLCB1bnNpZwogICAgIGlmICgh bV9jb21taXR0ZWRJbmxpbmVJdGVtQ291bnQpCiAgICAgICAgIHJldHVybiBMaW5lQ29udGVudCB7 IHsgfSwgeyB9LCBXVEZNb3ZlKG1fZmxvYXRzKSwgbGluZS5jbG9zZSgpLCBsaW5lLmxpbmVCb3go KSB9OwogCi0gICAgT3B0aW9uYWw8UGFydGlhbENvbnRlbnQ+IG92ZXJmbG93Q29udGVudDsKLSAg ICBpZiAobV9vdmVyZmxvd1RleHRMZW5ndGgpCi0gICAgICAgIG92ZXJmbG93Q29udGVudCA9IFBh cnRpYWxDb250ZW50IHsgKm1fb3ZlcmZsb3dUZXh0TGVuZ3RoIH07CiAgICAgYXV0byB0cmFpbGlu Z0lubGluZUl0ZW1JbmRleCA9IGxlYWRpbmdJbmxpbmVJdGVtSW5kZXggKyBtX2NvbW1pdHRlZElu bGluZUl0ZW1Db3VudCAtIDE7Ci0KICAgICBhdXRvIGlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVu dCA9IFsmXSB7Ci0gICAgICAgIGlmIChvdmVyZmxvd0NvbnRlbnQpCisgICAgICAgIGlmIChtX292 ZXJmbG93UGFydGlhbENvbnRlbnQpCiAgICAgICAgICAgICByZXR1cm4gTGluZUJ1aWxkZXI6Oklz TGFzdExpbmVXaXRoSW5saW5lQ29udGVudDo6Tm87CiAgICAgICAgIC8vIFNraXAgZmxvYXRzIGJh Y2t3YXJkcyB0byBzZWUgaWYgdGhpcyBpcyBnb2luZyB0byBiZSB0aGUgbGFzdCBsaW5lIHdpdGgg aW5saW5lIGNvbnRlbnQuCiAgICAgICAgIGZvciAoYXV0byBpID0gbV9pbmxpbmVJdGVtcy5zaXpl KCk7IGktLTspIHsKQEAgLTE0NCw3ICsxNDEsNyBAQCBMaW5lTGF5b3V0Q29udGV4dDo6TGluZUNv bnRlbnQgTGluZUxheW91dENvbnRleHQ6OmNsb3NlKExpbmVCdWlsZGVyJiBsaW5lLCB1bnNpZwog ICAgICAgICByZXR1cm4gTGluZUJ1aWxkZXI6OklzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudDo6 Tm87CiAgICAgfTsKIAotICAgIHJldHVybiBMaW5lQ29udGVudCB7IHRyYWlsaW5nSW5saW5lSXRl bUluZGV4LCBvdmVyZmxvd0NvbnRlbnQsIFdURk1vdmUobV9mbG9hdHMpLCBsaW5lLmNsb3NlKGlz TGFzdExpbmVXaXRoSW5saW5lQ29udGVudCgpKSwgbGluZS5saW5lQm94KCkgfTsKKyAgICByZXR1 cm4gTGluZUNvbnRlbnQgeyB0cmFpbGluZ0lubGluZUl0ZW1JbmRleCwgbV9vdmVyZmxvd1BhcnRp YWxDb250ZW50LCBXVEZNb3ZlKG1fZmxvYXRzKSwgbGluZS5jbG9zZShpc0xhc3RMaW5lV2l0aElu bGluZUNvbnRlbnQoKSksIGxpbmUubGluZUJveCgpIH07CiB9CiAKIExpbmVMYXlvdXRDb250ZXh0 OjpJc0VuZE9mTGluZSBMaW5lTGF5b3V0Q29udGV4dDo6cGxhY2VJbmxpbmVJdGVtKExpbmVCdWls ZGVyJiBsaW5lLCBjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtKQpAQCAtMTk4LDkgKzE5NSwx OCBAQCBMaW5lTGF5b3V0Q29udGV4dDo6SXNFbmRPZkxpbmUgTGluZUxheW91dENvbnRleHQ6OnBs YWNlSW5saW5lSXRlbShMaW5lQnVpbGRlciYgbAogCiBMaW5lTGF5b3V0Q29udGV4dDo6SXNFbmRP ZkxpbmUgTGluZUxheW91dENvbnRleHQ6OnByb2Nlc3NVbmNvbW1pdHRlZENvbnRlbnQoTGluZUJ1 aWxkZXImIGxpbmUpCiB7CisgICAgYXV0byBzaG91bGREaXNhYmxlSHlwaGVuYXRpb24gPSBbJl0g eworICAgICAgICBhdXRvJiBzdHlsZSA9IG1fZm9ybWF0dGluZ0NvbnRleHRSb290LnN0eWxlKCk7 CisgICAgICAgIHVuc2lnbmVkIGxpbWl0TGluZXMgPSBzdHlsZS5oeXBoZW5hdGlvbkxpbWl0TGlu ZXMoKSA9PSBSZW5kZXJTdHlsZTo6aW5pdGlhbEh5cGhlbmF0aW9uTGltaXRMaW5lcygpID8gc3Rk OjpudW1lcmljX2xpbWl0czx1bnNpZ25lZD46Om1heCgpIDogc3R5bGUuaHlwaGVuYXRpb25MaW1p dExpbmVzKCk7CisgICAgICAgIHJldHVybiBtX3N1Y2Nlc3NpdmVIeXBoZW5hdGVkTGluZUNvdW50 ID49IGxpbWl0TGluZXM7CisgICAgfTsKKwogICAgIC8vIENoZWNrIGlmIHRoZSBwZW5kaW5nIGNv bnRlbnQgZml0cy4KICAgICBhdXRvIGxpbmVJc0NvbnNpZGVyZWRFbXB0eSA9IGxpbmUuaXNWaXN1 YWxseUVtcHR5KCkgJiYgIWxpbmUuaGFzSW50cnVzaXZlRmxvYXQoKTsKLSAgICBhdXRvIGJyZWFr aW5nQ29udGV4dCA9IExpbmVCcmVha2VyKCkuYnJlYWtpbmdDb250ZXh0Rm9ySW5saW5lQ29udGVu dChtX3VuY29tbWl0dGVkQ29udGVudCwgbGluZS5hdmFpbGFibGVXaWR0aCgpLCBsaW5lLnRyYWls aW5nVHJpbW1hYmxlV2lkdGgoKSwgbGluZUlzQ29uc2lkZXJlZEVtcHR5KTsKKyAgICBhdXRvIGxp bmVCcmVha2VyID0gTGluZUJyZWFrZXIgeyB9OworICAgIGlmIChzaG91bGREaXNhYmxlSHlwaGVu YXRpb24oKSkKKyAgICAgICAgbGluZUJyZWFrZXIuc2V0SHlwaGVuYXRpb25EaXNhYmxlZCgpOwor ICAgIGF1dG8gYnJlYWtpbmdDb250ZXh0ID0gbGluZUJyZWFrZXIuYnJlYWtpbmdDb250ZXh0Rm9y SW5saW5lQ29udGVudChtX3VuY29tbWl0dGVkQ29udGVudCwgbGluZS5hdmFpbGFibGVXaWR0aCgp LCBsaW5lLnRyYWlsaW5nVHJpbW1hYmxlV2lkdGgoKSwgbGluZUlzQ29uc2lkZXJlZEVtcHR5KTsK ICAgICAvLyBUaGUgdW5jb21taXR0ZWQgY29udGVudCBjYW4gZnVsbHksIHBhcnRpYWxseSBmaXQg dGhlIGN1cnJlbnQgbGluZSAoY29tbWl0L3BhcnRpYWwgY29tbWl0KSBvciBub3QgYXQgYWxsIChy ZXNldCkuCiAgICAgaWYgKGJyZWFraW5nQ29udGV4dC5jb250ZW50QnJlYWsgPT0gTGluZUJyZWFr ZXI6OkJyZWFraW5nQ29udGV4dDo6Q29udGVudEJyZWFrOjpLZWVwKQogICAgICAgICBjb21taXRQ ZW5kaW5nQ29udGVudChsaW5lKTsKQEAgLTIxNSw3ICsyMjEsNyBAQCBMaW5lTGF5b3V0Q29udGV4 dDo6SXNFbmRPZkxpbmUgTGluZUxheW91dENvbnRleHQ6OnByb2Nlc3NVbmNvbW1pdHRlZENvbnRl bnQoTGluZQogICAgICAgICBBU1NFUlQoIW1fdHJhaWxpbmdQYXJ0aWFsVGV4dEl0ZW0pOwogICAg ICAgICBhdXRvIHRyYWlsaW5nQ29udGVudExlbmd0aCA9IGJyZWFraW5nQ29udGV4dC50cmFpbGlu Z1BhcnRpYWxDb250ZW50LT5sZW5ndGg7CiAgICAgICAgIG1fdHJhaWxpbmdQYXJ0aWFsVGV4dEl0 ZW0gPSBvdmVyZmxvd0lubGluZVRleHRJdGVtLmxlZnQodHJhaWxpbmdDb250ZW50TGVuZ3RoKTsK LSAgICAgICAgbV9vdmVyZmxvd1RleHRMZW5ndGggPSBvdmVyZmxvd0lubGluZVRleHRJdGVtLmxl bmd0aCgpIC0gdHJhaWxpbmdDb250ZW50TGVuZ3RoOworICAgICAgICBtX292ZXJmbG93UGFydGlh bENvbnRlbnQgPSBQYXJ0aWFsQ29udGVudCB7IG92ZXJmbG93SW5saW5lVGV4dEl0ZW0ubGVuZ3Ro KCkgLSB0cmFpbGluZ0NvbnRlbnRMZW5ndGggfTsKICAgICAgICAgLy8gS2VlcCB0aGUgbm9uLW92 ZXJmbG93IHBhcnQgb2YgdGhlIHVuY29tbWl0dGVkIHJ1bnMgYW5kIGFkZCB0aGUgdHJhaWxpbmcg cGFydGlhbCBjb250ZW50LgogICAgICAgICBtX3VuY29tbWl0dGVkQ29udGVudC50cmltKG92ZXJm bG93SW5saW5lVGV4dEl0ZW1JbmRleCk7CiAgICAgICAgIG1fdW5jb21taXR0ZWRDb250ZW50LmFw cGVuZCgqbV90cmFpbGluZ1BhcnRpYWxUZXh0SXRlbSwgYnJlYWtpbmdDb250ZXh0LnRyYWlsaW5n UGFydGlhbENvbnRlbnQtPmxvZ2ljYWxXaWR0aCk7CkBAIC0yMjQsNiArMjMwLDggQEAgTGluZUxh eW91dENvbnRleHQ6OklzRW5kT2ZMaW5lIExpbmVMYXlvdXRDb250ZXh0Ojpwcm9jZXNzVW5jb21t aXR0ZWRDb250ZW50KExpbmUKICAgICAgICAgbV91bmNvbW1pdHRlZENvbnRlbnQucmVzZXQoKTsK ICAgICBlbHNlCiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIC8vIEFkanVzdCBo eXBoZW5hdGVkIGxpbmUgY291bnQKKyAgICBtX3N1Y2Nlc3NpdmVIeXBoZW5hdGVkTGluZUNvdW50 ID0gYnJlYWtpbmdDb250ZXh0LnRyYWlsaW5nUGFydGlhbENvbnRlbnQgJiYgYnJlYWtpbmdDb250 ZXh0LnRyYWlsaW5nUGFydGlhbENvbnRlbnQtPmhhc0h5cGhlbiA/IG1fc3VjY2Vzc2l2ZUh5cGhl bmF0ZWRMaW5lQ291bnQgKyAxIDogMDsKICAgICByZXR1cm4gYnJlYWtpbmdDb250ZXh0LmNvbnRl bnRCcmVhayA9PSBMaW5lQnJlYWtlcjo6QnJlYWtpbmdDb250ZXh0OjpDb250ZW50QnJlYWs6Oktl ZXAgPyBJc0VuZE9mTGluZTo6Tm8gOklzRW5kT2ZMaW5lOjpZZXM7CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0 LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lTGF5b3V0Q29u dGV4dC5oCmluZGV4IDA5Y2YxMzRlZmY4ZjY5YTQ0ZmM5ZGM1MmMyNGY3YmIyMjAyMDJjMjEuLjYy YTUxMzkwOGIzNjRkMWFlODllYmNhNzkxNGUzYzM2Njc1ZTA2MzMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0LmgKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxheW91dENvbnRl eHQuaApAQCAtMzUsMTUgKzM1LDE1IEBAIG5hbWVzcGFjZSBMYXlvdXQgewogCiBjbGFzcyBMaW5l TGF5b3V0Q29udGV4dCB7CiBwdWJsaWM6Ci0gICAgTGluZUxheW91dENvbnRleHQoY29uc3QgSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQmLCBjb25zdCBJbmxpbmVJdGVtcyYpOworICAgIExpbmVMYXlv dXRDb250ZXh0KGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiwgY29uc3QgQ29udGFpbmVy JiBmb3JtYXR0aW5nQ29udGV4dFJvb3QsIGNvbnN0IElubGluZUl0ZW1zJik7CiAKICAgICBzdHJ1 Y3QgUGFydGlhbENvbnRlbnQgewogICAgICAgICAvLyBUaGlzIHdpbGwgcG90ZW50aWFsbHkgZ2Fp biBzb21lIG1vcmUgbWVtYmVycy4gCi0gICAgICAgIHVuc2lnbmVkIGxlbmd0aDsKKyAgICAgICAg dW5zaWduZWQgbGVuZ3RoIHsgMCB9OwogICAgIH07CiAgICAgc3RydWN0IExpbmVDb250ZW50IHsK ICAgICAgICAgT3B0aW9uYWw8dW5zaWduZWQ+IHRyYWlsaW5nSW5saW5lSXRlbUluZGV4OwotICAg ICAgICBPcHRpb25hbDxQYXJ0aWFsQ29udGVudD4gdHJhaWxpbmdQYXJ0aWFsQ29udGVudDsKKyAg ICAgICAgT3B0aW9uYWw8UGFydGlhbENvbnRlbnQ+IG92ZXJmbG93UGFydGlhbENvbnRlbnQ7CiAg ICAgICAgIFZlY3RvcjxXZWFrUHRyPElubGluZUl0ZW0+PiBmbG9hdHM7CiAgICAgICAgIGNvbnN0 IExpbmVCdWlsZGVyOjpSdW5MaXN0IHJ1bkxpc3Q7CiAgICAgICAgIGNvbnN0IExpbmVCb3ggbGlu ZUJveDsKQEAgLTYwLDEzICs2MCwxNSBAQCBwcml2YXRlOgogICAgIElzRW5kT2ZMaW5lIHByb2Nl c3NVbmNvbW1pdHRlZENvbnRlbnQoTGluZUJ1aWxkZXImKTsKIAogICAgIGNvbnN0IElubGluZUZv cm1hdHRpbmdDb250ZXh0JiBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0OworICAgIGNvbnN0IENv bnRhaW5lciYgbV9mb3JtYXR0aW5nQ29udGV4dFJvb3Q7CiAgICAgY29uc3QgSW5saW5lSXRlbXMm IG1faW5saW5lSXRlbXM7CiAgICAgTGluZUJyZWFrZXI6OkNvbnRlbnQgbV91bmNvbW1pdHRlZENv bnRlbnQ7CiAgICAgdW5zaWduZWQgbV9jb21taXR0ZWRJbmxpbmVJdGVtQ291bnQgeyAwIH07CiAg ICAgVmVjdG9yPFdlYWtQdHI8SW5saW5lSXRlbT4+IG1fZmxvYXRzOwogICAgIHN0ZDo6dW5pcXVl X3B0cjxJbmxpbmVUZXh0SXRlbT4gbV9sZWFkaW5nUGFydGlhbFRleHRJdGVtOwogICAgIHN0ZDo6 dW5pcXVlX3B0cjxJbmxpbmVUZXh0SXRlbT4gbV90cmFpbGluZ1BhcnRpYWxUZXh0SXRlbTsKLSAg ICBPcHRpb25hbDx1bnNpZ25lZD4gbV9vdmVyZmxvd1RleHRMZW5ndGg7CisgICAgT3B0aW9uYWw8 UGFydGlhbENvbnRlbnQ+IG1fb3ZlcmZsb3dQYXJ0aWFsQ29udGVudDsKKyAgICB1bnNpZ25lZCBt X3N1Y2Nlc3NpdmVIeXBoZW5hdGVkTGluZUNvdW50IHsgMCB9OwogfTsKIAogfQpkaWZmIC0tZ2l0 IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGEyNmVkNDk3YjZlNjFk M2JkZjcyMTUwMjRmMDA4ZGJjYjgzM2Y0MzkuLmY1ZjI3ODg2ZDVhMDRiNzg2ZjgwMjRkNGFkNDNi YTQ1ZDZhMTVjMjUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxOS0xMS0yOSAgWmFsYW4gQnVqdGFzICA8emFsYW5A YXBwbGUuY29tPgorCisgICAgICAgIFtMRkNdW0lGQ10gQWRkIHN1cHBvcnQgZm9yIGh5cGhlbmF0 ZS1saW1pdC1saW5lcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjA0NzEyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NzUzNjcyNz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIExheW91dFJlbG9hZGVk L21pc2MvTEZDLXBhc3NpbmctdGVzdHMudHh0OgorCiAyMDE5LTExLTI5ICBaYWxhbiBCdWp0YXMg IDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBBZGQgc3VwcG9ydCBmb3Ig aHlwaGVuYXRlLWxpbWl0LWJlZm9yZSBhbmQgaHlwaGVuYXRlLWxpbWl0LWFmdGVyCmRpZmYgLS1n aXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9taXNjL0xGQy1wYXNzaW5nLXRlc3RzLnR4dCBiL1Rv b2xzL0xheW91dFJlbG9hZGVkL21pc2MvTEZDLXBhc3NpbmctdGVzdHMudHh0CmluZGV4IDllOWYz ZWJhNTA0MGNjNWQxYzhiY2E0NTM5ZmQxZmE3NzlkNTUxZmMuLjExMGJmYjg3YWVjYmIzNWJjM2Fi NjBmN2I0NjJmYjRmYzM5YTgxNTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL21p c2MvTEZDLXBhc3NpbmctdGVzdHMudHh0CisrKyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL21pc2Mv TEZDLXBhc3NpbmctdGVzdHMudHh0CkBAIC04NDIsNiArODQyLDcgQEAgZmFzdC90ZXh0L3N5c3Rl bS1mb250LXplcm8tc2l6ZS5odG1sCiBmYXN0L3RleHQvc3lzdGVtLXVpLWNoaW5lc2UtYm9sZC1m YWxsYmFjay5odG1sCiBmYXN0L3RleHQvc2ltcGxlLWxpbmUtbGF5b3V0LWh5cGhlbi1saW1pdC1h ZnRlci5odG1sCiBmYXN0L3RleHQvc2ltcGxlLWxpbmUtbGF5b3V0LWh5cGhlbi1saW1pdC1iZWZv cmUuaHRtbAorZmFzdC90ZXh0L3NpbXBsZS1saW5lLWxheW91dC1oeXBoZW4tbGltaXQtbGluZXMu aHRtbAogZmFzdC90ZXh0L3RhYi13aXRoLWtlcm5pbmcuaHRtbAogZmFzdC90ZXh0L3RleHQtY29t YmluZS1maXJzdC1saW5lLWNyYXNoLmh0bWwKIGZhc3QvdGV4dC90ZXh0LWNvbWJpbmUtcmVuZGVy aW5nLmh0bWwK