226093 2021-05-21 10:19:13 -0700 Replace more static Locks with CheckedLocks in WebKit / WebKitLegacy 2021-05-21 13:13:20 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=226040 InRadar P2 Normal --- 1 cdumez cdumez achristensen darin ddkilzer ggaren kkinnunen sam webkit-bug-importer oldest_to_newest 1762469 0 cdumez 2021-05-21 10:19:13 -0700 Replace more static Locks with CheckedLocks in WebKit / WebKitLegacy. 1762470 1 429307 cdumez 2021-05-21 10:20:20 -0700 Created attachment 429307 Patch 1762542 2 ews-feeder 2021-05-21 13:12:58 -0700 Committed r277877 (238015@main): <https://commits.webkit.org/238015@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 429307. 1762543 3 webkit-bug-importer 2021-05-21 13:13:20 -0700 <rdar://problem/78324535> 429307 2021-05-21 10:20:20 -0700 2021-05-21 13:12:59 -0700 Patch bug-226093-20210521102019.patch text/plain 14008 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3ODY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGZlMWM3NmI5ZGIxYjk3ZTg0 MDMzODMxOTQ1MTIyZGM3OWY5MGVjYzMuLmRiODE1ODA4NGFlYmFkOWI2NzQyOTdhNzk4ODAzNmUw ZDBkMjJiOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjEtMDUtMjAgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZXBsYWNlIG1vcmUgc3RhdGljIExv Y2tzIHdpdGggQ2hlY2tlZExvY2tzIGluIFdlYktpdCAvIFdlYktpdExlZ2FjeQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2MDkzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZSBtb3JlIHN0YXRp YyBMb2NrcyB3aXRoIENoZWNrZWRMb2NrcyBzbyB0aGF0IHdlIGNhbiBiZW5lZml0IGZyb20gQ2xh bmcgVGhyZWFkIFNhZmV0eSBBbmFseXNpcy4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0Ns YXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpyZXNvdXJjZUxvYWRTdGF0aXN0 aWNzVXBkYXRlZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZTo6c3VzcGVuZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZTo6cmVzdW1lKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oOgorICAgICAgICAqIFBsYXRmb3JtL0lQQy9D b25uZWN0aW9uLmNwcDoKKyAgICAgICAgKElQQzo6V1RGX1JFUVVJUkVTX0xPQ0spOgorICAgICAg ICAoSVBDOjphZGRBc3luY1JlcGx5SGFuZGxlcik6CisgICAgICAgIChJUEM6OmNsZWFyQXN5bmNS ZXBseUhhbmRsZXJzKToKKyAgICAgICAgKElQQzo6Q29tcGxldGlvbkhhbmRsZXI8dm9pZCk6Cisg ICAgICAgICogV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlNvY2tldFN0cmVhbS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYlNvY2tldFN0cmVhbTo6c3RyZWFtV2l0aElkZW50aWZpZXIpOgorICAgICAg ICAoV2ViS2l0OjpXZWJTb2NrZXRTdHJlYW06Om5ldHdvcmtQcm9jZXNzQ3Jhc2hlZCk6CisgICAg ICAgIChXZWJLaXQ6OldlYlNvY2tldFN0cmVhbTo6V2ViU29ja2V0U3RyZWFtKToKKyAgICAgICAg KFdlYktpdDo6V2ViU29ja2V0U3RyZWFtOjp+V2ViU29ja2V0U3RyZWFtKToKKwogMjAyMS0wNS0y MSAgQWRyaWFuIFBlcmV6IGRlIENhc3RybyAgPGFwZXJlekBpZ2FsaWEuY29tPgogCiAgICAgICAg IE5vbi11bmlmaWVkIGJ1aWxkIGZpeGVzLCBsYXRlLWlzaCBNYXkgMjAyMSBlZGl0aW9uCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 TGVnYWN5L21hYy9DaGFuZ2VMb2cKaW5kZXggYzM5MzhmYTdkZjIyZjM4ZGQ0MzZkMmE3ZGQyYzVh YzBmNTAyNDgxYy4uN2M3YzkzYjczNDBhZTdkYzY1ZjNmZGE4OWJjODhlZmVjNjU2NGI5MCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA1LTIwICBD aHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVwbGFjZSBtb3JlIHN0 YXRpYyBMb2NrcyB3aXRoIENoZWNrZWRMb2NrcyBpbiBXZWJLaXQgLyBXZWJLaXRMZWdhY3kKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjA5MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlcGxhY2UgbW9y ZSBzdGF0aWMgTG9ja3Mgd2l0aCBDaGVja2VkTG9ja3Mgc28gdGhhdCB3ZSBjYW4gYmVuZWZpdCBm cm9tIENsYW5nIFRocmVhZCBTYWZldHkgQW5hbHlzaXMuCisKKyAgICAgICAgKiBET00vRE9NSW50 ZXJuYWwubW06CisgICAgICAgIChnZXRET01XcmFwcGVyKToKKyAgICAgICAgKGFkZERPTVdyYXBw ZXIpOgorICAgICAgICAocmVtb3ZlRE9NV3JhcHBlcik6CisKIDIwMjEtMDUtMjAgIEFsZXhleSBT aHZheWthICA8c2h2YWlrYWxlc2hAZ21haWwuY29tPgogCiAgICAgICAgIFtXZWJJRExdIFJlbW92 ZSBbSW1wbGljaXRUaGlzXSBhbmQgW0N1c3RvbVByb3h5VG9KU09iamVjdF0gZXh0ZW5kZWQgYXR0 cmlidXRlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lm aWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNw cAppbmRleCA1ZWYyYjZlYzA5NmI0ZmUwYTBmYTM1MDdiM2MyNzExNDA3M2RmYWRiLi5lNDNjZTQy MmJjMWMyZWIzMTk2NTdiMmY5MWRkYWRhYmU1ZjljZWM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvV2Vi UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcApAQCAtNjAsOCArNjAsOCBAQCBuYW1lc3Bh Y2UgV2ViS2l0IHsKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBXZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzU3RvcmU6OlN0YXRlIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c3Vz cGVuZGVkU3RhdGUgeyBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OlN0YXRlOjpSdW5u aW5nIH07Ci1Mb2NrIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c3VzcGVuZGVkU3Rh dGVMb2NrOwotQ29uZGl0aW9uIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c3VzcGVu ZGVkU3RhdGVDaGFuZ2VDb25kaXRpb247CitDaGVja2VkTG9jayBXZWJSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzU3RvcmU6OnN1c3BlbmRlZFN0YXRlTG9jazsKK0NoZWNrZWRDb25kaXRpb24gV2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzdXNwZW5kZWRTdGF0ZUNoYW5nZUNvbmRpdGlvbjsK IAogY29uc3QgT3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4mIFdlYlJlc291cmNlTG9hZFN0YXRp c3RpY3NTdG9yZTo6bW9uaXRvcmVkRGF0YVR5cGVzKCkKIHsKQEAgLTM0OSw3ICszNDksMTMgQEAg dm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnJlc291cmNlTG9hZFN0YXRpc3Rp Y3NVcGRhdGVkKFZlY3RvcjxSZXNvdXIKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQog Ci0gICAgICAgIEFTU0VSVChzdXNwZW5kZWRTdGF0ZSAhPSBTdGF0ZTo6U3VzcGVuZGVkKTsKKyNp ZiBBU1NFUlRfRU5BQkxFRAorICAgICAgICB7CisgICAgICAgICAgICBMb2NrZXIgc3RhdGVMb2Nr ZXIgeyBzdXNwZW5kZWRTdGF0ZUxvY2sgfTsKKyAgICAgICAgICAgIEFTU0VSVChzdXNwZW5kZWRT dGF0ZSAhPSBTdGF0ZTo6U3VzcGVuZGVkKTsKKyAgICAgICAgfQorI2VuZGlmCisKICAgICAgICAg bV9zdGF0aXN0aWNzU3RvcmUtPm1lcmdlU3RhdGlzdGljcyhXVEZNb3ZlKHN0YXRpc3RpY3MpKTsK ICAgICAgICAgcG9zdFRhc2tSZXBseShXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CiAgICAg ICAgIC8vIFdlIGNhbiBjYW5jZWwgYW55IHBlbmRpbmcgcmVxdWVzdCB0byBwcm9jZXNzIHN0YXRp c3RpY3Mgc2luY2Ugd2UncmUgZG9pbmcgaXQgc3luY2hyb25vdXNseSBiZWxvdy4KQEAgLTE0NDQs NyArMTQ1MCw3IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjphZ2dyZWdh dGVkVGhpcmRQYXJ0eURhdGEoQ29tcGxldGlvbkhhbmRsZXI8CiB2b2lkIFdlYlJlc291cmNlTG9h ZFN0YXRpc3RpY3NTdG9yZTo6c3VzcGVuZChDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29t cGxldGlvbkhhbmRsZXIpCiB7CiAgICAgQ29tcGxldGlvbkhhbmRsZXJDYWxsaW5nU2NvcGUgY29t cGxldGlvbkhhbmRsZXJDYWxsZXIoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwotICAgIExv Y2tlcjxMb2NrPiBzdGF0ZUxvY2tlcihzdXNwZW5kZWRTdGF0ZUxvY2spOworICAgIExvY2tlciBz dGF0ZUxvY2tlciB7IHN1c3BlbmRlZFN0YXRlTG9jayB9OwogICAgIGlmIChzdXNwZW5kZWRTdGF0 ZSAhPSBTdGF0ZTo6UnVubmluZykKICAgICAgICAgcmV0dXJuOwogICAgIHN1c3BlbmRlZFN0YXRl ID0gU3RhdGU6OldpbGxTdXNwZW5kOwpAQCAtMTQ1NCw3ICsxNDYwLDcgQEAgdm9pZCBXZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnN1c3BlbmQoQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgp PiYmIGNvbXBsZXQKICAgICAgICAgZm9yIChhdXRvJiBkYXRhYmFzZVN0b3JlIDogUmVzb3VyY2VM b2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmU6OmFsbFN0b3JlcygpKQogICAgICAgICAgICAgZGF0 YWJhc2VTdG9yZS0+aW50ZXJydXB0KCk7CiAgICAgICAgIAotICAgICAgICBMb2NrZXI8TG9jaz4g c3RhdGVMb2NrZXIoc3VzcGVuZGVkU3RhdGVMb2NrKTsKKyAgICAgICAgTG9ja2VyIHN0YXRlTG9j a2VyIHsgc3VzcGVuZGVkU3RhdGVMb2NrIH07CiAgICAgICAgIEFTU0VSVChzdXNwZW5kZWRTdGF0 ZSAhPSBTdGF0ZTo6U3VzcGVuZGVkKTsKIAogICAgICAgICBpZiAoc3VzcGVuZGVkU3RhdGUgIT0g U3RhdGU6OldpbGxTdXNwZW5kKSB7CkBAIC0xNDczLDcgKzE0NzksNyBAQCB2b2lkIFdlYlJlc291 cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c3VzcGVuZChDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+ JiYgY29tcGxldAogCiB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVzdW1l KCkKIHsKLSAgICBMb2NrZXI8TG9jaz4gc3RhdGVMb2NrZXIoc3VzcGVuZGVkU3RhdGVMb2NrKTsK KyAgICBMb2NrZXIgc3RhdGVMb2NrZXIgeyBzdXNwZW5kZWRTdGF0ZUxvY2sgfTsKICAgICBhdXRv IHByZXZpb3VzU3RhdGUgPSBzdXNwZW5kZWRTdGF0ZTsKICAgICBzdXNwZW5kZWRTdGF0ZSA9IFN0 YXRlOjpSdW5uaW5nOwogICAgIGlmIChwcmV2aW91c1N0YXRlID09IFN0YXRlOjpTdXNwZW5kZWQp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvV2Vi UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKaW5kZXggMWZh M2JlMzg0N2ZmODA0YzI2NzAzMTg5NGIyMTIzMWQ2ZmU3MDRjNi4uOTYzZWE0NzNkMzI4ODk3NjY1 YWYyZTg5OTk3ZWJjZDJhYjZiNWQyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oCisrKyBi L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzU3RvcmUuaApAQCAtNDAsNiArNDAsOCBAQAogI2luY2x1ZGUgPFdlYkNvcmUvUHJp dmF0ZUNsaWNrTWVhc3VyZW1lbnQuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1JlZ2lzdHJhYmxlRG9t YWluLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9SZXNvdXJjZUxvYWRPYnNlcnZlci5oPgorI2luY2x1 ZGUgPHd0Zi9DaGVja2VkQ29uZGl0aW9uLmg+CisjaW5jbHVkZSA8d3RmL0NoZWNrZWRMb2NrLmg+ CiAjaW5jbHVkZSA8d3RmL0NvbXBsZXRpb25IYW5kbGVyLmg+CiAjaW5jbHVkZSA8d3RmL1J1bkxv b3AuaD4KICNpbmNsdWRlIDx3dGYvVGhyZWFkU2FmZVJlZkNvdW50ZWQuaD4KQEAgLTM2MSw5ICsz NjMsOSBAQCBwcml2YXRlOgogICAgICAgICBXaWxsU3VzcGVuZCwKICAgICAgICAgU3VzcGVuZGVk CiAgICAgfTsKLSAgICBzdGF0aWMgU3RhdGUgc3VzcGVuZGVkU3RhdGU7Ci0gICAgc3RhdGljIExv Y2sgc3VzcGVuZGVkU3RhdGVMb2NrOwotICAgIHN0YXRpYyBDb25kaXRpb24gc3VzcGVuZGVkU3Rh dGVDaGFuZ2VDb25kaXRpb247CisgICAgc3RhdGljIENoZWNrZWRMb2NrIHN1c3BlbmRlZFN0YXRl TG9jazsKKyAgICBzdGF0aWMgU3RhdGUgc3VzcGVuZGVkU3RhdGUgV1RGX0dVQVJERURfQllfTE9D SyhzdXNwZW5kZWRTdGF0ZUxvY2spOworICAgIHN0YXRpYyBDaGVja2VkQ29uZGl0aW9uIHN1c3Bl bmRlZFN0YXRlQ2hhbmdlQ29uZGl0aW9uOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9Db25uZWN0aW9uLmNwcCBiL1Nv dXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0Nvbm5lY3Rpb24uY3BwCmluZGV4IDRhMjY3MTJlNmI2 YTMxYWQwYjEwMmU3ZGM4ZTg4OTVmYWE2ZWNmZTUuLjEwYTc0MzI4NmUwNmMxMzMxOTA5NTdhNjlh MDIwODNiNTQ1NDA0YzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0Nv bm5lY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0Nvbm5lY3Rpb24u Y3BwCkBAIC0yNzQsMTUgKzI3NCwxMCBAQCBzdGF0aWMgSGFzaE1hcDxJUEM6OkNvbm5lY3Rpb246 OlVuaXF1ZUlELCBDb25uZWN0aW9uKj4mIGFsbENvbm5lY3Rpb25zKCkKICAgICByZXR1cm4gbWFw OwogfQogCi1zdGF0aWMgTG9jayYgYXN5bmNSZXBseUhhbmRsZXJNYXBMb2NrKCkKK3N0YXRpYyBD aGVja2VkTG9jayBhc3luY1JlcGx5SGFuZGxlck1hcExvY2s7CitzdGF0aWMgSGFzaE1hcDx1aW50 cHRyX3QsIEhhc2hNYXA8dWludDY0X3QsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoRGVjb2Rlciop Pj4+JiBhc3luY1JlcGx5SGFuZGxlck1hcCgpIFdURl9SRVFVSVJFU19MT0NLKGFzeW5jUmVwbHlI YW5kbGVyTWFwTG9jaykKIHsKLSAgICBzdGF0aWMgTG9jayBsb2NrOwotICAgIHJldHVybiBsb2Nr OwotfQotCi1zdGF0aWMgSGFzaE1hcDx1aW50cHRyX3QsIEhhc2hNYXA8dWludDY0X3QsIENvbXBs ZXRpb25IYW5kbGVyPHZvaWQoRGVjb2RlciopPj4+JiBhc3luY1JlcGx5SGFuZGxlck1hcChjb25z dCBMb2NrSG9sZGVyJikKLXsKLSAgICBBU1NFUlQoYXN5bmNSZXBseUhhbmRsZXJNYXBMb2NrKCku aXNIZWxkKCkpOworICAgIEFTU0VSVChhc3luY1JlcGx5SGFuZGxlck1hcExvY2suaXNIZWxkKCkp OwogICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxIYXNoTWFwPHVpbnRwdHJfdCwgSGFzaE1hcDx1 aW50NjRfdCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChEZWNvZGVyKik+Pj4+IG1hcDsKICAgICBy ZXR1cm4gbWFwLmdldCgpOwogfQpAQCAtMTIxOSw4ICsxMjE0LDggQEAgdWludDY0X3QgbmV4dEFz eW5jUmVwbHlIYW5kbGVySUQoKQogCiB2b2lkIGFkZEFzeW5jUmVwbHlIYW5kbGVyKENvbm5lY3Rp b24mIGNvbm5lY3Rpb24sIHVpbnQ2NF90IGlkZW50aWZpZXIsIENvbXBsZXRpb25IYW5kbGVyPHZv aWQoRGVjb2RlciopPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIExvY2tIb2xkZXIgbG9j a2VyKGFzeW5jUmVwbHlIYW5kbGVyTWFwTG9jaygpKTsKLSAgICBhdXRvIHJlc3VsdCA9IGFzeW5j UmVwbHlIYW5kbGVyTWFwKGxvY2tlcikuZW5zdXJlKHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90 PigmY29ubmVjdGlvbiksIFtdIHsKKyAgICBMb2NrZXIgbG9ja2VyIHsgYXN5bmNSZXBseUhhbmRs ZXJNYXBMb2NrIH07CisgICAgYXV0byByZXN1bHQgPSBhc3luY1JlcGx5SGFuZGxlck1hcCgpLmVu c3VyZShyZWludGVycHJldF9jYXN0PHVpbnRwdHJfdD4oJmNvbm5lY3Rpb24pLCBbXSB7CiAgICAg ICAgIHJldHVybiBIYXNoTWFwPHVpbnQ2NF90LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKERlY29k ZXIqKT4+KCk7CiAgICAgfSkuaXRlcmF0b3ItPnZhbHVlLmFkZChpZGVudGlmaWVyLCBXVEZNb3Zl KGNvbXBsZXRpb25IYW5kbGVyKSk7CiAgICAgQVNTRVJUX1VOVVNFRChyZXN1bHQsIHJlc3VsdC5p c05ld0VudHJ5KTsKQEAgLTEyMzAsOCArMTIyNSw4IEBAIHZvaWQgY2xlYXJBc3luY1JlcGx5SGFu ZGxlcnMoY29uc3QgQ29ubmVjdGlvbiYgY29ubmVjdGlvbikKIHsKICAgICBIYXNoTWFwPHVpbnQ2 NF90LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKERlY29kZXIqKT4+IG1hcDsKICAgICB7Ci0gICAg ICAgIExvY2tIb2xkZXIgbG9ja2VyKGFzeW5jUmVwbHlIYW5kbGVyTWFwTG9jaygpKTsKLSAgICAg ICAgbWFwID0gYXN5bmNSZXBseUhhbmRsZXJNYXAobG9ja2VyKS50YWtlKHJlaW50ZXJwcmV0X2Nh c3Q8dWludHB0cl90PigmY29ubmVjdGlvbikpOworICAgICAgICBMb2NrZXIgbG9ja2VyIHsgYXN5 bmNSZXBseUhhbmRsZXJNYXBMb2NrIH07CisgICAgICAgIG1hcCA9IGFzeW5jUmVwbHlIYW5kbGVy TWFwKCkudGFrZShyZWludGVycHJldF9jYXN0PHVpbnRwdHJfdD4oJmNvbm5lY3Rpb24pKTsKICAg ICB9CiAKICAgICBmb3IgKGF1dG8mIGhhbmRsZXIgOiBtYXAudmFsdWVzKCkpIHsKQEAgLTEyNDIs OCArMTIzNyw4IEBAIHZvaWQgY2xlYXJBc3luY1JlcGx5SGFuZGxlcnMoY29uc3QgQ29ubmVjdGlv biYgY29ubmVjdGlvbikKIAogQ29tcGxldGlvbkhhbmRsZXI8dm9pZChEZWNvZGVyKik+IHRha2VB c3luY1JlcGx5SGFuZGxlcihDb25uZWN0aW9uJiBjb25uZWN0aW9uLCB1aW50NjRfdCBpZGVudGlm aWVyKQogewotICAgIExvY2tIb2xkZXIgbG9ja2VyKGFzeW5jUmVwbHlIYW5kbGVyTWFwTG9jaygp KTsKLSAgICBhdXRvJiBtYXAgPSBhc3luY1JlcGx5SGFuZGxlck1hcChsb2NrZXIpOworICAgIExv Y2tlciBsb2NrZXIgeyBhc3luY1JlcGx5SGFuZGxlck1hcExvY2sgfTsKKyAgICBhdXRvJiBtYXAg PSBhc3luY1JlcGx5SGFuZGxlck1hcCgpOwogICAgIGF1dG8gaXRlcmF0b3IgPSBtYXAuZmluZChy ZWludGVycHJldF9jYXN0PHVpbnRwdHJfdD4oJmNvbm5lY3Rpb24pKTsKICAgICBpZiAoaXRlcmF0 b3IgIT0gbWFwLmVuZCgpKSB7CiAgICAgICAgIGlmICghaXRlcmF0b3ItPnZhbHVlLmlzVmFsaWRL ZXkoaWRlbnRpZmllcikpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9O ZXR3b3JrL1dlYlNvY2tldFN0cmVhbS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0 d29yay9XZWJTb2NrZXRTdHJlYW0uY3BwCmluZGV4IDdkMDA3MzY5YjljY2U4NWI4ZjA1NDU3ZDY2 NmQxZTQ0NTFiOTZjNTIuLjZmZGVkM2I5YzM3YWRkZDE1MTJhOWQ4ZGE0M2MxZmM2ZWNlNGE5MGMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlNvY2tldFN0 cmVhbS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2ViU29ja2V0 U3RyZWFtLmNwcApAQCAtMzQsMTMgKzM0LDE0IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9Db29raWVS ZXF1ZXN0SGVhZGVyRmllbGRQcm94eS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvU29ja2V0U3RyZWFt RXJyb3IuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1NvY2tldFN0cmVhbUhhbmRsZUNsaWVudC5oPgor I2luY2x1ZGUgPHd0Zi9DaGVja2VkTG9jay5oPgogI2luY2x1ZGUgPHd0Zi9OZXZlckRlc3Ryb3ll ZC5oPgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCi1z dGF0aWMgTG9jayBnbG9iYWxXZWJTb2NrZXRTdHJlYW1NYXBMb2NrOwotc3RhdGljIEhhc2hNYXA8 V2ViU29ja2V0SWRlbnRpZmllciwgV2ViU29ja2V0U3RyZWFtKj4mIGdsb2JhbFdlYlNvY2tldFN0 cmVhbU1hcCgpCitzdGF0aWMgQ2hlY2tlZExvY2sgZ2xvYmFsV2ViU29ja2V0U3RyZWFtTWFwTG9j azsKK3N0YXRpYyBIYXNoTWFwPFdlYlNvY2tldElkZW50aWZpZXIsIFdlYlNvY2tldFN0cmVhbSo+ JiBnbG9iYWxXZWJTb2NrZXRTdHJlYW1NYXAoKSBXVEZfUkVRVUlSRVNfTE9DSyhnbG9iYWxXZWJT b2NrZXRTdHJlYW1NYXBMb2NrKQogewogICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxIYXNoTWFw PFdlYlNvY2tldElkZW50aWZpZXIsIFdlYlNvY2tldFN0cmVhbSo+PiBnbG9iYWxNYXA7CiAgICAg cmV0dXJuIGdsb2JhbE1hcDsKQEAgLTQ4LDcgKzQ5LDcgQEAgc3RhdGljIEhhc2hNYXA8V2ViU29j a2V0SWRlbnRpZmllciwgV2ViU29ja2V0U3RyZWFtKj4mIGdsb2JhbFdlYlNvY2tldFN0cmVhbU1h cCgKIAogV2ViU29ja2V0U3RyZWFtKiBXZWJTb2NrZXRTdHJlYW06OnN0cmVhbVdpdGhJZGVudGlm aWVyKFdlYlNvY2tldElkZW50aWZpZXIgaWRlbnRpZmllcikKIHsKLSAgICBMb2NrSG9sZGVyIGxv Y2tlcihnbG9iYWxXZWJTb2NrZXRTdHJlYW1NYXBMb2NrKTsKKyAgICBMb2NrZXIgc3RhdGVMb2Nr ZXIgeyBnbG9iYWxXZWJTb2NrZXRTdHJlYW1NYXBMb2NrIH07CiAgICAgcmV0dXJuIGdsb2JhbFdl YlNvY2tldFN0cmVhbU1hcCgpLmdldChpZGVudGlmaWVyKTsKIH0KIApAQCAtNTYsNyArNTcsNyBA QCB2b2lkIFdlYlNvY2tldFN0cmVhbTo6bmV0d29ya1Byb2Nlc3NDcmFzaGVkKCkKIHsKICAgICBW ZWN0b3I8UmVmUHRyPFdlYlNvY2tldFN0cmVhbT4+IHNvY2tldHM7CiAgICAgewotICAgICAgICBM b2NrSG9sZGVyIGxvY2tlcihnbG9iYWxXZWJTb2NrZXRTdHJlYW1NYXBMb2NrKTsKKyAgICAgICAg TG9ja2VyIHN0YXRlTG9ja2VyIHsgZ2xvYmFsV2ViU29ja2V0U3RyZWFtTWFwTG9jayB9OwogICAg ICAgICBzb2NrZXRzLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkoZ2xvYmFsV2ViU29ja2V0U3RyZWFt TWFwKCkuc2l6ZSgpKTsKICAgICAgICAgZm9yIChhdXRvJiBzdHJlYW0gOiBnbG9iYWxXZWJTb2Nr ZXRTdHJlYW1NYXAoKS52YWx1ZXMoKSkKICAgICAgICAgICAgIHNvY2tldHMudW5jaGVja2VkQXBw ZW5kKHN0cmVhbSk7CkBAIC03MSw3ICs3Miw3IEBAIHZvaWQgV2ViU29ja2V0U3RyZWFtOjpuZXR3 b3JrUHJvY2Vzc0NyYXNoZWQoKQogICAgICAgICBzdHJlYW0gPSBudWxscHRyOwogICAgIH0KIAot ICAgIExvY2tIb2xkZXIgbG9ja2VyKGdsb2JhbFdlYlNvY2tldFN0cmVhbU1hcExvY2spOworICAg IExvY2tlciBzdGF0ZUxvY2tlciB7IGdsb2JhbFdlYlNvY2tldFN0cmVhbU1hcExvY2sgfTsKICAg ICBnbG9iYWxXZWJTb2NrZXRTdHJlYW1NYXAoKS5jbGVhcigpOwogfQogCkBAIC04NywxNCArODgs MTQgQEAgV2ViU29ja2V0U3RyZWFtOjpXZWJTb2NrZXRTdHJlYW0oY29uc3QgVVJMJiB1cmwsIFdl YkNvcmU6OlNvY2tldFN0cmVhbUhhbmRsZUNsaWUKIHsKICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0 b24oKS5lbnN1cmVOZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24oKS5jb25uZWN0aW9uKCkuc2VuZChN ZXNzYWdlczo6TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OkNyZWF0ZVNvY2tldFN0cmVh bSh1cmwsIGNhY2hlUGFydGl0aW9uLCBtX2lkZW50aWZpZXIpLCAwKTsKIAotICAgIExvY2tIb2xk ZXIgbG9ja2VyKGdsb2JhbFdlYlNvY2tldFN0cmVhbU1hcExvY2spOworICAgIExvY2tlciBzdGF0 ZUxvY2tlciB7IGdsb2JhbFdlYlNvY2tldFN0cmVhbU1hcExvY2sgfTsKICAgICBBU1NFUlQoIWds b2JhbFdlYlNvY2tldFN0cmVhbU1hcCgpLmNvbnRhaW5zKG1faWRlbnRpZmllcikpOwogICAgIGds b2JhbFdlYlNvY2tldFN0cmVhbU1hcCgpLnNldChtX2lkZW50aWZpZXIsIHRoaXMpOwogfQogCiBX ZWJTb2NrZXRTdHJlYW06On5XZWJTb2NrZXRTdHJlYW0oKQogewotICAgIExvY2tIb2xkZXIgbG9j a2VyKGdsb2JhbFdlYlNvY2tldFN0cmVhbU1hcExvY2spOworICAgIExvY2tlciBzdGF0ZUxvY2tl ciB7IGdsb2JhbFdlYlNvY2tldFN0cmVhbU1hcExvY2sgfTsKICAgICBBU1NFUlQoZ2xvYmFsV2Vi U29ja2V0U3RyZWFtTWFwKCkuY29udGFpbnMobV9pZGVudGlmaWVyKSk7CiAgICAgZ2xvYmFsV2Vi U29ja2V0U3RyZWFtTWFwKCkucmVtb3ZlKG1faWRlbnRpZmllcik7CiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0TGVnYWN5L21hYy9ET00vRE9NSW50ZXJuYWwubW0gYi9Tb3VyY2UvV2ViS2l0 TGVnYWN5L21hYy9ET00vRE9NSW50ZXJuYWwubW0KaW5kZXggM2E3MDZjNGE4ZDQ5YzFmYzQ3Zjg4 OTRmYWM1YjQyNWZjNzc0OGY1Ni4uZDMzYTU3YjYzMzE0ODFiMWNjZTE2MWQxNTk1NmZiMGY4MmFl NmQxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvRE9NL0RPTUludGVybmFs Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0RPTS9ET01JbnRlcm5hbC5tbQpAQCAt MzIsOCArMzIsOCBAQAogI2ltcG9ydCA8V2ViQ29yZS9TY3JpcHRDb250cm9sbGVyLmg+CiAjaW1w b3J0IDxXZWJDb3JlL1dlYlNjcmlwdE9iamVjdFByaXZhdGUuaD4KICNpbXBvcnQgPFdlYkNvcmUv cnVudGltZV9yb290Lmg+CisjaW1wb3J0IDx3dGYvQ2hlY2tlZExvY2suaD4KICNpbXBvcnQgPHd0 Zi9IYXNoTWFwLmg+Ci0jaW1wb3J0IDx3dGYvTG9jay5oPgogI2ltcG9ydCA8d3RmL05ldmVyRGVz dHJveWVkLmg+CiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQpAQCAtNDQsMTAgKzQ0LDExIEBA CiAvLyBXcmFwcGluZyBXZWJDb3JlIGltcGxlbWVudGF0aW9uIG9iamVjdHMKIAogI2lmZGVmIE5F RURTX1dSQVBQRVJfQ0FDSEVfTE9DSwotc3RhdGljIExvY2sgd3JhcHBlckNhY2hlTG9jazsKLSNl bmRpZgotCitzdGF0aWMgQ2hlY2tlZExvY2sgd3JhcHBlckNhY2hlTG9jazsKK3N0YXRpYyBIYXNo TWFwPERPTU9iamVjdEludGVybmFsKiwgTlNPYmplY3QgKj4mIHdyYXBwZXJDYWNoZSgpIFdURl9S RVFVSVJFU19MT0NLKHdyYXBwZXJDYWNoZUxvY2spCisjZWxzZQogc3RhdGljIEhhc2hNYXA8RE9N T2JqZWN0SW50ZXJuYWwqLCBOU09iamVjdCAqPiYgd3JhcHBlckNhY2hlKCkKKyNlbmRpZgogewog ICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxIYXNoTWFwPERPTU9iamVjdEludGVybmFsKiwgTlNP YmplY3QgKj4+IG1hcDsKICAgICByZXR1cm4gbWFwOwpAQCAtNTYsNyArNTcsNyBAQCBzdGF0aWMg SGFzaE1hcDxET01PYmplY3RJbnRlcm5hbCosIE5TT2JqZWN0ICo+JiB3cmFwcGVyQ2FjaGUoKQog TlNPYmplY3QqIGdldERPTVdyYXBwZXIoRE9NT2JqZWN0SW50ZXJuYWwqIGltcGwpCiB7CiAjaWZk ZWYgTkVFRFNfV1JBUFBFUl9DQUNIRV9MT0NLCi0gICAgYXV0byBsb2NrZXIgPSBob2xkTG9jayh3 cmFwcGVyQ2FjaGVMb2NrKTsKKyAgICBMb2NrZXIgc3RhdGVMb2NrZXIgeyB3cmFwcGVyQ2FjaGVM b2NrIH07CiAjZW5kaWYKICAgICByZXR1cm4gd3JhcHBlckNhY2hlKCkuZ2V0KGltcGwpOwogfQpA QCAtNjQsNyArNjUsNyBAQCBOU09iamVjdCogZ2V0RE9NV3JhcHBlcihET01PYmplY3RJbnRlcm5h bCogaW1wbCkKIHZvaWQgYWRkRE9NV3JhcHBlcihOU09iamVjdCogd3JhcHBlciwgRE9NT2JqZWN0 SW50ZXJuYWwqIGltcGwpCiB7CiAjaWZkZWYgTkVFRFNfV1JBUFBFUl9DQUNIRV9MT0NLCi0gICAg YXV0byBsb2NrZXIgPSBob2xkTG9jayh3cmFwcGVyQ2FjaGVMb2NrKTsKKyAgICBMb2NrZXIgc3Rh dGVMb2NrZXIgeyB3cmFwcGVyQ2FjaGVMb2NrIH07CiAjZW5kaWYKICAgICB3cmFwcGVyQ2FjaGUo KS5zZXQoaW1wbCwgd3JhcHBlcik7CiB9CkBAIC03Miw3ICs3Myw3IEBAIHZvaWQgYWRkRE9NV3Jh cHBlcihOU09iamVjdCogd3JhcHBlciwgRE9NT2JqZWN0SW50ZXJuYWwqIGltcGwpCiB2b2lkIHJl bW92ZURPTVdyYXBwZXIoRE9NT2JqZWN0SW50ZXJuYWwqIGltcGwpCiB7CiAjaWZkZWYgTkVFRFNf V1JBUFBFUl9DQUNIRV9MT0NLCi0gICAgYXV0byBsb2NrZXIgPSBob2xkTG9jayh3cmFwcGVyQ2Fj aGVMb2NrKTsKKyAgICBMb2NrZXIgc3RhdGVMb2NrZXIgeyB3cmFwcGVyQ2FjaGVMb2NrIH07CiAj ZW5kaWYKICAgICB3cmFwcGVyQ2FjaGUoKS5yZW1vdmUoaW1wbCk7CiB9Cg==