266308 2023-12-12 16:14:35 -0800 [IFC][Ruby] Fix fast/ruby/ruby-expansion-cjk-4.html 2023-12-13 05:19: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 1999122 0 zalan 2023-12-12 16:14:35 -0800 ssia 1999124 1 469003 zalan 2023-12-12 16:20:11 -0800 Created attachment 469003 Patch 1999164 2 469012 zalan 2023-12-12 18:14:37 -0800 Created attachment 469012 [fast-cq]Patch 1999238 3 ews-feeder 2023-12-13 05:18:46 -0800 Committed 271978@main (7d36e7f1415f): <https://commits.webkit.org/271978@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 469012. 1999239 4 webkit-bug-importer 2023-12-13 05:19:15 -0800 <rdar://problem/119608203> 469003 2023-12-12 16:20:11 -0800 2023-12-12 18:14:35 -0800 Patch bug-266308-20231212162011.patch text/plain 5755 zalan RnJvbSBmMTMzMTU1MGNlYTU4ZjJjMzM3NjMzM2I0NmIyYTFlYTU0ZThmM2UyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFR1ZSwgMTIgRGVjIDIwMjMgMTY6MTc6MjcgLTA4MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXVtS dWJ5XSBGaXggZmFzdC9ydWJ5L3J1YnktZXhwYW5zaW9uLWNqay00Lmh0bWwKIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjYzMDgKClJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgoKVGhpcyBjaGFuZ2UgZml4ZXMgbmVzdGVkIHJ1YnkgYmFzZXMgKGUuZy4gPHJ1Ynk+ YmFzZTxydD5hbm5vdGF0aW9uPC9ydD48cnVieT5uZXN0ZWQgYmFzZS4uLikKd2hlcmUgdGhlIG5l c3RlZCBiYXNlIHdvdWxkIG5vdCBnZXQgYWxpZ25lZCBwcm9wZXJseS4KCiogU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEFsaWduZXIu Y3BwOgooV2ViQ29yZTo6TGF5b3V0OjpzaGlmdFJ1YnlCYXNlQ29udGVudEJ5QWxpZ25tZW50T2Zm c2V0KTogcGFzcyB1cCB0aGUgYWNjdW11bGF0ZWQgb2Zmc2V0IHRvIHRoZSBwYXJlbnQgcnVieS4K KFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29udGVudEFsaWduZXI6OmFwcGx5UnVieUJhc2VBbGln bm1lbnRPZmZzZXQpOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL3J1YnkvUnVieUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKFdlYkNvcmU6OkxheW91dDo6 UnVieUZvcm1hdHRpbmdDb250ZXh0OjphcHBseVJ1YnlBbGlnbk9uQmFzZUNvbnRlbnQpOiBkbyBu b3Qgc2tpcCBuZXN0ZWQgcnVieSBiYXNlcy4KLS0tCiAuLi4vaW5saW5lL0lubGluZUNvbnRlbnRB bGlnbmVyLmNwcCAgICAgICAgICAgICAgICB8IDE0ICsrKysrKysrKystLS0tCiAuLi4vaW5saW5l L3J1YnkvUnVieUZvcm1hdHRpbmdDb250ZXh0LmNwcCAgICAgICAgICB8ICA0ICsrLS0KIDIgZmls ZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVD b250ZW50QWxpZ25lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVDb250ZW50QWxpZ25lci5jcHAKaW5kZXggOWEzNDNkYTYxYjNhLi41 MGE2Y2JjZWZiNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRBbGlnbmVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QWxpZ25l ci5jcHAKQEAgLTk2LDcgKzk2LDcgQEAgc3RydWN0IEJhc2VJbmRleEFuZE9mZnNldCB7CiAgICAg c2l6ZV90IGluZGV4IHsgMCB9OwogICAgIElubGluZUxheW91dFVuaXQgb2Zmc2V0IHsgMC5mIH07 CiB9Owotc3RhdGljIEJhc2VJbmRleEFuZE9mZnNldCBzaGlmdFJ1YnlCYXNlQ29udGVudEJ5QWxp Z25tZW50T2Zmc2V0KEJhc2VJbmRleEFuZE9mZnNldCBiYXNlSW5kZXhBbmRPZmZzZXQsIElubGlu ZURpc3BsYXk6OkJveGVzJiBkaXNwbGF5Qm94ZXMsIGNvbnN0IEhhc2hNYXA8Y29uc3QgQm94Kiwg SW5saW5lTGF5b3V0VW5pdD4mIGFsaWdubWVudE9mZnNldExpc3QsIElubGluZUZvcm1hdHRpbmdD b250ZXh0JiBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCkKK3N0YXRpYyBCYXNlSW5kZXhBbmRPZmZz ZXQgc2hpZnRSdWJ5QmFzZUNvbnRlbnRCeUFsaWdubWVudE9mZnNldChCYXNlSW5kZXhBbmRPZmZz ZXQgYmFzZUluZGV4QW5kT2Zmc2V0LCBJbmxpbmVEaXNwbGF5OjpCb3hlcyYgZGlzcGxheUJveGVz LCBjb25zdCBIYXNoTWFwPGNvbnN0IEJveCosIElubGluZUxheW91dFVuaXQ+JiBhbGlnbm1lbnRP ZmZzZXRMaXN0LCBJbmxpbmVDb250ZW50QWxpZ25lcjo6QWRqdXN0Q29udGVudE9ubHlJbnNpZGVS dWJ5QmFzZSBhZGp1c3RDb250ZW50T25seUluc2lkZVJ1YnlCYXNlLCBJbmxpbmVGb3JtYXR0aW5n Q29udGV4dCYgaW5saW5lRm9ybWF0dGluZ0NvbnRleHQpCiB7CiAgICAgYXV0byBiYXNlSW5kZXgg PSBiYXNlSW5kZXhBbmRPZmZzZXQuaW5kZXg7CiAgICAgaWYgKGJhc2VJbmRleCA+PSBkaXNwbGF5 Qm94ZXMuc2l6ZSgpIHx8ICFkaXNwbGF5Qm94ZXNbYmFzZUluZGV4XS5sYXlvdXRCb3goKS5pc1J1 YnlCYXNlKCkpIHsKQEAgLTEyMSwxMiArMTIxLDE4IEBAIHN0YXRpYyBCYXNlSW5kZXhBbmRPZmZz ZXQgc2hpZnRSdWJ5QmFzZUNvbnRlbnRCeUFsaWdubWVudE9mZnNldChCYXNlSW5kZXhBbmRPZmZz CiAgICAgICAgIGlmICghbGF5b3V0Qm94LmlzUnVieUFubm90YXRpb25Cb3goKSkKICAgICAgICAg ICAgIHNoaWZ0RGlzcGxheUJveChkaXNwbGF5Qm94LCBiYXNlT2Zmc2V0ICsgYmFzZUNvbnRlbnRP ZmZzZXQsIGlubGluZUZvcm1hdHRpbmdDb250ZXh0KTsKICAgICAgICAgaWYgKGxheW91dEJveC5p c1J1YnlCYXNlKCkpIHsKLSAgICAgICAgICAgIGJhc2VDb250ZW50SW5kZXggPSBzaGlmdFJ1YnlC YXNlQ29udGVudEJ5QWxpZ25tZW50T2Zmc2V0KHsgYmFzZUNvbnRlbnRJbmRleCwgYmFzZU9mZnNl dCArIGJhc2VDb250ZW50T2Zmc2V0IH0sIGRpc3BsYXlCb3hlcywgYWxpZ25tZW50T2Zmc2V0TGlz dCwgaW5saW5lRm9ybWF0dGluZ0NvbnRleHQpLmluZGV4OworICAgICAgICAgICAgYXV0byBiYXNl RW5kSW5kZXhBbmRBbGlnbm1lbnQgPSBzaGlmdFJ1YnlCYXNlQ29udGVudEJ5QWxpZ25tZW50T2Zm c2V0KHsgYmFzZUNvbnRlbnRJbmRleCwgYmFzZU9mZnNldCArIGJhc2VDb250ZW50T2Zmc2V0IH0s IGRpc3BsYXlCb3hlcywgYWxpZ25tZW50T2Zmc2V0TGlzdCwgYWRqdXN0Q29udGVudE9ubHlJbnNp ZGVSdWJ5QmFzZSwgaW5saW5lRm9ybWF0dGluZ0NvbnRleHQpOworICAgICAgICAgICAgYmFzZUNv bnRlbnRJbmRleCA9IGJhc2VFbmRJbmRleEFuZEFsaWdubWVudC5pbmRleDsKKyAgICAgICAgICAg IGlmIChhZGp1c3RDb250ZW50T25seUluc2lkZVJ1YnlCYXNlID09IElubGluZUNvbnRlbnRBbGln bmVyOjpBZGp1c3RDb250ZW50T25seUluc2lkZVJ1YnlCYXNlOjpObykKKyAgICAgICAgICAgICAg ICBiYXNlT2Zmc2V0ICs9IGJhc2VFbmRJbmRleEFuZEFsaWdubWVudC5vZmZzZXQ7CiAgICAgICAg ICAgICBjb250aW51ZTsKICAgICAgICAgfQogICAgICAgICArK2Jhc2VDb250ZW50SW5kZXg7CiAg ICAgfQotICAgIHJldHVybiB7IGJhc2VDb250ZW50SW5kZXgsIDIgKiBiYXNlQ29udGVudE9mZnNl dCB9OworICAgIGF1dG8gYWNjdW11bGF0ZWRPZmZzZXQgPSAyICogYmFzZUNvbnRlbnRPZmZzZXQ7 CisgICAgaWYgKGFkanVzdENvbnRlbnRPbmx5SW5zaWRlUnVieUJhc2UgPT0gSW5saW5lQ29udGVu dEFsaWduZXI6OkFkanVzdENvbnRlbnRPbmx5SW5zaWRlUnVieUJhc2U6Ok5vKQorICAgICAgICBh Y2N1bXVsYXRlZE9mZnNldCArPSBiYXNlT2Zmc2V0OworICAgIHJldHVybiB7IGJhc2VDb250ZW50 SW5kZXgsIGFjY3VtdWxhdGVkT2Zmc2V0IH07CiB9CiAKIHN0YXRpYyB2b2lkIGNvbXB1dGVkRXhw YW5zaW9ucyhjb25zdCBMaW5lOjpSdW5MaXN0JiBydW5zLCBXVEY6OlJhbmdlPHNpemVfdD4gcnVu UmFuZ2UsIHNpemVfdCBoYW5naW5nVHJhaWxpbmdXaGl0ZXNwYWNlTGVuZ3RoLCBFeHBhbnNpb25J bmZvJiBleHBhbnNpb25JbmZvKQpAQCAtMjkwLDcgKzI5Niw3IEBAIHZvaWQgSW5saW5lQ29udGVu dEFsaWduZXI6OmFwcGx5UnVieUJhc2VBbGlnbm1lbnRPZmZzZXQoSW5saW5lRGlzcGxheTo6Qm94 ZXMmIGRpCiAgICAgICAgICAgICBzaGlmdERpc3BsYXlCb3goZGlzcGxheUJveCwgY29udGVudE9m ZnNldCwgaW5saW5lRm9ybWF0dGluZ0NvbnRleHQpOwogCiAgICAgICAgIGlmIChkaXNwbGF5Qm94 LmxheW91dEJveCgpLmlzUnVieUJhc2UoKSkgewotICAgICAgICAgICAgYXV0byBiYXNlRW5kSW5k ZXhBbmRBbGlnbm1lbnQgPSBzaGlmdFJ1YnlCYXNlQ29udGVudEJ5QWxpZ25tZW50T2Zmc2V0KHsg aW5kZXgsIGNvbnRlbnRPZmZzZXQgfSwgZGlzcGxheUJveGVzLCBhbGlnbm1lbnRPZmZzZXRMaXN0 LCBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCk7CisgICAgICAgICAgICBhdXRvIGJhc2VFbmRJbmRl eEFuZEFsaWdubWVudCA9IHNoaWZ0UnVieUJhc2VDb250ZW50QnlBbGlnbm1lbnRPZmZzZXQoeyBp bmRleCwgY29udGVudE9mZnNldCB9LCBkaXNwbGF5Qm94ZXMsIGFsaWdubWVudE9mZnNldExpc3Qs IGFkanVzdENvbnRlbnRPbmx5SW5zaWRlUnVieUJhc2UsIGlubGluZUZvcm1hdHRpbmdDb250ZXh0 KTsKICAgICAgICAgICAgIGluZGV4ID0gYmFzZUVuZEluZGV4QW5kQWxpZ25tZW50LmluZGV4Owog ICAgICAgICAgICAgaWYgKGFkanVzdENvbnRlbnRPbmx5SW5zaWRlUnVieUJhc2UgPT0gQWRqdXN0 Q29udGVudE9ubHlJbnNpZGVSdWJ5QmFzZTo6Tm8pCiAgICAgICAgICAgICAgICAgY29udGVudE9m ZnNldCArPSBiYXNlRW5kSW5kZXhBbmRBbGlnbm1lbnQub2Zmc2V0OwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvcnVieS9SdWJ5Rm9y bWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvcnVieS9SdWJ5Rm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDYyYmM5ZjQz ZDVlZS4uZTY3ZDczMDczNmViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvcnVieS9S dWJ5Rm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0yNDgsMTIgKzI0OCwxMiBAQCBzaXplX3QgUnVi eUZvcm1hdHRpbmdDb250ZXh0OjphcHBseVJ1YnlBbGlnbk9uQmFzZUNvbnRlbnQoc2l6ZV90IHJ1 YnlCYXNlU3RhcnQsCiAgICAgfQogICAgIGF1dG8qIGFubm90YXRpb25Cb3ggPSBydWJ5QmFzZUxh eW91dEJveC5hc3NvY2lhdGVkUnVieUFubm90YXRpb25Cb3goKTsKICAgICBpZiAoIWFubm90YXRp b25Cb3gpCi0gICAgICAgIHJldHVybiBydWJ5QmFzZUVuZDsKKyAgICAgICAgcmV0dXJuIHJ1YnlC YXNlU3RhcnQgKyAxOwogCiAgICAgYXV0byBhbm5vdGF0aW9uQm94TG9naWNhbFdpZHRoID0gSW5s aW5lTGF5b3V0VW5pdCB7IGlubGluZUZvcm1hdHRpbmdDb250ZXh0Lmdlb21ldHJ5Rm9yQm94KCph bm5vdGF0aW9uQm94KS5tYXJnaW5Cb3hXaWR0aCgpIH07CiAgICAgYXV0byBiYXNlQ29udGVudExv Z2ljYWxXaWR0aCA9IHJ1bnNbcnVieUJhc2VFbmRdLmxvZ2ljYWxMZWZ0KCkgLSBydW5zW3J1YnlC YXNlU3RhcnRdLmxvZ2ljYWxSaWdodCgpOwogICAgIGlmIChhbm5vdGF0aW9uQm94TG9naWNhbFdp ZHRoIDw9IGJhc2VDb250ZW50TG9naWNhbFdpZHRoKQotICAgICAgICByZXR1cm4gcnVieUJhc2VF bmQ7CisgICAgICAgIHJldHVybiBydWJ5QmFzZVN0YXJ0ICsgMTsKIAogICAgIC8vIEZJWE1FOiBy dWJ5LWFsaWduOiBzcGFjZS1hcm91bmQgb25seQogICAgIGF1dG8gc3BhY2VUb0Rpc3RyaWJ1dGUg PSBhbm5vdGF0aW9uQm94TG9naWNhbFdpZHRoIC0gYmFzZUNvbnRlbnRMb2dpY2FsV2lkdGg7Cg== 469012 2023-12-12 18:14:37 -0800 2023-12-13 05:18:47 -0800 [fast-cq]Patch bug-266308-20231212181436.patch text/plain 5755 zalan RnJvbSA3YzE4YzIwM2I2YWY1YjQzYTNkNDk5ZGIzZGIwNjU5OTlhODBhZjRkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFR1ZSwgMTIgRGVjIDIwMjMgMTY6MTc6MjcgLTA4MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXVtS dWJ5XSBGaXggZmFzdC9ydWJ5L3J1YnktZXhwYW5zaW9uLWNqay00Lmh0bWwKIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjYzMDgKClJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgoKVGhpcyBjaGFuZ2UgZml4ZXMgbmVzdGVkIHJ1YnkgYmFzZXMgKGUuZy4gPHJ1Ynk+ YmFzZTxydD5hbm5vdGF0aW9uPC9ydD48cnVieT5uZXN0ZWQgYmFzZS4uLikKd2hlcmUgdGhlIG5l c3RlZCBiYXNlIHdvdWxkIG5vdCBnZXQgYWxpZ25lZCBwcm9wZXJseS4KCiogU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEFsaWduZXIu Y3BwOgooV2ViQ29yZTo6TGF5b3V0OjpzaGlmdFJ1YnlCYXNlQ29udGVudEJ5QWxpZ25tZW50T2Zm c2V0KTogcGFzcyB1cCB0aGUgYWNjdW11bGF0ZWQgb2Zmc2V0IHRvIHRoZSBwYXJlbnQgcnVieS4K KFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29udGVudEFsaWduZXI6OmFwcGx5UnVieUJhc2VBbGln bm1lbnRPZmZzZXQpOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL3J1YnkvUnVieUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKFdlYkNvcmU6OkxheW91dDo6 UnVieUZvcm1hdHRpbmdDb250ZXh0OjphcHBseVJ1YnlBbGlnbk9uQmFzZUNvbnRlbnQpOiBkbyBu b3Qgc2tpcCBuZXN0ZWQgcnVieSBiYXNlcy4KLS0tCiAuLi4vaW5saW5lL0lubGluZUNvbnRlbnRB bGlnbmVyLmNwcCAgICAgICAgICAgICAgICB8IDE0ICsrKysrKysrKystLS0tCiAuLi4vaW5saW5l L3J1YnkvUnVieUZvcm1hdHRpbmdDb250ZXh0LmNwcCAgICAgICAgICB8ICA0ICsrLS0KIDIgZmls ZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVD b250ZW50QWxpZ25lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVDb250ZW50QWxpZ25lci5jcHAKaW5kZXggOWEzNDNkYTYxYjNhLi41 MGE2Y2JjZWZiNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRBbGlnbmVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QWxpZ25l ci5jcHAKQEAgLTk2LDcgKzk2LDcgQEAgc3RydWN0IEJhc2VJbmRleEFuZE9mZnNldCB7CiAgICAg c2l6ZV90IGluZGV4IHsgMCB9OwogICAgIElubGluZUxheW91dFVuaXQgb2Zmc2V0IHsgMC5mIH07 CiB9Owotc3RhdGljIEJhc2VJbmRleEFuZE9mZnNldCBzaGlmdFJ1YnlCYXNlQ29udGVudEJ5QWxp Z25tZW50T2Zmc2V0KEJhc2VJbmRleEFuZE9mZnNldCBiYXNlSW5kZXhBbmRPZmZzZXQsIElubGlu ZURpc3BsYXk6OkJveGVzJiBkaXNwbGF5Qm94ZXMsIGNvbnN0IEhhc2hNYXA8Y29uc3QgQm94Kiwg SW5saW5lTGF5b3V0VW5pdD4mIGFsaWdubWVudE9mZnNldExpc3QsIElubGluZUZvcm1hdHRpbmdD b250ZXh0JiBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCkKK3N0YXRpYyBCYXNlSW5kZXhBbmRPZmZz ZXQgc2hpZnRSdWJ5QmFzZUNvbnRlbnRCeUFsaWdubWVudE9mZnNldChCYXNlSW5kZXhBbmRPZmZz ZXQgYmFzZUluZGV4QW5kT2Zmc2V0LCBJbmxpbmVEaXNwbGF5OjpCb3hlcyYgZGlzcGxheUJveGVz LCBjb25zdCBIYXNoTWFwPGNvbnN0IEJveCosIElubGluZUxheW91dFVuaXQ+JiBhbGlnbm1lbnRP ZmZzZXRMaXN0LCBJbmxpbmVDb250ZW50QWxpZ25lcjo6QWRqdXN0Q29udGVudE9ubHlJbnNpZGVS dWJ5QmFzZSBhZGp1c3RDb250ZW50T25seUluc2lkZVJ1YnlCYXNlLCBJbmxpbmVGb3JtYXR0aW5n Q29udGV4dCYgaW5saW5lRm9ybWF0dGluZ0NvbnRleHQpCiB7CiAgICAgYXV0byBiYXNlSW5kZXgg PSBiYXNlSW5kZXhBbmRPZmZzZXQuaW5kZXg7CiAgICAgaWYgKGJhc2VJbmRleCA+PSBkaXNwbGF5 Qm94ZXMuc2l6ZSgpIHx8ICFkaXNwbGF5Qm94ZXNbYmFzZUluZGV4XS5sYXlvdXRCb3goKS5pc1J1 YnlCYXNlKCkpIHsKQEAgLTEyMSwxMiArMTIxLDE4IEBAIHN0YXRpYyBCYXNlSW5kZXhBbmRPZmZz ZXQgc2hpZnRSdWJ5QmFzZUNvbnRlbnRCeUFsaWdubWVudE9mZnNldChCYXNlSW5kZXhBbmRPZmZz CiAgICAgICAgIGlmICghbGF5b3V0Qm94LmlzUnVieUFubm90YXRpb25Cb3goKSkKICAgICAgICAg ICAgIHNoaWZ0RGlzcGxheUJveChkaXNwbGF5Qm94LCBiYXNlT2Zmc2V0ICsgYmFzZUNvbnRlbnRP ZmZzZXQsIGlubGluZUZvcm1hdHRpbmdDb250ZXh0KTsKICAgICAgICAgaWYgKGxheW91dEJveC5p c1J1YnlCYXNlKCkpIHsKLSAgICAgICAgICAgIGJhc2VDb250ZW50SW5kZXggPSBzaGlmdFJ1YnlC YXNlQ29udGVudEJ5QWxpZ25tZW50T2Zmc2V0KHsgYmFzZUNvbnRlbnRJbmRleCwgYmFzZU9mZnNl dCArIGJhc2VDb250ZW50T2Zmc2V0IH0sIGRpc3BsYXlCb3hlcywgYWxpZ25tZW50T2Zmc2V0TGlz dCwgaW5saW5lRm9ybWF0dGluZ0NvbnRleHQpLmluZGV4OworICAgICAgICAgICAgYXV0byBiYXNl RW5kSW5kZXhBbmRBbGlnbm1lbnQgPSBzaGlmdFJ1YnlCYXNlQ29udGVudEJ5QWxpZ25tZW50T2Zm c2V0KHsgYmFzZUNvbnRlbnRJbmRleCwgYmFzZU9mZnNldCArIGJhc2VDb250ZW50T2Zmc2V0IH0s IGRpc3BsYXlCb3hlcywgYWxpZ25tZW50T2Zmc2V0TGlzdCwgYWRqdXN0Q29udGVudE9ubHlJbnNp ZGVSdWJ5QmFzZSwgaW5saW5lRm9ybWF0dGluZ0NvbnRleHQpOworICAgICAgICAgICAgYmFzZUNv bnRlbnRJbmRleCA9IGJhc2VFbmRJbmRleEFuZEFsaWdubWVudC5pbmRleDsKKyAgICAgICAgICAg IGlmIChhZGp1c3RDb250ZW50T25seUluc2lkZVJ1YnlCYXNlID09IElubGluZUNvbnRlbnRBbGln bmVyOjpBZGp1c3RDb250ZW50T25seUluc2lkZVJ1YnlCYXNlOjpObykKKyAgICAgICAgICAgICAg ICBiYXNlT2Zmc2V0ICs9IGJhc2VFbmRJbmRleEFuZEFsaWdubWVudC5vZmZzZXQ7CiAgICAgICAg ICAgICBjb250aW51ZTsKICAgICAgICAgfQogICAgICAgICArK2Jhc2VDb250ZW50SW5kZXg7CiAg ICAgfQotICAgIHJldHVybiB7IGJhc2VDb250ZW50SW5kZXgsIDIgKiBiYXNlQ29udGVudE9mZnNl dCB9OworICAgIGF1dG8gYWNjdW11bGF0ZWRPZmZzZXQgPSAyICogYmFzZUNvbnRlbnRPZmZzZXQ7 CisgICAgaWYgKGFkanVzdENvbnRlbnRPbmx5SW5zaWRlUnVieUJhc2UgPT0gSW5saW5lQ29udGVu dEFsaWduZXI6OkFkanVzdENvbnRlbnRPbmx5SW5zaWRlUnVieUJhc2U6Ok5vKQorICAgICAgICBh Y2N1bXVsYXRlZE9mZnNldCArPSBiYXNlT2Zmc2V0OworICAgIHJldHVybiB7IGJhc2VDb250ZW50 SW5kZXgsIGFjY3VtdWxhdGVkT2Zmc2V0IH07CiB9CiAKIHN0YXRpYyB2b2lkIGNvbXB1dGVkRXhw YW5zaW9ucyhjb25zdCBMaW5lOjpSdW5MaXN0JiBydW5zLCBXVEY6OlJhbmdlPHNpemVfdD4gcnVu UmFuZ2UsIHNpemVfdCBoYW5naW5nVHJhaWxpbmdXaGl0ZXNwYWNlTGVuZ3RoLCBFeHBhbnNpb25J bmZvJiBleHBhbnNpb25JbmZvKQpAQCAtMjkwLDcgKzI5Niw3IEBAIHZvaWQgSW5saW5lQ29udGVu dEFsaWduZXI6OmFwcGx5UnVieUJhc2VBbGlnbm1lbnRPZmZzZXQoSW5saW5lRGlzcGxheTo6Qm94 ZXMmIGRpCiAgICAgICAgICAgICBzaGlmdERpc3BsYXlCb3goZGlzcGxheUJveCwgY29udGVudE9m ZnNldCwgaW5saW5lRm9ybWF0dGluZ0NvbnRleHQpOwogCiAgICAgICAgIGlmIChkaXNwbGF5Qm94 LmxheW91dEJveCgpLmlzUnVieUJhc2UoKSkgewotICAgICAgICAgICAgYXV0byBiYXNlRW5kSW5k ZXhBbmRBbGlnbm1lbnQgPSBzaGlmdFJ1YnlCYXNlQ29udGVudEJ5QWxpZ25tZW50T2Zmc2V0KHsg aW5kZXgsIGNvbnRlbnRPZmZzZXQgfSwgZGlzcGxheUJveGVzLCBhbGlnbm1lbnRPZmZzZXRMaXN0 LCBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCk7CisgICAgICAgICAgICBhdXRvIGJhc2VFbmRJbmRl eEFuZEFsaWdubWVudCA9IHNoaWZ0UnVieUJhc2VDb250ZW50QnlBbGlnbm1lbnRPZmZzZXQoeyBp bmRleCwgY29udGVudE9mZnNldCB9LCBkaXNwbGF5Qm94ZXMsIGFsaWdubWVudE9mZnNldExpc3Qs IGFkanVzdENvbnRlbnRPbmx5SW5zaWRlUnVieUJhc2UsIGlubGluZUZvcm1hdHRpbmdDb250ZXh0 KTsKICAgICAgICAgICAgIGluZGV4ID0gYmFzZUVuZEluZGV4QW5kQWxpZ25tZW50LmluZGV4Owog ICAgICAgICAgICAgaWYgKGFkanVzdENvbnRlbnRPbmx5SW5zaWRlUnVieUJhc2UgPT0gQWRqdXN0 Q29udGVudE9ubHlJbnNpZGVSdWJ5QmFzZTo6Tm8pCiAgICAgICAgICAgICAgICAgY29udGVudE9m ZnNldCArPSBiYXNlRW5kSW5kZXhBbmRBbGlnbm1lbnQub2Zmc2V0OwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvcnVieS9SdWJ5Rm9y bWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvcnVieS9SdWJ5Rm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDYyYmM5ZjQz ZDVlZS4uZTY3ZDczMDczNmViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvcnVieS9S dWJ5Rm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0yNDgsMTIgKzI0OCwxMiBAQCBzaXplX3QgUnVi eUZvcm1hdHRpbmdDb250ZXh0OjphcHBseVJ1YnlBbGlnbk9uQmFzZUNvbnRlbnQoc2l6ZV90IHJ1 YnlCYXNlU3RhcnQsCiAgICAgfQogICAgIGF1dG8qIGFubm90YXRpb25Cb3ggPSBydWJ5QmFzZUxh eW91dEJveC5hc3NvY2lhdGVkUnVieUFubm90YXRpb25Cb3goKTsKICAgICBpZiAoIWFubm90YXRp b25Cb3gpCi0gICAgICAgIHJldHVybiBydWJ5QmFzZUVuZDsKKyAgICAgICAgcmV0dXJuIHJ1YnlC YXNlU3RhcnQgKyAxOwogCiAgICAgYXV0byBhbm5vdGF0aW9uQm94TG9naWNhbFdpZHRoID0gSW5s aW5lTGF5b3V0VW5pdCB7IGlubGluZUZvcm1hdHRpbmdDb250ZXh0Lmdlb21ldHJ5Rm9yQm94KCph bm5vdGF0aW9uQm94KS5tYXJnaW5Cb3hXaWR0aCgpIH07CiAgICAgYXV0byBiYXNlQ29udGVudExv Z2ljYWxXaWR0aCA9IHJ1bnNbcnVieUJhc2VFbmRdLmxvZ2ljYWxMZWZ0KCkgLSBydW5zW3J1YnlC YXNlU3RhcnRdLmxvZ2ljYWxSaWdodCgpOwogICAgIGlmIChhbm5vdGF0aW9uQm94TG9naWNhbFdp ZHRoIDw9IGJhc2VDb250ZW50TG9naWNhbFdpZHRoKQotICAgICAgICByZXR1cm4gcnVieUJhc2VF bmQ7CisgICAgICAgIHJldHVybiBydWJ5QmFzZVN0YXJ0ICsgMTsKIAogICAgIC8vIEZJWE1FOiBy dWJ5LWFsaWduOiBzcGFjZS1hcm91bmQgb25seQogICAgIGF1dG8gc3BhY2VUb0Rpc3RyaWJ1dGUg PSBhbm5vdGF0aW9uQm94TG9naWNhbFdpZHRoIC0gYmFzZUNvbnRlbnRMb2dpY2FsV2lkdGg7Cg==