265756 2023-12-03 10:49:42 -0800 [IFC][Ruby] Offset ruby base end inline item with overflowing interlinear annotation box 2023-12-04 09:21:15 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1996555 0 zalan 2023-12-03 10:49:42 -0800 ssia 1996556 1 468842 zalan 2023-12-03 11:00:52 -0800 Created attachment 468842 Patch 1996709 2 468862 zalan 2023-12-04 06:41:58 -0800 Created attachment 468862 Patch 1996728 3 468863 zalan 2023-12-04 08:18:50 -0800 Created attachment 468863 [fast-cq]Patch 1996754 4 ews-feeder 2023-12-04 09:20:00 -0800 Committed 271487@main (a0dc58c6d70e): <https://commits.webkit.org/271487@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 468863. 1996755 5 webkit-bug-importer 2023-12-04 09:21:15 -0800 <rdar://problem/119136933> 468842 2023-12-03 11:00:52 -0800 2023-12-04 06:41:56 -0800 Patch bug-265756-20231203110052.patch text/plain 7170 zalan RnJvbSA4NWI0NDg3ZWFiMDQwM2VkMDljMTFkODdiNGIzZWRkOGFjMDc3ZDJmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFN1biwgMyBEZWMgMjAyMyAxMDo0OTo1MSAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIFtJRkNdW1J1 YnldIE9mZnNldCBydWJ5IGJhc2UgZW5kIGlubGluZSBpdGVtIHdpdGggb3ZlcmZsb3dpbmcKIGxp bmVyIGFubm90YXRpb24gYm94IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yNjU3NTYKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKV2hpbGUgYW5ub3RhdGlvbiBi b3hlcyBkb24ndCBwYXJ0aWNpcGF0ZSBpbiBpbmxpbmUgbGF5b3V0LCB3aGVuIHBsYWNpbmcgdGhl IGFzc29jaWF0ZWQgYmFzZSBjb250ZW50Cm9uIHRoZSBsaW5lLCB3ZSBoYXZlIHRvIG1ha2Ugc3Vy ZSB0aGUgYmFzZSBpbmxpbmUgYm94IGVuZCAiY292ZXJzIiBhbnkgb3ZlcmZsb3dpbmcgbGluZWFy IGFubm90YXRpb24uCgplLmcuCiI8cnVieT5iYXNlIGNvbnRlbnQ8cnQ+dGhpcyBpcyBhIGxvbmcg YW5ub3RhdGlvbjwvcnQ+PC9ydWJ5PmFmdGVyIHJ1YnkgY29udGVudCIgZG9lcyBub3QgcHJvZHVj ZSB0aGlzOgoKW3RoaXMgaXMgYSBsb25nIGFubm90YXRpb25dCltiYXNlIGNvbnRlbnRdW2FmdGVy IHJ1YnkgY29udGVudF0gICAgICA8LSBsaW5lIGNvbnRlbnQuCgpidXQgc29tZXRoaW5nIGFsb25n IHRoZSBsaW5lcyBvZgoKW3RoaXMgaXMgYSBsb25nIGFubm90YXRpb25dCltiYXNlIGNvbnRlbnRd ICAgICAgICAgICAgIFthZnRlciBydWJ5IGNvbnRlbnRdCgooaWdub3JlIHJ1YnkgYmFzZSBhbGln bm1lbnQgZm9yIG5vdykKCiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVp bGRlcjo6Y2FuZGlkYXRlQ29udGVudEZvckxpbmUpOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3J1YnkvUnVieUZvcm1hdHRpbmdDb250ZXh0LmNwcDoK KFdlYkNvcmU6OkxheW91dDo6UnVieUZvcm1hdHRpbmdDb250ZXh0OjpiYXNlTG9naWNhbFdpZHRo RnJvbVJ1YnlCYXNlRW5kKToKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5oOgotLS0KIC4uLi9pbmxpbmUv SW5saW5lTGluZUJ1aWxkZXIuY3BwICAgICAgICAgICAgICB8IDIxICsrKysrKysrKystLS0tLQog Li4uL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5jcHAgICAgIHwgMjYgKysrKysr KysrKysrKysrKysrKwogLi4uL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5oICAg ICAgIHwgIDEgKwogMyBmaWxlcyBjaGFuZ2VkLCA0MiBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCAwMTA1 ZWQ1NWUzNGIuLjM5YmYxMWMwZGVlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVC dWlsZGVyLmNwcApAQCAtNjQwLDEzICs2NDAsMjIgQEAgdm9pZCBMaW5lQnVpbGRlcjo6Y2FuZGlk YXRlQ29udGVudEZvckxpbmUoTGluZUNhbmRpZGF0ZSYgbGluZUNhbmRpZGF0ZSwgc2l6ZV90IGMK ICAgICAgICAgfQogICAgICAgICBpZiAoaW5saW5lSXRlbS5pc0lubGluZUJveFN0YXJ0KCkgfHwg aW5saW5lSXRlbS5pc0lubGluZUJveEVuZCgpKSB7CiAgICAgICAgICAgICBhdXRvJiBsYXlvdXRC b3ggPSBpbmxpbmVJdGVtLmxheW91dEJveCgpOwotICAgICAgICAgICAgaWYgKGlubGluZUl0ZW0u aXNJbmxpbmVCb3hTdGFydCgpICYmIGxheW91dEJveC5pc1J1YnlCYXNlKCkpIHsKLSAgICAgICAg ICAgICAgICAvLyBUaGVyZSBzaG91bGQgb25seSBiZSBvbmUgcnVieSBiYXNlIHBlci9hbm5vdGF0 aW9uIGNhbmRpZGF0ZSBjb250ZW50IGFzIHdlIGFsbG93IGxpbmUgYnJlYWtpbmcgYmV0d2VlbiBi YXNlcy4KLSAgICAgICAgICAgICAgICBBU1NFUlQoIWxpbmVDYW5kaWRhdGUuaW5saW5lQ29udGVu dC5jb250aW51b3VzQ29udGVudCgpLm1pbmltdW1SZXF1aXJlZFdpZHRoKCkpOwotICAgICAgICAg ICAgICAgIGlmIChhdXRvIG1pbmltdW1SZXF1aXJlZFdpZHRoID0gUnVieUZvcm1hdHRpbmdDb250 ZXh0Ojphbm5vdGF0aW9uQm94TG9naWNhbFdpZHRoKGxheW91dEJveCwgZm9ybWF0dGluZ0NvbnRl eHQoKSkpCi0gICAgICAgICAgICAgICAgICAgIGxpbmVDYW5kaWRhdGUuaW5saW5lQ29udGVudC5z ZXRNaW5pbXVtUmVxdWlyZWRXaWR0aCgqbWluaW11bVJlcXVpcmVkV2lkdGgpOwotICAgICAgICAg ICAgfQogICAgICAgICAgICAgYXV0byBsb2dpY2FsV2lkdGggPSBmb3JtYXR0aW5nQ29udGV4dCgp LmZvcm1hdHRpbmdVdGlscygpLmlubGluZUl0ZW1XaWR0aChpbmxpbmVJdGVtLCBjdXJyZW50TG9n aWNhbFJpZ2h0LCBpc0ZpcnN0Rm9ybWF0dGVkTGluZSgpKTsKKyAgICAgICAgICAgIGlmIChsYXlv dXRCb3guaXNSdWJ5QmFzZSgpKSB7CisgICAgICAgICAgICAgICAgaWYgKGF1dG8gYW5ub3RhdGlv bkJveExvZ2ljYWxXaWR0aCA9IFJ1YnlGb3JtYXR0aW5nQ29udGV4dDo6YW5ub3RhdGlvbkJveExv Z2ljYWxXaWR0aChsYXlvdXRCb3gsIGZvcm1hdHRpbmdDb250ZXh0KCkpKSB7CisgICAgICAgICAg ICAgICAgICAgIGlmIChpbmxpbmVJdGVtLmlzSW5saW5lQm94U3RhcnQoKSkgeworICAgICAgICAg ICAgICAgICAgICAgICAgLy8gVGhlcmUgc2hvdWxkIG9ubHkgYmUgb25lIHJ1YnkgYmFzZSBwZXIv YW5ub3RhdGlvbiBjYW5kaWRhdGUgY29udGVudCBhcyB3ZSBhbGxvdyBsaW5lIGJyZWFraW5nIGJl dHdlZW4gYmFzZXMuCisgICAgICAgICAgICAgICAgICAgICAgICBBU1NFUlQoIWxpbmVDYW5kaWRh dGUuaW5saW5lQ29udGVudC5jb250aW51b3VzQ29udGVudCgpLm1pbmltdW1SZXF1aXJlZFdpZHRo KCkpOworICAgICAgICAgICAgICAgICAgICAgICAgbGluZUNhbmRpZGF0ZS5pbmxpbmVDb250ZW50 LnNldE1pbmltdW1SZXF1aXJlZFdpZHRoKCphbm5vdGF0aW9uQm94TG9naWNhbFdpZHRoKTsKKyAg ICAgICAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIC8vIEJh c2UgaXMgc3VwcG9zZWQgYmUgYXQgbGVhc3QgYXMgd2lkZSBhcyB0aGUgYW5ub3RhdGlvbiBpcy4K KyAgICAgICAgICAgICAgICAgICAgICAgIC8vIExldCdzIGFkanVzdCB0aGUgaW5saW5lIGJveCBl bmQgd2lkdGggdG8gYWNjb21vZGF0ZSBzdWNoIG92ZXJmbG93aW5nIGxpbmVyIGFubm90YXRpb24u CisgICAgICAgICAgICAgICAgICAgICAgICBhdXRvIHJ1YnlCYXNlQ29udGVudFdpZHRoID0gUnVi eUZvcm1hdHRpbmdDb250ZXh0OjpiYXNlTG9naWNhbFdpZHRoRnJvbVJ1YnlCYXNlRW5kKGlubGlu ZUl0ZW0sIG1fbGluZS5ydW5zKCksIGxpbmVDYW5kaWRhdGUuaW5saW5lQ29udGVudC5jb250aW51 b3VzQ29udGVudCgpLnJ1bnMoKSk7CisgICAgICAgICAgICAgICAgICAgICAgICBBU1NFUlQocnVi eUJhc2VDb250ZW50V2lkdGggPj0gMCk7CisgICAgICAgICAgICAgICAgICAgICAgICBsb2dpY2Fs V2lkdGggKz0gc3RkOjptYXgoMC5mLCAqYW5ub3RhdGlvbkJveExvZ2ljYWxXaWR0aCAtIHJ1YnlC YXNlQ29udGVudFdpZHRoKTsKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChzdHlsZS5ib3hEZWNvcmF0aW9uQnJl YWsoKSA9PSBCb3hEZWNvcmF0aW9uQnJlYWs6OkNsb25lKSB7CiAgICAgICAgICAgICAgICAgaWYg KGlubGluZUl0ZW0uaXNJbmxpbmVCb3hTdGFydCgpKQogICAgICAgICAgICAgICAgICAgICBpbmxp bmVCb3hMaXN0V2l0aENsb25lZERlY29yYXRpb25FbmQuYWRkKCZsYXlvdXRCb3gpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvcnVi eS9SdWJ5Rm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvcnVieS9SdWJ5Rm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4 IDgwNmY4ODMwZDhkYi4uMDA4NWM5MzVlNzlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4 dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvcnVieS9SdWJ5Rm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0xMTcsNiArMTE3LDMyIEBAIHN0 ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gUnVieUZvcm1hdHRpbmdDb250ZXh0Ojphbm5v dGF0aW9uQm94TG9naWNhbFdpZHRoCiAgICAgcmV0dXJuIHsgfTsKIH0KIAorSW5saW5lTGF5b3V0 VW5pdCBSdWJ5Rm9ybWF0dGluZ0NvbnRleHQ6OmJhc2VMb2dpY2FsV2lkdGhGcm9tUnVieUJhc2VF bmQoY29uc3QgSW5saW5lSXRlbSYgcnVieUJhc2VFbmQsIGNvbnN0IExpbmU6OlJ1bkxpc3QmIGxp bmVSdW5zLCBjb25zdCBJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRlbnQ6OlJ1 bkxpc3QmIGNhbmRpZGF0ZVJ1bnMpCit7CisgICAgQVNTRVJUKHJ1YnlCYXNlRW5kLmlzSW5saW5l Qm94U3RhcnQoKSAmJiBydWJ5QmFzZUVuZC5sYXlvdXRCb3goKS5pc1J1YnlCYXNlKCkpOworICAg IC8vIENhbmlkYXRlIGNvbnRlbnQgaXMgc3VwcG9zZWQgdG8gaG9sZCB0aGUgYmFzZSBjb250ZW50 IGFuZCBpbiBjYXNlIG9mIHNvZnQgd3JhcCBvcHBvcnR1bml0aWVzLCBsaW5lIG1heSBoYXZlIHNv bWUgYmFzZSBjb250ZW50IHRvby4KKyAgICBhdXRvJiBydWJ5QmFzZUxheW91dEJveCA9IHJ1YnlC YXNlRW5kLmxheW91dEJveCgpOworICAgIGF1dG8gYmFzZUxvZ2ljYWxXaWR0aCA9IElubGluZUxh eW91dFVuaXQgeyAwLmYgfTsKKyAgICBhdXRvIGhhc1NlZW5SdWJ5QmFzZVN0YXJ0ID0gZmFsc2U7 CisgICAgZm9yIChhdXRvJiBjYW5kaWRhdGVSdW4gOiBtYWtlUmV2ZXJzZWRSYW5nZShjYW5kaWRh dGVSdW5zKSkgeworICAgICAgICBhdXRvJiBpbmxpbmVJdGVtID0gY2FuZGlkYXRlUnVuLmlubGlu ZUl0ZW07CisgICAgICAgIGlmIChpbmxpbmVJdGVtLmlzSW5saW5lQm94U3RhcnQoKSAmJiAmaW5s aW5lSXRlbS5sYXlvdXRCb3goKSA9PSAmcnVieUJhc2VMYXlvdXRCb3gpIHsKKyAgICAgICAgICAg IGhhc1NlZW5SdWJ5QmFzZVN0YXJ0ID0gdHJ1ZTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAg ICB9CisgICAgICAgIGJhc2VMb2dpY2FsV2lkdGggKz0gY2FuZGlkYXRlUnVuLmxvZ2ljYWxXaWR0 aDsKKyAgICB9CisgICAgaWYgKGhhc1NlZW5SdWJ5QmFzZVN0YXJ0KQorICAgICAgICByZXR1cm4g YmFzZUxvZ2ljYWxXaWR0aDsKKyAgICAvLyBMZXQncyBjaGVjayB0aGUgbGluZSBmb3IgdGhlIHJl c3Qgb2YgdGhlIGJhc2UgY29udGVudC4KKyAgICBmb3IgKGF1dG8mIGxpbmVSdW4gOiBtYWtlUmV2 ZXJzZWRSYW5nZShsaW5lUnVucykpIHsKKyAgICAgICAgaWYgKChsaW5lUnVuLmlzSW5saW5lQm94 U3RhcnQoKSB8fCBsaW5lUnVuLmlzTGluZVNwYW5uaW5nSW5saW5lQm94U3RhcnQoKSkgJiYgJmxp bmVSdW4ubGF5b3V0Qm94KCkgPT0gJnJ1YnlCYXNlTGF5b3V0Qm94KQorICAgICAgICAgICAgYnJl YWs7CisgICAgICAgIGJhc2VMb2dpY2FsV2lkdGggKz0gbGluZVJ1bi5sb2dpY2FsV2lkdGgoKTsK KyAgICB9CisgICAgcmV0dXJuIGJhc2VMb2dpY2FsV2lkdGg7Cit9CisKIFJ1YnlGb3JtYXR0aW5n Q29udGV4dDo6SW5saW5lTGF5b3V0UmVzdWx0IFJ1YnlGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0 SW5saW5lQXhpcyhjb25zdCBJbmxpbmVJdGVtUmFuZ2UmIHJ1YnlSYW5nZSwgY29uc3QgSW5saW5l SXRlbUxpc3QmIGlubGluZUl0ZW1MaXN0LCBMaW5lJiBsaW5lLCBJbmxpbmVMYXlvdXRVbml0IGF2 YWlsYWJsZVdpZHRoKQogewogICAgIEFTU0VSVCghcnVieVJhbmdlLmlzRW1wdHkoKSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9y dWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvcnVieS9SdWJ5Rm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCBh OWY0M2ZkNjg2MGEuLjk4NjBlMmU0Nzk2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvcnVieS9SdWJ5Rm9ybWF0dGluZ0NvbnRleHQu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9y dWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC01OCw2ICs1OCw3IEBAIHB1YmxpYzoKIAog ICAgIHN0YXRpYyBib29sIGlzQXRTb2Z0V3JhcE9wcG9ydHVuaXR5KGNvbnN0IElubGluZUl0ZW0m IHByZXZpb3VzLCBjb25zdCBJbmxpbmVJdGVtJiBjdXJyZW50KTsKICAgICBzdGF0aWMgc3RkOjpv cHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBhbm5vdGF0aW9uQm94TG9naWNhbFdpZHRoKGNvbnN0 IEJveCYgcnVieUJhc2VMYXlvdXRCb3gsIGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0Jik7 CisgICAgc3RhdGljIElubGluZUxheW91dFVuaXQgYmFzZUxvZ2ljYWxXaWR0aEZyb21SdWJ5QmFz ZUVuZChjb25zdCBJbmxpbmVJdGVtJiBydWJ5QmFzZUVuZCwgY29uc3QgTGluZTo6UnVuTGlzdCYs IGNvbnN0IElubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3VzQ29udGVudDo6UnVuTGlzdCYp OwogCiBwcml2YXRlOgogICAgIHN0cnVjdCBCYXNlTGF5b3V0UmVzdWx0IHsK 468862 2023-12-04 06:41:58 -0800 2023-12-04 08:18:48 -0800 Patch bug-265756-20231204064157.patch text/plain 7170 zalan RnJvbSBlMGNlMzNiYzY5Yjk2ZWFmZjNlN2JhNDE5MDZkOTkyOTI3ZmM0ZGU3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFN1biwgMyBEZWMgMjAyMyAxMDo0OTo1MSAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIFtJRkNdW1J1 YnldIE9mZnNldCBydWJ5IGJhc2UgZW5kIGlubGluZSBpdGVtIHdpdGggb3ZlcmZsb3dpbmcKIGxp bmVyIGFubm90YXRpb24gYm94IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yNjU3NTYKClJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgoKV2hpbGUgYW5ub3RhdGlvbiBi b3hlcyBkb24ndCBwYXJ0aWNpcGF0ZSBpbiBpbmxpbmUgbGF5b3V0LCB3aGVuIHBsYWNpbmcgdGhl IGFzc29jaWF0ZWQgYmFzZSBjb250ZW50Cm9uIHRoZSBsaW5lLCB3ZSBoYXZlIHRvIG1ha2Ugc3Vy ZSB0aGUgYmFzZSBpbmxpbmUgYm94IGVuZCAiY292ZXJzIiBhbnkgb3ZlcmZsb3dpbmcgbGluZWFy IGFubm90YXRpb24uCgplLmcuCiI8cnVieT5iYXNlIGNvbnRlbnQ8cnQ+dGhpcyBpcyBhIGxvbmcg YW5ub3RhdGlvbjwvcnQ+PC9ydWJ5PmFmdGVyIHJ1YnkgY29udGVudCIgZG9lcyBub3QgcHJvZHVj ZSB0aGlzOgoKW3RoaXMgaXMgYSBsb25nIGFubm90YXRpb25dCltiYXNlIGNvbnRlbnRdW2FmdGVy IHJ1YnkgY29udGVudF0gICAgICA8LSBsaW5lIGNvbnRlbnQuCgpidXQgc29tZXRoaW5nIGFsb25n IHRoZSBsaW5lcyBvZgoKW3RoaXMgaXMgYSBsb25nIGFubm90YXRpb25dCltiYXNlIGNvbnRlbnRd ICAgICAgICAgICAgIFthZnRlciBydWJ5IGNvbnRlbnRdCgooaWdub3JlIHJ1YnkgYmFzZSBhbGln bm1lbnQgZm9yIG5vdykKCiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVp bGRlcjo6Y2FuZGlkYXRlQ29udGVudEZvckxpbmUpOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3J1YnkvUnVieUZvcm1hdHRpbmdDb250ZXh0LmNwcDoK KFdlYkNvcmU6OkxheW91dDo6UnVieUZvcm1hdHRpbmdDb250ZXh0OjpiYXNlTG9naWNhbFdpZHRo RnJvbVJ1YnlCYXNlRW5kKToKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5oOgotLS0KIC4uLi9pbmxpbmUv SW5saW5lTGluZUJ1aWxkZXIuY3BwICAgICAgICAgICAgICB8IDIxICsrKysrKysrKystLS0tLQog Li4uL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5jcHAgICAgIHwgMjYgKysrKysr KysrKysrKysrKysrKwogLi4uL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5oICAg ICAgIHwgIDEgKwogMyBmaWxlcyBjaGFuZ2VkLCA0MiBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCAwMTA1 ZWQ1NWUzNGIuLjM5YmYxMWMwZGVlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVC dWlsZGVyLmNwcApAQCAtNjQwLDEzICs2NDAsMjIgQEAgdm9pZCBMaW5lQnVpbGRlcjo6Y2FuZGlk YXRlQ29udGVudEZvckxpbmUoTGluZUNhbmRpZGF0ZSYgbGluZUNhbmRpZGF0ZSwgc2l6ZV90IGMK ICAgICAgICAgfQogICAgICAgICBpZiAoaW5saW5lSXRlbS5pc0lubGluZUJveFN0YXJ0KCkgfHwg aW5saW5lSXRlbS5pc0lubGluZUJveEVuZCgpKSB7CiAgICAgICAgICAgICBhdXRvJiBsYXlvdXRC b3ggPSBpbmxpbmVJdGVtLmxheW91dEJveCgpOwotICAgICAgICAgICAgaWYgKGlubGluZUl0ZW0u aXNJbmxpbmVCb3hTdGFydCgpICYmIGxheW91dEJveC5pc1J1YnlCYXNlKCkpIHsKLSAgICAgICAg ICAgICAgICAvLyBUaGVyZSBzaG91bGQgb25seSBiZSBvbmUgcnVieSBiYXNlIHBlci9hbm5vdGF0 aW9uIGNhbmRpZGF0ZSBjb250ZW50IGFzIHdlIGFsbG93IGxpbmUgYnJlYWtpbmcgYmV0d2VlbiBi YXNlcy4KLSAgICAgICAgICAgICAgICBBU1NFUlQoIWxpbmVDYW5kaWRhdGUuaW5saW5lQ29udGVu dC5jb250aW51b3VzQ29udGVudCgpLm1pbmltdW1SZXF1aXJlZFdpZHRoKCkpOwotICAgICAgICAg ICAgICAgIGlmIChhdXRvIG1pbmltdW1SZXF1aXJlZFdpZHRoID0gUnVieUZvcm1hdHRpbmdDb250 ZXh0Ojphbm5vdGF0aW9uQm94TG9naWNhbFdpZHRoKGxheW91dEJveCwgZm9ybWF0dGluZ0NvbnRl eHQoKSkpCi0gICAgICAgICAgICAgICAgICAgIGxpbmVDYW5kaWRhdGUuaW5saW5lQ29udGVudC5z ZXRNaW5pbXVtUmVxdWlyZWRXaWR0aCgqbWluaW11bVJlcXVpcmVkV2lkdGgpOwotICAgICAgICAg ICAgfQogICAgICAgICAgICAgYXV0byBsb2dpY2FsV2lkdGggPSBmb3JtYXR0aW5nQ29udGV4dCgp LmZvcm1hdHRpbmdVdGlscygpLmlubGluZUl0ZW1XaWR0aChpbmxpbmVJdGVtLCBjdXJyZW50TG9n aWNhbFJpZ2h0LCBpc0ZpcnN0Rm9ybWF0dGVkTGluZSgpKTsKKyAgICAgICAgICAgIGlmIChsYXlv dXRCb3guaXNSdWJ5QmFzZSgpKSB7CisgICAgICAgICAgICAgICAgaWYgKGF1dG8gYW5ub3RhdGlv bkJveExvZ2ljYWxXaWR0aCA9IFJ1YnlGb3JtYXR0aW5nQ29udGV4dDo6YW5ub3RhdGlvbkJveExv Z2ljYWxXaWR0aChsYXlvdXRCb3gsIGZvcm1hdHRpbmdDb250ZXh0KCkpKSB7CisgICAgICAgICAg ICAgICAgICAgIGlmIChpbmxpbmVJdGVtLmlzSW5saW5lQm94U3RhcnQoKSkgeworICAgICAgICAg ICAgICAgICAgICAgICAgLy8gVGhlcmUgc2hvdWxkIG9ubHkgYmUgb25lIHJ1YnkgYmFzZSBwZXIv YW5ub3RhdGlvbiBjYW5kaWRhdGUgY29udGVudCBhcyB3ZSBhbGxvdyBsaW5lIGJyZWFraW5nIGJl dHdlZW4gYmFzZXMuCisgICAgICAgICAgICAgICAgICAgICAgICBBU1NFUlQoIWxpbmVDYW5kaWRh dGUuaW5saW5lQ29udGVudC5jb250aW51b3VzQ29udGVudCgpLm1pbmltdW1SZXF1aXJlZFdpZHRo KCkpOworICAgICAgICAgICAgICAgICAgICAgICAgbGluZUNhbmRpZGF0ZS5pbmxpbmVDb250ZW50 LnNldE1pbmltdW1SZXF1aXJlZFdpZHRoKCphbm5vdGF0aW9uQm94TG9naWNhbFdpZHRoKTsKKyAg ICAgICAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIC8vIEJh c2UgaXMgc3VwcG9zZWQgYmUgYXQgbGVhc3QgYXMgd2lkZSBhcyB0aGUgYW5ub3RhdGlvbiBpcy4K KyAgICAgICAgICAgICAgICAgICAgICAgIC8vIExldCdzIGFkanVzdCB0aGUgaW5saW5lIGJveCBl bmQgd2lkdGggdG8gYWNjb21vZGF0ZSBzdWNoIG92ZXJmbG93aW5nIGxpbmVyIGFubm90YXRpb24u CisgICAgICAgICAgICAgICAgICAgICAgICBhdXRvIHJ1YnlCYXNlQ29udGVudFdpZHRoID0gUnVi eUZvcm1hdHRpbmdDb250ZXh0OjpiYXNlTG9naWNhbFdpZHRoRnJvbVJ1YnlCYXNlRW5kKGlubGlu ZUl0ZW0sIG1fbGluZS5ydW5zKCksIGxpbmVDYW5kaWRhdGUuaW5saW5lQ29udGVudC5jb250aW51 b3VzQ29udGVudCgpLnJ1bnMoKSk7CisgICAgICAgICAgICAgICAgICAgICAgICBBU1NFUlQocnVi eUJhc2VDb250ZW50V2lkdGggPj0gMCk7CisgICAgICAgICAgICAgICAgICAgICAgICBsb2dpY2Fs V2lkdGggKz0gc3RkOjptYXgoMC5mLCAqYW5ub3RhdGlvbkJveExvZ2ljYWxXaWR0aCAtIHJ1YnlC YXNlQ29udGVudFdpZHRoKTsKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChzdHlsZS5ib3hEZWNvcmF0aW9uQnJl YWsoKSA9PSBCb3hEZWNvcmF0aW9uQnJlYWs6OkNsb25lKSB7CiAgICAgICAgICAgICAgICAgaWYg KGlubGluZUl0ZW0uaXNJbmxpbmVCb3hTdGFydCgpKQogICAgICAgICAgICAgICAgICAgICBpbmxp bmVCb3hMaXN0V2l0aENsb25lZERlY29yYXRpb25FbmQuYWRkKCZsYXlvdXRCb3gpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvcnVi eS9SdWJ5Rm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvcnVieS9SdWJ5Rm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4 IDgwNmY4ODMwZDhkYi4uMDA4NWM5MzVlNzlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4 dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvcnVieS9SdWJ5Rm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0xMTcsNiArMTE3LDMyIEBAIHN0 ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gUnVieUZvcm1hdHRpbmdDb250ZXh0Ojphbm5v dGF0aW9uQm94TG9naWNhbFdpZHRoCiAgICAgcmV0dXJuIHsgfTsKIH0KIAorSW5saW5lTGF5b3V0 VW5pdCBSdWJ5Rm9ybWF0dGluZ0NvbnRleHQ6OmJhc2VMb2dpY2FsV2lkdGhGcm9tUnVieUJhc2VF bmQoY29uc3QgSW5saW5lSXRlbSYgcnVieUJhc2VFbmQsIGNvbnN0IExpbmU6OlJ1bkxpc3QmIGxp bmVSdW5zLCBjb25zdCBJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRlbnQ6OlJ1 bkxpc3QmIGNhbmRpZGF0ZVJ1bnMpCit7CisgICAgQVNTRVJUKHJ1YnlCYXNlRW5kLmlzSW5saW5l Qm94U3RhcnQoKSAmJiBydWJ5QmFzZUVuZC5sYXlvdXRCb3goKS5pc1J1YnlCYXNlKCkpOworICAg IC8vIENhbmlkYXRlIGNvbnRlbnQgaXMgc3VwcG9zZWQgdG8gaG9sZCB0aGUgYmFzZSBjb250ZW50 IGFuZCBpbiBjYXNlIG9mIHNvZnQgd3JhcCBvcHBvcnR1bml0aWVzLCBsaW5lIG1heSBoYXZlIHNv bWUgYmFzZSBjb250ZW50IHRvby4KKyAgICBhdXRvJiBydWJ5QmFzZUxheW91dEJveCA9IHJ1YnlC YXNlRW5kLmxheW91dEJveCgpOworICAgIGF1dG8gYmFzZUxvZ2ljYWxXaWR0aCA9IElubGluZUxh eW91dFVuaXQgeyAwLmYgfTsKKyAgICBhdXRvIGhhc1NlZW5SdWJ5QmFzZVN0YXJ0ID0gZmFsc2U7 CisgICAgZm9yIChhdXRvJiBjYW5kaWRhdGVSdW4gOiBtYWtlUmV2ZXJzZWRSYW5nZShjYW5kaWRh dGVSdW5zKSkgeworICAgICAgICBhdXRvJiBpbmxpbmVJdGVtID0gY2FuZGlkYXRlUnVuLmlubGlu ZUl0ZW07CisgICAgICAgIGlmIChpbmxpbmVJdGVtLmlzSW5saW5lQm94U3RhcnQoKSAmJiAmaW5s aW5lSXRlbS5sYXlvdXRCb3goKSA9PSAmcnVieUJhc2VMYXlvdXRCb3gpIHsKKyAgICAgICAgICAg IGhhc1NlZW5SdWJ5QmFzZVN0YXJ0ID0gdHJ1ZTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAg ICB9CisgICAgICAgIGJhc2VMb2dpY2FsV2lkdGggKz0gY2FuZGlkYXRlUnVuLmxvZ2ljYWxXaWR0 aDsKKyAgICB9CisgICAgaWYgKGhhc1NlZW5SdWJ5QmFzZVN0YXJ0KQorICAgICAgICByZXR1cm4g YmFzZUxvZ2ljYWxXaWR0aDsKKyAgICAvLyBMZXQncyBjaGVjayB0aGUgbGluZSBmb3IgdGhlIHJl c3Qgb2YgdGhlIGJhc2UgY29udGVudC4KKyAgICBmb3IgKGF1dG8mIGxpbmVSdW4gOiBtYWtlUmV2 ZXJzZWRSYW5nZShsaW5lUnVucykpIHsKKyAgICAgICAgaWYgKChsaW5lUnVuLmlzSW5saW5lQm94 U3RhcnQoKSB8fCBsaW5lUnVuLmlzTGluZVNwYW5uaW5nSW5saW5lQm94U3RhcnQoKSkgJiYgJmxp bmVSdW4ubGF5b3V0Qm94KCkgPT0gJnJ1YnlCYXNlTGF5b3V0Qm94KQorICAgICAgICAgICAgYnJl YWs7CisgICAgICAgIGJhc2VMb2dpY2FsV2lkdGggKz0gbGluZVJ1bi5sb2dpY2FsV2lkdGgoKTsK KyAgICB9CisgICAgcmV0dXJuIGJhc2VMb2dpY2FsV2lkdGg7Cit9CisKIFJ1YnlGb3JtYXR0aW5n Q29udGV4dDo6SW5saW5lTGF5b3V0UmVzdWx0IFJ1YnlGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0 SW5saW5lQXhpcyhjb25zdCBJbmxpbmVJdGVtUmFuZ2UmIHJ1YnlSYW5nZSwgY29uc3QgSW5saW5l SXRlbUxpc3QmIGlubGluZUl0ZW1MaXN0LCBMaW5lJiBsaW5lLCBJbmxpbmVMYXlvdXRVbml0IGF2 YWlsYWJsZVdpZHRoKQogewogICAgIEFTU0VSVCghcnVieVJhbmdlLmlzRW1wdHkoKSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9y dWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvcnVieS9SdWJ5Rm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCBh OWY0M2ZkNjg2MGEuLjk4NjBlMmU0Nzk2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvcnVieS9SdWJ5Rm9ybWF0dGluZ0NvbnRleHQu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9y dWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC01OCw2ICs1OCw3IEBAIHB1YmxpYzoKIAog ICAgIHN0YXRpYyBib29sIGlzQXRTb2Z0V3JhcE9wcG9ydHVuaXR5KGNvbnN0IElubGluZUl0ZW0m IHByZXZpb3VzLCBjb25zdCBJbmxpbmVJdGVtJiBjdXJyZW50KTsKICAgICBzdGF0aWMgc3RkOjpv cHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBhbm5vdGF0aW9uQm94TG9naWNhbFdpZHRoKGNvbnN0 IEJveCYgcnVieUJhc2VMYXlvdXRCb3gsIGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0Jik7 CisgICAgc3RhdGljIElubGluZUxheW91dFVuaXQgYmFzZUxvZ2ljYWxXaWR0aEZyb21SdWJ5QmFz ZUVuZChjb25zdCBJbmxpbmVJdGVtJiBydWJ5QmFzZUVuZCwgY29uc3QgTGluZTo6UnVuTGlzdCYs IGNvbnN0IElubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3VzQ29udGVudDo6UnVuTGlzdCYp OwogCiBwcml2YXRlOgogICAgIHN0cnVjdCBCYXNlTGF5b3V0UmVzdWx0IHsK 468863 2023-12-04 08:18:50 -0800 2023-12-04 09:20:06 -0800 [fast-cq]Patch bug-265756-20231204081850.patch text/plain 7179 zalan RnJvbSBjZTU4OWU4NTg4YTZjMWZkZjI4YmExYzhkZDE3NzA1MzViZThiM2UwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFN1biwgMyBEZWMgMjAyMyAxMDo0OTo1MSAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIFtJRkNdW1J1 YnldIE9mZnNldCBydWJ5IGJhc2UgZW5kIGlubGluZSBpdGVtIHdpdGggb3ZlcmZsb3dpbmcKIGlu dGVybGluZWFyIGFubm90YXRpb24gYm94IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yNjU3NTYKClJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgoKV2hpbGUgYW5ub3Rh dGlvbiBib3hlcyBkb24ndCBwYXJ0aWNpcGF0ZSBpbiBpbmxpbmUgbGF5b3V0LCB3aGVuIHBsYWNp bmcgdGhlIGFzc29jaWF0ZWQgYmFzZSBjb250ZW50Cm9uIHRoZSBsaW5lLCB3ZSBoYXZlIHRvIG1h a2Ugc3VyZSB0aGUgYmFzZSBpbmxpbmUgYm94IGVuZCAiY292ZXJzIiBhbnkgb3ZlcmZsb3dpbmcg aW50ZXJsaW5lYXIgYW5ub3RhdGlvbi4KCmUuZy4KIjxydWJ5PmJhc2UgY29udGVudDxydD50aGlz IGlzIGEgbG9uZyBhbm5vdGF0aW9uPC9ydD48L3J1Ynk+YWZ0ZXIgcnVieSBjb250ZW50IiBkb2Vz IG5vdCBwcm9kdWNlIHRoaXM6CgpbdGhpcyBpcyBhIGxvbmcgYW5ub3RhdGlvbl0KW2Jhc2UgY29u dGVudF1bYWZ0ZXIgcnVieSBjb250ZW50XSAgICAgIDwtIGxpbmUgY29udGVudC4KCmJ1dCBzb21l dGhpbmcgYWxvbmcgdGhlIGxpbmVzIG9mCgpbdGhpcyBpcyBhIGxvbmcgYW5ub3RhdGlvbl0KW2Jh c2UgY29udGVudF0gICAgICAgICAgICAgW2FmdGVyIHJ1YnkgY29udGVudF0KCihpZ25vcmUgcnVi eSBiYXNlIGFsaWdubWVudCBmb3Igbm93KQoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHA6CihXZWJDb3JlOjpMYXlv dXQ6OkxpbmVCdWlsZGVyOjpjYW5kaWRhdGVDb250ZW50Rm9yTGluZSk6CiogU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvcnVieS9SdWJ5Rm9ybWF0dGluZ0Nv bnRleHQuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpSdWJ5Rm9ybWF0dGluZ0NvbnRleHQ6OmJhc2VM b2dpY2FsV2lkdGhGcm9tUnVieUJhc2VFbmQpOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL3J1YnkvUnVieUZvcm1hdHRpbmdDb250ZXh0Lmg6Ci0tLQog Li4uL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAgICAgICAgICAgICAgIHwgMjEgKysrKysr KysrKy0tLS0tCiAuLi4vaW5saW5lL3J1YnkvUnVieUZvcm1hdHRpbmdDb250ZXh0LmNwcCAgICAg fCAyNiArKysrKysrKysrKysrKysrKysrCiAuLi4vaW5saW5lL3J1YnkvUnVieUZvcm1hdHRpbmdD b250ZXh0LmggICAgICAgfCAgMSArCiAzIGZpbGVzIGNoYW5nZWQsIDQyIGluc2VydGlvbnMoKyks IDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3Bw CmluZGV4IDAxMDVlZDU1ZTM0Yi4uMzliZjExYzBkZWViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC02NDAsMTMgKzY0MCwyMiBAQCB2b2lkIExpbmVCdWls ZGVyOjpjYW5kaWRhdGVDb250ZW50Rm9yTGluZShMaW5lQ2FuZGlkYXRlJiBsaW5lQ2FuZGlkYXRl LCBzaXplX3QgYwogICAgICAgICB9CiAgICAgICAgIGlmIChpbmxpbmVJdGVtLmlzSW5saW5lQm94 U3RhcnQoKSB8fCBpbmxpbmVJdGVtLmlzSW5saW5lQm94RW5kKCkpIHsKICAgICAgICAgICAgIGF1 dG8mIGxheW91dEJveCA9IGlubGluZUl0ZW0ubGF5b3V0Qm94KCk7Ci0gICAgICAgICAgICBpZiAo aW5saW5lSXRlbS5pc0lubGluZUJveFN0YXJ0KCkgJiYgbGF5b3V0Qm94LmlzUnVieUJhc2UoKSkg ewotICAgICAgICAgICAgICAgIC8vIFRoZXJlIHNob3VsZCBvbmx5IGJlIG9uZSBydWJ5IGJhc2Ug cGVyL2Fubm90YXRpb24gY2FuZGlkYXRlIGNvbnRlbnQgYXMgd2UgYWxsb3cgbGluZSBicmVha2lu ZyBiZXR3ZWVuIGJhc2VzLgotICAgICAgICAgICAgICAgIEFTU0VSVCghbGluZUNhbmRpZGF0ZS5p bmxpbmVDb250ZW50LmNvbnRpbnVvdXNDb250ZW50KCkubWluaW11bVJlcXVpcmVkV2lkdGgoKSk7 Ci0gICAgICAgICAgICAgICAgaWYgKGF1dG8gbWluaW11bVJlcXVpcmVkV2lkdGggPSBSdWJ5Rm9y bWF0dGluZ0NvbnRleHQ6OmFubm90YXRpb25Cb3hMb2dpY2FsV2lkdGgobGF5b3V0Qm94LCBmb3Jt YXR0aW5nQ29udGV4dCgpKSkKLSAgICAgICAgICAgICAgICAgICAgbGluZUNhbmRpZGF0ZS5pbmxp bmVDb250ZW50LnNldE1pbmltdW1SZXF1aXJlZFdpZHRoKCptaW5pbXVtUmVxdWlyZWRXaWR0aCk7 Ci0gICAgICAgICAgICB9CiAgICAgICAgICAgICBhdXRvIGxvZ2ljYWxXaWR0aCA9IGZvcm1hdHRp bmdDb250ZXh0KCkuZm9ybWF0dGluZ1V0aWxzKCkuaW5saW5lSXRlbVdpZHRoKGlubGluZUl0ZW0s IGN1cnJlbnRMb2dpY2FsUmlnaHQsIGlzRmlyc3RGb3JtYXR0ZWRMaW5lKCkpOworICAgICAgICAg ICAgaWYgKGxheW91dEJveC5pc1J1YnlCYXNlKCkpIHsKKyAgICAgICAgICAgICAgICBpZiAoYXV0 byBhbm5vdGF0aW9uQm94TG9naWNhbFdpZHRoID0gUnVieUZvcm1hdHRpbmdDb250ZXh0Ojphbm5v dGF0aW9uQm94TG9naWNhbFdpZHRoKGxheW91dEJveCwgZm9ybWF0dGluZ0NvbnRleHQoKSkpIHsK KyAgICAgICAgICAgICAgICAgICAgaWYgKGlubGluZUl0ZW0uaXNJbmxpbmVCb3hTdGFydCgpKSB7 CisgICAgICAgICAgICAgICAgICAgICAgICAvLyBUaGVyZSBzaG91bGQgb25seSBiZSBvbmUgcnVi eSBiYXNlIHBlci9hbm5vdGF0aW9uIGNhbmRpZGF0ZSBjb250ZW50IGFzIHdlIGFsbG93IGxpbmUg YnJlYWtpbmcgYmV0d2VlbiBiYXNlcy4KKyAgICAgICAgICAgICAgICAgICAgICAgIEFTU0VSVCgh bGluZUNhbmRpZGF0ZS5pbmxpbmVDb250ZW50LmNvbnRpbnVvdXNDb250ZW50KCkubWluaW11bVJl cXVpcmVkV2lkdGgoKSk7CisgICAgICAgICAgICAgICAgICAgICAgICBsaW5lQ2FuZGlkYXRlLmlu bGluZUNvbnRlbnQuc2V0TWluaW11bVJlcXVpcmVkV2lkdGgoKmFubm90YXRpb25Cb3hMb2dpY2Fs V2lkdGgpOworICAgICAgICAgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgICAg ICAgICAgLy8gQmFzZSBpcyBzdXBwb3NlZCBiZSBhdCBsZWFzdCBhcyB3aWRlIGFzIHRoZSBhbm5v dGF0aW9uIGlzLgorICAgICAgICAgICAgICAgICAgICAgICAgLy8gTGV0J3MgYWRqdXN0IHRoZSBp bmxpbmUgYm94IGVuZCB3aWR0aCB0byBhY2NvbW9kYXRlIHN1Y2ggb3ZlcmZsb3dpbmcgbGluZXIg YW5ub3RhdGlvbi4KKyAgICAgICAgICAgICAgICAgICAgICAgIGF1dG8gcnVieUJhc2VDb250ZW50 V2lkdGggPSBSdWJ5Rm9ybWF0dGluZ0NvbnRleHQ6OmJhc2VMb2dpY2FsV2lkdGhGcm9tUnVieUJh c2VFbmQoaW5saW5lSXRlbSwgbV9saW5lLnJ1bnMoKSwgbGluZUNhbmRpZGF0ZS5pbmxpbmVDb250 ZW50LmNvbnRpbnVvdXNDb250ZW50KCkucnVucygpKTsKKyAgICAgICAgICAgICAgICAgICAgICAg IEFTU0VSVChydWJ5QmFzZUNvbnRlbnRXaWR0aCA+PSAwKTsKKyAgICAgICAgICAgICAgICAgICAg ICAgIGxvZ2ljYWxXaWR0aCArPSBzdGQ6Om1heCgwLmYsICphbm5vdGF0aW9uQm94TG9naWNhbFdp ZHRoIC0gcnVieUJhc2VDb250ZW50V2lkdGgpOworICAgICAgICAgICAgICAgICAgICB9CisgICAg ICAgICAgICAgICAgfQorICAgICAgICAgICAgfQogICAgICAgICAgICAgaWYgKHN0eWxlLmJveERl Y29yYXRpb25CcmVhaygpID09IEJveERlY29yYXRpb25CcmVhazo6Q2xvbmUpIHsKICAgICAgICAg ICAgICAgICBpZiAoaW5saW5lSXRlbS5pc0lubGluZUJveFN0YXJ0KCkpCiAgICAgICAgICAgICAg ICAgICAgIGlubGluZUJveExpc3RXaXRoQ2xvbmVkRGVjb3JhdGlvbkVuZC5hZGQoJmxheW91dEJv eCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4 dC5jcHAKaW5kZXggODA2Zjg4MzBkOGRiLi5kN2MxZjk2OGJhYWIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3J1YnkvUnVieUZvcm1h dHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTExNyw2ICsx MTcsMzIgQEAgc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBSdWJ5Rm9ybWF0dGluZ0Nv bnRleHQ6OmFubm90YXRpb25Cb3hMb2dpY2FsV2lkdGgKICAgICByZXR1cm4geyB9OwogfQogCitJ bmxpbmVMYXlvdXRVbml0IFJ1YnlGb3JtYXR0aW5nQ29udGV4dDo6YmFzZUxvZ2ljYWxXaWR0aEZy b21SdWJ5QmFzZUVuZChjb25zdCBJbmxpbmVJdGVtJiBydWJ5QmFzZUVuZCwgY29uc3QgTGluZTo6 UnVuTGlzdCYgbGluZVJ1bnMsIGNvbnN0IElubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3Vz Q29udGVudDo6UnVuTGlzdCYgY2FuZGlkYXRlUnVucykKK3sKKyAgICBBU1NFUlQocnVieUJhc2VF bmQuaXNJbmxpbmVCb3hFbmQoKSAmJiBydWJ5QmFzZUVuZC5sYXlvdXRCb3goKS5pc1J1YnlCYXNl KCkpOworICAgIC8vIENhbmlkYXRlIGNvbnRlbnQgaXMgc3VwcG9zZWQgdG8gaG9sZCB0aGUgYmFz ZSBjb250ZW50IGFuZCBpbiBjYXNlIG9mIHNvZnQgd3JhcCBvcHBvcnR1bml0aWVzLCBsaW5lIG1h eSBoYXZlIHNvbWUgYmFzZSBjb250ZW50IHRvby4KKyAgICBhdXRvJiBydWJ5QmFzZUxheW91dEJv eCA9IHJ1YnlCYXNlRW5kLmxheW91dEJveCgpOworICAgIGF1dG8gYmFzZUxvZ2ljYWxXaWR0aCA9 IElubGluZUxheW91dFVuaXQgeyAwLmYgfTsKKyAgICBhdXRvIGhhc1NlZW5SdWJ5QmFzZVN0YXJ0 ID0gZmFsc2U7CisgICAgZm9yIChhdXRvJiBjYW5kaWRhdGVSdW4gOiBtYWtlUmV2ZXJzZWRSYW5n ZShjYW5kaWRhdGVSdW5zKSkgeworICAgICAgICBhdXRvJiBpbmxpbmVJdGVtID0gY2FuZGlkYXRl UnVuLmlubGluZUl0ZW07CisgICAgICAgIGlmIChpbmxpbmVJdGVtLmlzSW5saW5lQm94U3RhcnQo KSAmJiAmaW5saW5lSXRlbS5sYXlvdXRCb3goKSA9PSAmcnVieUJhc2VMYXlvdXRCb3gpIHsKKyAg ICAgICAgICAgIGhhc1NlZW5SdWJ5QmFzZVN0YXJ0ID0gdHJ1ZTsKKyAgICAgICAgICAgIGJyZWFr OworICAgICAgICB9CisgICAgICAgIGJhc2VMb2dpY2FsV2lkdGggKz0gY2FuZGlkYXRlUnVuLmxv Z2ljYWxXaWR0aDsKKyAgICB9CisgICAgaWYgKGhhc1NlZW5SdWJ5QmFzZVN0YXJ0KQorICAgICAg ICByZXR1cm4gYmFzZUxvZ2ljYWxXaWR0aDsKKyAgICAvLyBMZXQncyBjaGVjayB0aGUgbGluZSBm b3IgdGhlIHJlc3Qgb2YgdGhlIGJhc2UgY29udGVudC4KKyAgICBmb3IgKGF1dG8mIGxpbmVSdW4g OiBtYWtlUmV2ZXJzZWRSYW5nZShsaW5lUnVucykpIHsKKyAgICAgICAgaWYgKChsaW5lUnVuLmlz SW5saW5lQm94U3RhcnQoKSB8fCBsaW5lUnVuLmlzTGluZVNwYW5uaW5nSW5saW5lQm94U3RhcnQo KSkgJiYgJmxpbmVSdW4ubGF5b3V0Qm94KCkgPT0gJnJ1YnlCYXNlTGF5b3V0Qm94KQorICAgICAg ICAgICAgYnJlYWs7CisgICAgICAgIGJhc2VMb2dpY2FsV2lkdGggKz0gbGluZVJ1bi5sb2dpY2Fs V2lkdGgoKTsKKyAgICB9CisgICAgcmV0dXJuIGJhc2VMb2dpY2FsV2lkdGg7Cit9CisKIFJ1YnlG b3JtYXR0aW5nQ29udGV4dDo6SW5saW5lTGF5b3V0UmVzdWx0IFJ1YnlGb3JtYXR0aW5nQ29udGV4 dDo6bGF5b3V0SW5saW5lQXhpcyhjb25zdCBJbmxpbmVJdGVtUmFuZ2UmIHJ1YnlSYW5nZSwgY29u c3QgSW5saW5lSXRlbUxpc3QmIGlubGluZUl0ZW1MaXN0LCBMaW5lJiBsaW5lLCBJbmxpbmVMYXlv dXRVbml0IGF2YWlsYWJsZVdpZHRoKQogewogICAgIEFTU0VSVCghcnVieVJhbmdlLmlzRW1wdHko KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvcnVieS9SdWJ5Rm9ybWF0dGluZ0NvbnRleHQu aAppbmRleCBhOWY0M2ZkNjg2MGEuLjk4NjBlMmU0Nzk2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvcnVieS9SdWJ5Rm9ybWF0dGlu Z0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC01OCw2ICs1OCw3IEBAIHB1 YmxpYzoKIAogICAgIHN0YXRpYyBib29sIGlzQXRTb2Z0V3JhcE9wcG9ydHVuaXR5KGNvbnN0IElu bGluZUl0ZW0mIHByZXZpb3VzLCBjb25zdCBJbmxpbmVJdGVtJiBjdXJyZW50KTsKICAgICBzdGF0 aWMgc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBhbm5vdGF0aW9uQm94TG9naWNhbFdp ZHRoKGNvbnN0IEJveCYgcnVieUJhc2VMYXlvdXRCb3gsIGNvbnN0IElubGluZUZvcm1hdHRpbmdD b250ZXh0Jik7CisgICAgc3RhdGljIElubGluZUxheW91dFVuaXQgYmFzZUxvZ2ljYWxXaWR0aEZy b21SdWJ5QmFzZUVuZChjb25zdCBJbmxpbmVJdGVtJiBydWJ5QmFzZUVuZCwgY29uc3QgTGluZTo6 UnVuTGlzdCYsIGNvbnN0IElubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3VzQ29udGVudDo6 UnVuTGlzdCYpOwogCiBwcml2YXRlOgogICAgIHN0cnVjdCBCYXNlTGF5b3V0UmVzdWx0IHsK