235738 2022-01-27 15:08:35 -0800 [JSC] YarrJIT optimization for character BM search 2022-01-28 11:03:19 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1834722 0 ysuzuki 2022-01-27 15:08:35 -0800 [JSC] Optimize one-character BM search case 1834724 1 450185 ysuzuki 2022-01-27 15:09:11 -0800 Created attachment 450185 Patch 1834725 2 450185 ysuzuki 2022-01-27 15:09:48 -0800 Comment on attachment 450185 Patch WIP 1834806 3 450200 ysuzuki 2022-01-27 19:26:51 -0800 Created attachment 450200 Patch 1834882 4 450222 ysuzuki 2022-01-28 04:07:08 -0800 Created attachment 450222 Patch 1835048 5 450222 ysuzuki 2022-01-28 10:35:54 -0800 Comment on attachment 450222 Patch Thanks! 1835070 6 ews-feeder 2022-01-28 11:02:35 -0800 Committed r288748 (246541@main): <https://commits.webkit.org/246541@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 450222. 1835071 7 webkit-bug-importer 2022-01-28 11:03:19 -0800 <rdar://problem/88194690> 450185 2022-01-27 15:09:11 -0800 2022-01-27 19:26:49 -0800 Patch bug-235738-20220127150910.patch text/plain 7447 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4Njg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 NTRlMzc0N2MzMWJjOWVlYTcxMzRmZjEyNTcxZmFjOGQyMmM0NjgyLi4wNjcyYmQxZWQ4MTk5YTUy Y2FjNDkzM2Q0ZWU5NWJjOWVlZjFiNDhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMiBAQAorMjAyMi0wMS0yNyAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIE9wdGltaXplIG9uZS1jaGFyYWN0ZXIgQk0gc2VhcmNoIGNhc2UK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTczOAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogeWFyci9Z YXJySklULmNwcDoKKwogMjAyMi0wMS0yNyAgR2F2aW4gUGhpbGxpcHMgIDxnYXZpbi5wQGFwcGxl LmNvbT4KIAogICAgICAgICBDaGVjayB0aGUgcHJvY2VzcyBoYXMgdGhlIGR5bmFtaWMtY29kZXNp Z25pbmcgZW50aXRsZW1lbnQgYmVmb3JlIHRyeWluZyB0byBhbGxvY2F0ZSBhIGhvbGRpbmcgSklU IHJlZ2lvbgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckpJVC5j cHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUveWFyci9ZYXJySklULmNwcAppbmRleCAzN2FhY2Ex OGU5YzY4MDc0NjU1MWFhNWNmZjUzMTU4YWEwZDg5MzkxLi41NDhlMTQyYjA0MjgzNTRlMzZhOGVk NWE5Mzc4OTRiNjk4MDIxZWNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUveWFy ci9ZYXJySklULmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUveWFyci9ZYXJySklULmNw cApAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDktMjAyMSBBcHBsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDktMjAyMiBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTkgdGhlIFY4 IHByb2plY3QgYXV0aG9ycy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1 dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQK QEAgLTE0NTQsOSArMTQ1NCw3IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgZmluYWwgOiBwdWJsaWMg WWFyckpJVEluZm8gewogCiAgICAgICAgICAgICAvLyBZYXJySklUIGhhbmRsZXMgZGVjb2RlZCBz dXJyb2dhdGUgcGFpciBhcyBvbmUgY2hhcmFjdGVyIGlmIHVuaWNvZGUgZmxhZyBpcyBlbmFibGVk LgogICAgICAgICAgICAgLy8gTm90ZSB0aGF0IHRoZSBudW1iZXJDaGFyYWN0ZXJzIGJlY29tZSAx IHdoaWxlIHRoZSB3aWR0aCBvZiB0aGUgcGF0dGVybiBjaGFyYWN0ZXIgYmVjb21lcyAzMmJpdCBp biB0aGlzIGNhc2UuCi0gICAgICAgICAgICBpZiAobmV4dFRlcm0tPnR5cGUgIT0gUGF0dGVyblRl cm06OlR5cGU6OlBhdHRlcm5DaGFyYWN0ZXIKLSAgICAgICAgICAgICAgICB8fCBuZXh0VGVybS0+ cXVhbnRpdHlUeXBlICE9IFF1YW50aWZpZXJUeXBlOjpGaXhlZENvdW50Ci0gICAgICAgICAgICAg ICAgfHwgbmV4dFRlcm0tPnF1YW50aXR5TWF4Q291bnQgIT0gMQorICAgICAgICAgICAgaWYgKCFp c1NpbXBsZVBhdHRlcm5DaGFyYWN0ZXIobmV4dFRlcm0pCiAgICAgICAgICAgICAgICAgfHwgbmV4 dFRlcm0tPmlucHV0UG9zaXRpb24gIT0gKHN0YXJ0VGVybVBvc2l0aW9uICsgbnVtYmVyQ2hhcmFj dGVycykKICAgICAgICAgICAgICAgICB8fCAoVTE2X0xFTkdUSChuZXh0VGVybS0+cGF0dGVybkNo YXJhY3RlcikgIT0gMSAmJiBtX2RlY29kZVN1cnJvZ2F0ZVBhaXJzKSkKICAgICAgICAgICAgICAg ICBicmVhazsKQEAgLTIyODAsNiArMjI3OCwxMyBAQCBjbGFzcyBZYXJyR2VuZXJhdG9yIGZpbmFs IDogcHVibGljIFlhcnJKSVRJbmZvIHsKICAgICAgICAgfQogICAgIH0KIAorICAgIHN0YXRpYyBi b29sIGlzU2ltcGxlUGF0dGVybkNoYXJhY3Rlcihjb25zdCBQYXR0ZXJuVGVybSogdGVybSkKKyAg ICB7CisgICAgICAgIHJldHVybiB0ZXJtLT50eXBlID09IFBhdHRlcm5UZXJtOjpUeXBlOjpQYXR0 ZXJuQ2hhcmFjdGVyCisgICAgICAgICAgICAmJiB0ZXJtLT5xdWFudGl0eVR5cGUgPT0gUXVhbnRp ZmllclR5cGU6OkZpeGVkQ291bnQKKyAgICAgICAgICAgICYmIHRlcm0tPnF1YW50aXR5TWF4Q291 bnQgPT0gMTsKKyAgICB9CisKICAgICB2b2lkIGdlbmVyYXRlKCkKICAgICB7CiAgICAgICAgIC8v IEZvcndhcmRzIGdlbmVyYXRlIHRoZSBtYXRjaGluZyBjb2RlLgpAQCAtMjM0MSw3ICsyMzQ2LDYg QEAgY2xhc3MgWWFyckdlbmVyYXRvciBmaW5hbCA6IHB1YmxpYyBZYXJySklUSW5mbyB7CiAgICAg ICAgICAgICAgICAgICAgICAgICBhdXRvIFttYXAsIGNoYXJhY3RlcnNGYXN0UGF0aF0gPSBvcC5t X2JtSW5mby0+Y3JlYXRlQ2FuZGlkYXRlQml0bWFwKGJlZ2luSW5kZXgsIGVuZEluZGV4KTsKICAg ICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIG1hcENvdW50ID0gbWFwLmNvdW50KCk7CiAg ICAgICAgICAgICAgICAgICAgICAgICAvLyBJZiBjYW5kaWF0ZSBjaGFyYWN0ZXJzIGFyZSA8PSAy LCBjaGVja2luZyBlYWNoIGlzIGJldHRlciB0aGFuIHVzaW5nIHZlY3Rvci4KLSAgICAgICAgICAg ICAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpKdW1wTGlzdCBvdXRPZkxlbmd0aEZhaWx1cmU7 CiAgICAgICAgICAgICAgICAgICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6SnVtcExpc3QgbWF0Y2hl ZDsKICAgICAgICAgICAgICAgICAgICAgICAgIGRhdGFMb2dMbklmKFlhcnJKSVRJbnRlcm5hbDo6 dmVyYm9zZSwgIkJNIEJpdG1hcCBpcyAiLCBtYXApOwogICAgICAgICAgICAgICAgICAgICAgICAg Ly8gUGF0dGVybnMgbGlrZSAvW10vIGhhdmUgemVybyBjYW5kaWRhdGVzLiBTaW5jZSBpdCBpcyBy YXJlLCB3ZSBkbyBub3QgZG8gbm90aGluZyBmb3Igbm93LgpAQCAtMjM1MSwxMyArMjM1NSwyOCBA QCBjbGFzcyBZYXJyR2VuZXJhdG9yIGZpbmFsIDogcHVibGljIFlhcnJKSVRJbmZvIHsKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBzdGF0aWNfYXNzZXJ0KEJveWVyTW9vcmVGYXN0Q2FuZGlk YXRlczo6bWF4U2l6ZSA9PSAyKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkYXRhTG9n TG5JZihPcHRpb25zOjp2ZXJib3NlUmVnRXhwQ29tcGlsYXRpb24oKSwgIkZvdW5kIGNoYXJhY3Rl cnMgZmFzdHBhdGggbG9va2FoZWFkICIsIGNoYXJhY3RlcnNGYXN0UGF0aCwgIiByYW5nZTpbIiwg YmVnaW5JbmRleCwgIiwgIiwgZW5kSW5kZXgsICIpIik7CiAKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICBpZiAoY2hhcmFjdGVyc0Zhc3RQYXRoLnNpemUoKSA9PSAxKSB7CisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHNpemVfdCBuZXh0T3BJbmRleCA9IG9wSW5kZXggKyAxOwor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAobmV4dE9wSW5kZXggPCBtX29wcy5z aXplKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFlhcnJPcCYgbmV4 dE9wID0gbV9vcHNbbmV4dE9wSW5kZXhdOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgaWYgKG5leHRPcC5tX29wID09IFlhcnJPcENvZGU6OlRlcm0pIHsKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQYXR0ZXJuVGVybSogdGVybSA9IG5leHRPcC5t X3Rlcm07CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGlzU2lt cGxlUGF0dGVybkNoYXJhY3Rlcih0ZXJtKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAmJiB0ZXJtLT5pbnB1dFBvc2l0aW9uID09IGJlZ2luSW5kZXgKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJiYgdGVybS0+cGF0dGVybkNo YXJhY3RlciA9PSBjaGFyYWN0ZXJzRmFzdFBhdGguYXQoMCkpIHsKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZGF0YUxvZ0xuSWYoWWFyckpJVEludGVybmFsOjp2 ZXJib3NlLCAiRGlzYWJsZSBmaXJzdCBQYXR0ZXJuQ2hhcmFjdGVyIHNpbmNlIGl0IGlzIGR1cGUg dG8gQk0gc2VhcmNoIik7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIG5leHRPcC5tX2lzRGVhZENvZGUgPSB0cnVlOworICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0K KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgIH0KKwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGF1dG8gbG9vcEhlYWQgPSBt X2ppdC5sYWJlbCgpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlYWRDaGFyYWN0ZXIo bV9jaGVja2VkT2Zmc2V0IC0gZW5kSW5kZXggKyAxLCBtX3JlZ3MucmVnVDApOwogICAgICAgICAg ICAgICAgICAgICAgICAgICAgIG1hdGNoZWQuYXBwZW5kKG1faml0LmJyYW5jaDMyKE1hY3JvQXNz ZW1ibGVyOjpFcXVhbCwgbV9yZWdzLnJlZ1QwLCBNYWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZEltbTMy KGNoYXJhY3RlcnNGYXN0UGF0aC5hdCgwKSkpKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBpZiAoY2hhcmFjdGVyc0Zhc3RQYXRoLnNpemUoKSA+IDEpCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIG1hdGNoZWQuYXBwZW5kKG1faml0LmJyYW5jaDMyKE1hY3JvQXNzZW1ibGVy OjpFcXVhbCwgbV9yZWdzLnJlZ1QwLCBNYWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZEltbTMyKGNoYXJh Y3RlcnNGYXN0UGF0aC5hdCgxKSkpKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBvdXRP Zkxlbmd0aEZhaWx1cmUuYXBwZW5kKGp1bXBJZk5vQXZhaWxhYmxlSW5wdXQoZW5kSW5kZXggLSBi ZWdpbkluZGV4KSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9qaXQuanVtcCgpLmxp bmtUbyhsb29wSGVhZCwgJm1faml0KTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBqdW1w SWZBdmFpbGFibGVJbnB1dChlbmRJbmRleCAtIGJlZ2luSW5kZXgpLmxpbmtUbyhsb29wSGVhZCwg Jm1faml0KTsKICAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgY29uc3QgYXV0byogcG9pbnRlciA9IGdldEJveWVyTW9vcmVCaXRtYXAo bWFwKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkYXRhTG9nTG5JZihPcHRpb25zOjp2 ZXJib3NlUmVnRXhwQ29tcGlsYXRpb24oKSwgIkZvdW5kIGJpdG1hcCBsb29rYWhlYWQgY291bnQ6 KCIsIG1hcENvdW50LCAiKSxyYW5nZTpbIiwgYmVnaW5JbmRleCwgIiwgIiwgZW5kSW5kZXgsICIp Iik7CkBAIC0yMzkzLDE0ICsyNDEyLDEzIEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgZmluYWwgOiBw dWJsaWMgWWFyckpJVEluZm8gewogICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1faml0LnVy c2hpZnQzMihtX3JlZ3MucmVnVDAsIG1fcmVncy5yZWdUMik7IC8vIFdlIGNhbiBpZ25vcmUgdXBw ZXIgYml0cyBhbmQgb25seSBsb3dlciA1Yml0cyBhcmUgZWZmZWN0aXZlLgogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG1hdGNoZWQuYXBwZW5kKG1faml0LmJyYW5jaFRlc3QzMihNYWNyb0Fz c2VtYmxlcjo6Tm9uWmVybywgbV9yZWdzLnJlZ1QyLCBNYWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZElt bTMyKDEpKSk7CiAjZW5kaWYKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBvdXRPZkxlbmd0 aEZhaWx1cmUuYXBwZW5kKGp1bXBJZk5vQXZhaWxhYmxlSW5wdXQoZW5kSW5kZXggLSBiZWdpbklu ZGV4KSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9qaXQuanVtcCgpLmxpbmtUbyhs b29wSGVhZCwgJm1faml0KTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBqdW1wSWZBdmFp bGFibGVJbnB1dChlbmRJbmRleCAtIGJlZ2luSW5kZXgpLmxpbmtUbyhsb29wSGVhZCwgJm1faml0 KTsKICAgICAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgICAgIC8v IEZhbGx0aHJvdWdoIGlmIG91dC1vZi1sZW5ndGggZmFpbHVyZSBoYXBwZW5zLgogCiAgICAgICAg ICAgICAgICAgICAgICAgICAvLyBJZiB0aGUgcGF0dGVybiBzaXplIGlzIG5vdCBmaXhlZCwgdGhl biBzdG9yZSB0aGUgc3RhcnQgaW5kZXggZm9yIHVzZSBpZiB3ZSBtYXRjaC4KICAgICAgICAgICAg ICAgICAgICAgICAgIC8vIFRoaXMgaXMgdXNlZCBmb3IgYWRqdXN0aW5nIG1hdGNoLXN0YXJ0IHdo ZW4gd2UgZmFpbGVkIHRvIGZpbmQgdGhlIHN0YXJ0IHdpdGggQm95ZXJNb29yZSBzZWFyY2guCiAg ICAgICAgICAgICAgICAgICAgICAgICBpZiAoIW1fcGF0dGVybi5tX2JvZHktPm1faGFzRml4ZWRT aXplKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgb3V0T2ZMZW5ndGhGYWlsdXJlLmxp bmsoJm1faml0KTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoYWx0ZXJuYXRpdmUt Pm1fbWluaW11bVNpemUpIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9qaXQu c3ViMzIobV9yZWdzLmluZGV4LCBNYWNyb0Fzc2VtYmxlcjo6SW1tMzIoYWx0ZXJuYXRpdmUtPm1f bWluaW11bVNpemUpLCBtX3JlZ3MucmVnVDApOwogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBzZXRNYXRjaFN0YXJ0KG1fcmVncy5yZWdUMCk7CkBAIC0yNDA4LDcgKzI0MjYsNyBAQCBj bGFzcyBZYXJyR2VuZXJhdG9yIGZpbmFsIDogcHVibGljIFlhcnJKSVRJbmZvIHsKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc2V0TWF0Y2hTdGFydChtX3JlZ3MuaW5kZXgpOwogICAg ICAgICAgICAgICAgICAgICAgICAgICAgIG9wLm1fanVtcHMuYXBwZW5kKG1faml0Lmp1bXAoKSk7 CiAgICAgICAgICAgICAgICAgICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICBvcC5tX2p1bXBzLmFwcGVuZChvdXRPZkxlbmd0aEZhaWx1cmUpOworICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG9wLm1fanVtcHMuYXBwZW5kKG1faml0Lmp1bXAoKSk7CiAKICAgICAg ICAgICAgICAgICAgICAgICAgIG1hdGNoZWQubGluaygmbV9qaXQpOwogICAgICAgICAgICAgICAg ICAgICAgICAgLy8gSWYgdGhlIHBhdHRlcm4gc2l6ZSBpcyBub3QgZml4ZWQsIHRoZW4gc3RvcmUg dGhlIHN0YXJ0IGluZGV4IGZvciB1c2UgaWYgd2UgbWF0Y2guCg== 450200 2022-01-27 19:26:51 -0800 2022-01-28 04:07:07 -0800 Patch bug-235738-20220127192650.patch text/plain 6943 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4NzA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 NTRlMzc0N2MzMWJjOWVlYTcxMzRmZjEyNTcxZmFjOGQyMmM0NjgyLi5mMTcyMzNmZWRjYzFhNzE0 ZGU0ZjA4NTYwMjIyMDU0ZDIyZWVlNWIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAyMi0wMS0yNyAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIFlhcnJKSVQgb3B0aW1pemF0aW9uIGZvciBjaGFyYWN0ZXIgQk0g c2VhcmNoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MzU3MzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB ZGQgbWljcm8tb3B0aW1pemF0aW9uIG9mIEJNIHNlYXJjaCBwYXRoLiBTaW5jZSBpdCBpcyBzdXBl ciBob3QgcGF0aCwKKyAgICAgICAgdGhpcyBzbWFsbCBpbXByb3ZlbWVudCBvZmZzZXJzIDElIGlu IGpxdWVyeS10b2RvbXZjLXJlZ2V4cCBtaWNyb2JlbmNobWFyay4KKworICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFRvVCAgICAgICAgICAgICAgICAgICAgIFBh dGNoZWQKKworICAgICAgICAgICAganF1ZXJ5LXRvZG9tdmMtcmVnZXhwICAgICAgNDg0LjEzOTkr LTEuMDUyNyAgICAgXiAgICA0NzkuMDkzMistMS4wOTk5ICAgICAgICBeIGRlZmluaXRlbHkgMS4w MTA1eCBmYXN0ZXIKKworICAgICAgICAqIHlhcnIvWWFyckpJVC5jcHA6CisKIDIwMjItMDEtMjcg IEdhdmluIFBoaWxsaXBzICA8Z2F2aW4ucEBhcHBsZS5jb20+CiAKICAgICAgICAgQ2hlY2sgdGhl IHByb2Nlc3MgaGFzIHRoZSBkeW5hbWljLWNvZGVzaWduaW5nIGVudGl0bGVtZW50IGJlZm9yZSB0 cnlpbmcgdG8gYWxsb2NhdGUgYSBob2xkaW5nIEpJVCByZWdpb24KZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS95YXJyL1lhcnJKSVQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L3lhcnIvWWFyckpJVC5jcHAKaW5kZXggMzdhYWNhMThlOWM2ODA3NDY1NTFhYTVjZmY1MzE1OGFh MGQ4OTM5MS4uNDRiMGI5YTUwYzI4NTc3NWM2M2QwYzcyMzNmNWNkY2NkOWJkZTUwMCAxMDA2NDQK LS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckpJVC5jcHAKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckpJVC5jcHAKQEAgLTIzMjYsNiArMjMyNiw3IEBAIGNs YXNzIFlhcnJHZW5lcmF0b3IgZmluYWwgOiBwdWJsaWMgWWFyckpJVEluZm8gewogICAgICAgICAg ICAgICAgIC8vIHRvIHJ1biB0aGUgZmlyc3QgYWx0ZXJuYXRpdmUuIChUaGlzIHByb2dyZXNzZXMg dGhlIGlucHV0IHBvc2l0aW9uKS4KICAgICAgICAgICAgICAgICBvcC5tX2p1bXBzLmFwcGVuZChq dW1wSWZOb0F2YWlsYWJsZUlucHV0KGFsdGVybmF0aXZlLT5tX21pbmltdW1TaXplKSk7CiAgICAg ICAgICAgICAgICAgbV9jaGVja2VkT2Zmc2V0ICs9IGFsdGVybmF0aXZlLT5tX21pbmltdW1TaXpl OworICAgICAgICAgICAgICAgIG1fY2hlY2tlZExlbmd0aEF0UHJvbG9ndWUgPSBtX2NoZWNrZWRP ZmZzZXQudmFsdWUoKTsKIAogICAgICAgICAgICAgICAgIC8vIFdlIHdpbGwgcmVlbnRlciBhZnRl ciB0aGUgY2hlY2ssIGFuZCBhc3N1bWUgdGhlIGlucHV0IHBvc2l0aW9uIHRvIGhhdmUgYmVlbgog ICAgICAgICAgICAgICAgIC8vIHNldCBhcyBhcHByb3ByaWF0ZSB0byB0aGlzIGFsdGVybmF0aXZl LgpAQCAtMjM0MSw3ICsyMzQyLDYgQEAgY2xhc3MgWWFyckdlbmVyYXRvciBmaW5hbCA6IHB1Ymxp YyBZYXJySklUSW5mbyB7CiAgICAgICAgICAgICAgICAgICAgICAgICBhdXRvIFttYXAsIGNoYXJh Y3RlcnNGYXN0UGF0aF0gPSBvcC5tX2JtSW5mby0+Y3JlYXRlQ2FuZGlkYXRlQml0bWFwKGJlZ2lu SW5kZXgsIGVuZEluZGV4KTsKICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIG1hcENv dW50ID0gbWFwLmNvdW50KCk7CiAgICAgICAgICAgICAgICAgICAgICAgICAvLyBJZiBjYW5kaWF0 ZSBjaGFyYWN0ZXJzIGFyZSA8PSAyLCBjaGVja2luZyBlYWNoIGlzIGJldHRlciB0aGFuIHVzaW5n IHZlY3Rvci4KLSAgICAgICAgICAgICAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpKdW1wTGlz dCBvdXRPZkxlbmd0aEZhaWx1cmU7CiAgICAgICAgICAgICAgICAgICAgICAgICBNYWNyb0Fzc2Vt Ymxlcjo6SnVtcExpc3QgbWF0Y2hlZDsKICAgICAgICAgICAgICAgICAgICAgICAgIGRhdGFMb2dM bklmKFlhcnJKSVRJbnRlcm5hbDo6dmVyYm9zZSwgIkJNIEJpdG1hcCBpcyAiLCBtYXApOwogICAg ICAgICAgICAgICAgICAgICAgICAgLy8gUGF0dGVybnMgbGlrZSAvW10vIGhhdmUgemVybyBjYW5k aWRhdGVzLiBTaW5jZSBpdCBpcyByYXJlLCB3ZSBkbyBub3QgZG8gbm90aGluZyBmb3Igbm93LgpA QCAtMjM1Niw4ICsyMzU2LDcgQEAgY2xhc3MgWWFyckdlbmVyYXRvciBmaW5hbCA6IHB1YmxpYyBZ YXJySklUSW5mbyB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbWF0Y2hlZC5hcHBlbmQo bV9qaXQuYnJhbmNoMzIoTWFjcm9Bc3NlbWJsZXI6OkVxdWFsLCBtX3JlZ3MucmVnVDAsIE1hY3Jv QXNzZW1ibGVyOjpUcnVzdGVkSW1tMzIoY2hhcmFjdGVyc0Zhc3RQYXRoLmF0KDApKSkpOwogICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChjaGFyYWN0ZXJzRmFzdFBhdGguc2l6ZSgpID4g MSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbWF0Y2hlZC5hcHBlbmQobV9qaXQu YnJhbmNoMzIoTWFjcm9Bc3NlbWJsZXI6OkVxdWFsLCBtX3JlZ3MucmVnVDAsIE1hY3JvQXNzZW1i bGVyOjpUcnVzdGVkSW1tMzIoY2hhcmFjdGVyc0Zhc3RQYXRoLmF0KDEpKSkpOwotICAgICAgICAg ICAgICAgICAgICAgICAgICAgIG91dE9mTGVuZ3RoRmFpbHVyZS5hcHBlbmQoanVtcElmTm9BdmFp bGFibGVJbnB1dChlbmRJbmRleCAtIGJlZ2luSW5kZXgpKTsKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICBtX2ppdC5qdW1wKCkubGlua1RvKGxvb3BIZWFkLCAmbV9qaXQpOworICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGp1bXBJZkF2YWlsYWJsZUlucHV0KGVuZEluZGV4IC0gYmVnaW5J bmRleCkubGlua1RvKGxvb3BIZWFkLCAmbV9qaXQpOwogICAgICAgICAgICAgICAgICAgICAgICAg fSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBhdXRvKiBwb2ludGVy ID0gZ2V0Qm95ZXJNb29yZUJpdG1hcChtYXApOwogICAgICAgICAgICAgICAgICAgICAgICAgICAg IGRhdGFMb2dMbklmKE9wdGlvbnM6OnZlcmJvc2VSZWdFeHBDb21waWxhdGlvbigpLCAiRm91bmQg Yml0bWFwIGxvb2thaGVhZCBjb3VudDooIiwgbWFwQ291bnQsICIpLHJhbmdlOlsiLCBiZWdpbklu ZGV4LCAiLCAiLCBlbmRJbmRleCwgIikiKTsKQEAgLTIzOTMsMTQgKzIzOTIsMTMgQEAgY2xhc3Mg WWFyckdlbmVyYXRvciBmaW5hbCA6IHB1YmxpYyBZYXJySklUSW5mbyB7CiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgbV9qaXQudXJzaGlmdDMyKG1fcmVncy5yZWdUMCwgbV9yZWdzLnJlZ1Qy KTsgLy8gV2UgY2FuIGlnbm9yZSB1cHBlciBiaXRzIGFuZCBvbmx5IGxvd2VyIDViaXRzIGFyZSBl ZmZlY3RpdmUuCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbWF0Y2hlZC5hcHBlbmQobV9q aXQuYnJhbmNoVGVzdDMyKE1hY3JvQXNzZW1ibGVyOjpOb25aZXJvLCBtX3JlZ3MucmVnVDIsIE1h Y3JvQXNzZW1ibGVyOjpUcnVzdGVkSW1tMzIoMSkpKTsKICNlbmRpZgotICAgICAgICAgICAgICAg ICAgICAgICAgICAgIG91dE9mTGVuZ3RoRmFpbHVyZS5hcHBlbmQoanVtcElmTm9BdmFpbGFibGVJ bnB1dChlbmRJbmRleCAtIGJlZ2luSW5kZXgpKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICBtX2ppdC5qdW1wKCkubGlua1RvKGxvb3BIZWFkLCAmbV9qaXQpOworICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGp1bXBJZkF2YWlsYWJsZUlucHV0KGVuZEluZGV4IC0gYmVnaW5JbmRleCku bGlua1RvKGxvb3BIZWFkLCAmbV9qaXQpOwogICAgICAgICAgICAgICAgICAgICAgICAgfQorICAg ICAgICAgICAgICAgICAgICAgICAgLy8gRmFsbHRocm91Z2ggaWYgb3V0LW9mLWxlbmd0aCBmYWls dXJlIGhhcHBlbnMuCiAKICAgICAgICAgICAgICAgICAgICAgICAgIC8vIElmIHRoZSBwYXR0ZXJu IHNpemUgaXMgbm90IGZpeGVkLCB0aGVuIHN0b3JlIHRoZSBzdGFydCBpbmRleCBmb3IgdXNlIGlm IHdlIG1hdGNoLgogICAgICAgICAgICAgICAgICAgICAgICAgLy8gVGhpcyBpcyB1c2VkIGZvciBh ZGp1c3RpbmcgbWF0Y2gtc3RhcnQgd2hlbiB3ZSBmYWlsZWQgdG8gZmluZCB0aGUgc3RhcnQgd2l0 aCBCb3llck1vb3JlIHNlYXJjaC4KICAgICAgICAgICAgICAgICAgICAgICAgIGlmICghbV9wYXR0 ZXJuLm1fYm9keS0+bV9oYXNGaXhlZFNpemUpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICBvdXRPZkxlbmd0aEZhaWx1cmUubGluaygmbV9qaXQpOwogICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGlmIChhbHRlcm5hdGl2ZS0+bV9taW5pbXVtU2l6ZSkgewogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBtX2ppdC5zdWIzMihtX3JlZ3MuaW5kZXgsIE1hY3JvQXNzZW1ibGVy OjpJbW0zMihhbHRlcm5hdGl2ZS0+bV9taW5pbXVtU2l6ZSksIG1fcmVncy5yZWdUMCk7CiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNldE1hdGNoU3RhcnQobV9yZWdzLnJlZ1QwKTsK QEAgLTI0MDgsNyArMjQwNiw3IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgZmluYWwgOiBwdWJsaWMg WWFyckpJVEluZm8gewogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZXRNYXRjaFN0 YXJ0KG1fcmVncy5pbmRleCk7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3AubV9qdW1w cy5hcHBlbmQobV9qaXQuanVtcCgpKTsKICAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzZQot ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9wLm1fanVtcHMuYXBwZW5kKG91dE9mTGVuZ3Ro RmFpbHVyZSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3AubV9qdW1wcy5hcHBlbmQo bV9qaXQuanVtcCgpKTsKIAogICAgICAgICAgICAgICAgICAgICAgICAgbWF0Y2hlZC5saW5rKCZt X2ppdCk7CiAgICAgICAgICAgICAgICAgICAgICAgICAvLyBJZiB0aGUgcGF0dGVybiBzaXplIGlz IG5vdCBmaXhlZCwgdGhlbiBzdG9yZSB0aGUgc3RhcnQgaW5kZXggZm9yIHVzZSBpZiB3ZSBtYXRj aC4KQEAgLTI0NzgsNiArMjQ3Niw3IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgZmluYWwgOiBwdWJs aWMgWWFyckpJVEluZm8gewogICAgICAgICAgICAgICAgIGlmIChvcC5tX29wID09IFlhcnJPcENv ZGU6OkJvZHlBbHRlcm5hdGl2ZU5leHQpCiAgICAgICAgICAgICAgICAgICAgIG1fY2hlY2tlZE9m ZnNldCArPSBhbHRlcm5hdGl2ZS0+bV9taW5pbXVtU2l6ZTsKICAgICAgICAgICAgICAgICBtX2No ZWNrZWRPZmZzZXQgLT0gcHJpb3JBbHRlcm5hdGl2ZS0+bV9taW5pbXVtU2l6ZTsKKyAgICAgICAg ICAgICAgICBtX2NoZWNrZWRMZW5ndGhBdFByb2xvZ3VlID0gMDsKICAgICAgICAgICAgICAgICBi cmVhazsKICAgICAgICAgICAgIH0KIApAQCAtMjU1NCw4ICsyNTUzLDEwIEBAIGNsYXNzIFlhcnJH ZW5lcmF0b3IgZmluYWwgOiBwdWJsaWMgWWFyckpJVEluZm8gewogICAgICAgICAgICAgICAgIG9w Lm1fY2hlY2tBZGp1c3QgPSBhbHRlcm5hdGl2ZS0+bV9taW5pbXVtU2l6ZTsKICAgICAgICAgICAg ICAgICBpZiAoKHRlcm0tPnF1YW50aXR5VHlwZSA9PSBRdWFudGlmaWVyVHlwZTo6Rml4ZWRDb3Vu dCkgJiYgKHRlcm0tPnR5cGUgIT0gUGF0dGVyblRlcm06OlR5cGU6OlBhcmVudGhldGljYWxBc3Nl cnRpb24pKQogICAgICAgICAgICAgICAgICAgICBvcC5tX2NoZWNrQWRqdXN0IC09IGRpc2p1bmN0 aW9uLT5tX21pbmltdW1TaXplOwotICAgICAgICAgICAgICAgIGlmIChvcC5tX2NoZWNrQWRqdXN0 KQorICAgICAgICAgICAgICAgIGlmIChvcC5tX2NoZWNrQWRqdXN0KSB7CisgICAgICAgICAgICAg ICAgICAgIGRhdGFMb2dMbigiQWRqdXN0ICIsIG9wLm1fY2hlY2tBZGp1c3QudmFsdWUoKSwgIiAi LCBtX2NoZWNrZWRMZW5ndGhBdFByb2xvZ3VlLCAiICIsIHRlcm0tPmlucHV0UG9zaXRpb24pOwog ICAgICAgICAgICAgICAgICAgICBvcC5tX2p1bXBzLmFwcGVuZChqdW1wSWZOb0F2YWlsYWJsZUlu cHV0KG9wLm1fY2hlY2tBZGp1c3QpKTsKKyAgICAgICAgICAgICAgICB9CiAKICAgICAgICAgICAg ICAgICBZYXJyT3AmIGxhc3RPcCA9IG1fb3BzW29wLm1fcHJldmlvdXNPcF07CiAgICAgICAgICAg ICAgICAgbV9jaGVja2VkT2Zmc2V0IC09IGxhc3RPcC5tX2NoZWNrQWRqdXN0OwpAQCAtNDY5NSw2 ICs0Njk2LDcgQEAgY2xhc3MgWWFyckdlbmVyYXRvciBmaW5hbCA6IHB1YmxpYyBZYXJySklUSW5m byB7CiAgICAgLy8gY29kZSBnZW5lcmF0aW9uLCB3ZSBzaG91bGQgZ2F0aGVyIHRoaXMgaW5mb3Jt YXRpb24gdXAgZnJvbnQgJiBzdG9yZSBpdAogICAgIC8vIG9uIHRoZSBZYXJyT3Agc3RydWN0dXJl LgogICAgIENoZWNrZWQ8dW5zaWduZWQ+IG1fY2hlY2tlZE9mZnNldDsKKyAgICB1bnNpZ25lZCBt X2NoZWNrZWRMZW5ndGhBdFByb2xvZ3VlIHsgMCB9OwogCiAgICAgLy8gVGhpcyBjbGFzcyByZWNv cmRzIHN0YXRlIHdoaWxzdCBnZW5lcmF0aW5nIHRoZSBiYWNrdHJhY2tpbmcgcGF0aCBvZiBjb2Rl LgogICAgIEJhY2t0cmFja2luZ1N0YXRlIG1fYmFja3RyYWNraW5nU3RhdGU7Cg== 450222 2022-01-28 04:07:08 -0800 2022-01-28 11:02:38 -0800 Patch bug-235738-20220128040708.patch text/plain 4879 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4NzA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 NTRlMzc0N2MzMWJjOWVlYTcxMzRmZjEyNTcxZmFjOGQyMmM0NjgyLi5iMWRmMWM4ZDY4ODI3ZThh MDMwNjQxZjFlOWJiMDIzNzZmOGFjM2E2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAyMi0wMS0yOCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIFlhcnJKSVQgb3B0aW1pemF0aW9uIGZvciBjaGFyYWN0ZXIgQk0g c2VhcmNoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MzU3MzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB ZGQgbWljcm8tb3B0aW1pemF0aW9uIG9mIEJNIHNlYXJjaCBwYXRoLiBTaW5jZSBpdCBpcyBzdXBl ciBob3QgcGF0aCwKKyAgICAgICAgdGhpcyBzbWFsbCBpbXByb3ZlbWVudCBvZmZzZXJzIDElIGlu IGpxdWVyeS10b2RvbXZjLXJlZ2V4cCBtaWNyb2JlbmNobWFyay4KKworICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFRvVCAgICAgICAgICAgICAgICAgICAgIFBh dGNoZWQKKworICAgICAgICAgICAganF1ZXJ5LXRvZG9tdmMtcmVnZXhwICAgICAgNDg0LjEzOTkr LTEuMDUyNyAgICAgXiAgICA0NzkuMDkzMistMS4wOTk5ICAgICAgICBeIGRlZmluaXRlbHkgMS4w MTA1eCBmYXN0ZXIKKworICAgICAgICAqIHlhcnIvWWFyckpJVC5jcHA6CisKIDIwMjItMDEtMjcg IEdhdmluIFBoaWxsaXBzICA8Z2F2aW4ucEBhcHBsZS5jb20+CiAKICAgICAgICAgQ2hlY2sgdGhl IHByb2Nlc3MgaGFzIHRoZSBkeW5hbWljLWNvZGVzaWduaW5nIGVudGl0bGVtZW50IGJlZm9yZSB0 cnlpbmcgdG8gYWxsb2NhdGUgYSBob2xkaW5nIEpJVCByZWdpb24KZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS95YXJyL1lhcnJKSVQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L3lhcnIvWWFyckpJVC5jcHAKaW5kZXggMzdhYWNhMThlOWM2ODA3NDY1NTFhYTVjZmY1MzE1OGFh MGQ4OTM5MS4uZWExYTdiMDE0NTU1YzE4M2M5YmJhNmUxZTdmNTgxMWM0YTVjZWFiZSAxMDA2NDQK LS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckpJVC5jcHAKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckpJVC5jcHAKQEAgLTIzNDEsNyArMjM0MSw2IEBAIGNs YXNzIFlhcnJHZW5lcmF0b3IgZmluYWwgOiBwdWJsaWMgWWFyckpJVEluZm8gewogICAgICAgICAg ICAgICAgICAgICAgICAgYXV0byBbbWFwLCBjaGFyYWN0ZXJzRmFzdFBhdGhdID0gb3AubV9ibUlu Zm8tPmNyZWF0ZUNhbmRpZGF0ZUJpdG1hcChiZWdpbkluZGV4LCBlbmRJbmRleCk7CiAgICAgICAg ICAgICAgICAgICAgICAgICB1bnNpZ25lZCBtYXBDb3VudCA9IG1hcC5jb3VudCgpOwogICAgICAg ICAgICAgICAgICAgICAgICAgLy8gSWYgY2FuZGlhdGUgY2hhcmFjdGVycyBhcmUgPD0gMiwgY2hl Y2tpbmcgZWFjaCBpcyBiZXR0ZXIgdGhhbiB1c2luZyB2ZWN0b3IuCi0gICAgICAgICAgICAgICAg ICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6SnVtcExpc3Qgb3V0T2ZMZW5ndGhGYWlsdXJlOwogICAg ICAgICAgICAgICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6Okp1bXBMaXN0IG1hdGNoZWQ7CiAg ICAgICAgICAgICAgICAgICAgICAgICBkYXRhTG9nTG5JZihZYXJySklUSW50ZXJuYWw6OnZlcmJv c2UsICJCTSBCaXRtYXAgaXMgIiwgbWFwKTsKICAgICAgICAgICAgICAgICAgICAgICAgIC8vIFBh dHRlcm5zIGxpa2UgL1tdLyBoYXZlIHplcm8gY2FuZGlkYXRlcy4gU2luY2UgaXQgaXMgcmFyZSwg d2UgZG8gbm90IGRvIG5vdGhpbmcgZm9yIG5vdy4KQEAgLTIzNTYsOCArMjM1NSw3IEBAIGNsYXNz IFlhcnJHZW5lcmF0b3IgZmluYWwgOiBwdWJsaWMgWWFyckpJVEluZm8gewogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG1hdGNoZWQuYXBwZW5kKG1faml0LmJyYW5jaDMyKE1hY3JvQXNzZW1i bGVyOjpFcXVhbCwgbV9yZWdzLnJlZ1QwLCBNYWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZEltbTMyKGNo YXJhY3RlcnNGYXN0UGF0aC5hdCgwKSkpKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBp ZiAoY2hhcmFjdGVyc0Zhc3RQYXRoLnNpemUoKSA+IDEpCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIG1hdGNoZWQuYXBwZW5kKG1faml0LmJyYW5jaDMyKE1hY3JvQXNzZW1ibGVyOjpF cXVhbCwgbV9yZWdzLnJlZ1QwLCBNYWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZEltbTMyKGNoYXJhY3Rl cnNGYXN0UGF0aC5hdCgxKSkpKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBvdXRPZkxl bmd0aEZhaWx1cmUuYXBwZW5kKGp1bXBJZk5vQXZhaWxhYmxlSW5wdXQoZW5kSW5kZXggLSBiZWdp bkluZGV4KSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9qaXQuanVtcCgpLmxpbmtU byhsb29wSGVhZCwgJm1faml0KTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBqdW1wSWZB dmFpbGFibGVJbnB1dChlbmRJbmRleCAtIGJlZ2luSW5kZXgpLmxpbmtUbyhsb29wSGVhZCwgJm1f aml0KTsKICAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY29uc3QgYXV0byogcG9pbnRlciA9IGdldEJveWVyTW9vcmVCaXRtYXAobWFw KTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkYXRhTG9nTG5JZihPcHRpb25zOjp2ZXJi b3NlUmVnRXhwQ29tcGlsYXRpb24oKSwgIkZvdW5kIGJpdG1hcCBsb29rYWhlYWQgY291bnQ6KCIs IG1hcENvdW50LCAiKSxyYW5nZTpbIiwgYmVnaW5JbmRleCwgIiwgIiwgZW5kSW5kZXgsICIpIik7 CkBAIC0yMzkzLDE0ICsyMzkxLDEzIEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgZmluYWwgOiBwdWJs aWMgWWFyckpJVEluZm8gewogICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1faml0LnVyc2hp ZnQzMihtX3JlZ3MucmVnVDAsIG1fcmVncy5yZWdUMik7IC8vIFdlIGNhbiBpZ25vcmUgdXBwZXIg Yml0cyBhbmQgb25seSBsb3dlciA1Yml0cyBhcmUgZWZmZWN0aXZlLgogICAgICAgICAgICAgICAg ICAgICAgICAgICAgIG1hdGNoZWQuYXBwZW5kKG1faml0LmJyYW5jaFRlc3QzMihNYWNyb0Fzc2Vt Ymxlcjo6Tm9uWmVybywgbV9yZWdzLnJlZ1QyLCBNYWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZEltbTMy KDEpKSk7CiAjZW5kaWYKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBvdXRPZkxlbmd0aEZh aWx1cmUuYXBwZW5kKGp1bXBJZk5vQXZhaWxhYmxlSW5wdXQoZW5kSW5kZXggLSBiZWdpbkluZGV4 KSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9qaXQuanVtcCgpLmxpbmtUbyhsb29w SGVhZCwgJm1faml0KTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBqdW1wSWZBdmFpbGFi bGVJbnB1dChlbmRJbmRleCAtIGJlZ2luSW5kZXgpLmxpbmtUbyhsb29wSGVhZCwgJm1faml0KTsK ICAgICAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgICAgIC8vIEZh bGx0aHJvdWdoIGlmIG91dC1vZi1sZW5ndGggZmFpbHVyZSBoYXBwZW5zLgogCiAgICAgICAgICAg ICAgICAgICAgICAgICAvLyBJZiB0aGUgcGF0dGVybiBzaXplIGlzIG5vdCBmaXhlZCwgdGhlbiBz dG9yZSB0aGUgc3RhcnQgaW5kZXggZm9yIHVzZSBpZiB3ZSBtYXRjaC4KICAgICAgICAgICAgICAg ICAgICAgICAgIC8vIFRoaXMgaXMgdXNlZCBmb3IgYWRqdXN0aW5nIG1hdGNoLXN0YXJ0IHdoZW4g d2UgZmFpbGVkIHRvIGZpbmQgdGhlIHN0YXJ0IHdpdGggQm95ZXJNb29yZSBzZWFyY2guCiAgICAg ICAgICAgICAgICAgICAgICAgICBpZiAoIW1fcGF0dGVybi5tX2JvZHktPm1faGFzRml4ZWRTaXpl KSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgb3V0T2ZMZW5ndGhGYWlsdXJlLmxpbmso Jm1faml0KTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoYWx0ZXJuYXRpdmUtPm1f bWluaW11bVNpemUpIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9qaXQuc3Vi MzIobV9yZWdzLmluZGV4LCBNYWNyb0Fzc2VtYmxlcjo6SW1tMzIoYWx0ZXJuYXRpdmUtPm1fbWlu aW11bVNpemUpLCBtX3JlZ3MucmVnVDApOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBzZXRNYXRjaFN0YXJ0KG1fcmVncy5yZWdUMCk7CkBAIC0yNDA4LDcgKzI0MDUsNyBAQCBjbGFz cyBZYXJyR2VuZXJhdG9yIGZpbmFsIDogcHVibGljIFlhcnJKSVRJbmZvIHsKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgc2V0TWF0Y2hTdGFydChtX3JlZ3MuaW5kZXgpOwogICAgICAg ICAgICAgICAgICAgICAgICAgICAgIG9wLm1fanVtcHMuYXBwZW5kKG1faml0Lmp1bXAoKSk7CiAg ICAgICAgICAgICAgICAgICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICBvcC5tX2p1bXBzLmFwcGVuZChvdXRPZkxlbmd0aEZhaWx1cmUpOworICAgICAgICAgICAgICAg ICAgICAgICAgICAgIG9wLm1fanVtcHMuYXBwZW5kKG1faml0Lmp1bXAoKSk7CiAKICAgICAgICAg ICAgICAgICAgICAgICAgIG1hdGNoZWQubGluaygmbV9qaXQpOwogICAgICAgICAgICAgICAgICAg ICAgICAgLy8gSWYgdGhlIHBhdHRlcm4gc2l6ZSBpcyBub3QgZml4ZWQsIHRoZW4gc3RvcmUgdGhl IHN0YXJ0IGluZGV4IGZvciB1c2UgaWYgd2UgbWF0Y2guCg==