226092 2021-05-21 10:16:49 -0700 Replace more static Locks with CheckedLocks in WTF 2021-05-21 10:57:23 -0700 1 1 1 Unclassified WebKit Web Template Framework WebKit Nightly Build Unspecified Unspecified RESOLVED DUPLICATE 226040 https://bugs.webkit.org/show_bug.cgi?id=226040 P2 Normal --- 1 cdumez cdumez benjamin cmarcelo ews-watchlist oldest_to_newest 1762466 0 cdumez 2021-05-21 10:16:49 -0700 Replace more static Locks with CheckedLocks in WTF. 1762468 1 429306 cdumez 2021-05-21 10:17:43 -0700 Created attachment 429306 Patch 1762480 2 cdumez 2021-05-21 10:49:04 -0700 *** This bug has been marked as a duplicate of bug 226040 *** 429306 2021-05-21 10:17:43 -0700 2021-05-21 10:57:23 -0700 Patch bug-226092-20210521101742.patch text/plain 14289 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3ODY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDIwMjFhZTU5YzdkMzE3MmQ0OTYzOWEw OTZmYTU0NGY0NDZhODY1YmYuLmY0MTA3MjI5M2E3ZTZiYjIyZGJiZTM5MmJjNWUzZDA2ODVlZjU1 YmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMzQgQEAKKzIwMjEtMDUtMjAgIENocmlzIER1bWV6ICA8Y2R1bWV6 QGFwcGxlLmNvbT4KKworICAgICAgICBSZXBsYWNlIG1vcmUgc3RhdGljIExvY2tzIHdpdGggQ2hl Y2tlZExvY2tzIGluIFdURgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjI2MDkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgUmVwbGFjZSBtb3JlIHN0YXRpYyBMb2NrcyB3aXRoIENoZWNrZWRMb2NrcyBzbyB0 aGF0IHdlIGNhbiBiZW5lZml0IGZyb20gQ2xhbmcgVGhyZWFkIFNhZmV0eSBBbmFseXNpcy4KKwor ICAgICAgICAqIHd0Zi9UaHJlYWRpbmcuY3BwOgorICAgICAgICAoV1RGOjpUaHJlYWQ6OmFsbFRo cmVhZHNMb2NrKToKKyAgICAgICAgKFdURjo6VGhyZWFkOjpjcmVhdGUpOgorICAgICAgICAoV1RG OjpUaHJlYWQ6OmRpZEV4aXQpOgorICAgICAgICAqIHd0Zi9UaHJlYWRpbmcuaDoKKyAgICAgICAg KiB3dGYvVVJMLmNwcDoKKyAgICAgICAgKFdURjo6V1RGX1JFUVVJUkVTX0xPQ0spOgorICAgICAg ICAoV1RGOjpyZWdpc3RlckRlZmF1bHRQb3J0Rm9yUHJvdG9jb2xGb3JUZXN0aW5nKToKKyAgICAg ICAgKFdURjo6Y2xlYXJEZWZhdWx0UG9ydEZvclByb3RvY29sTWFwRm9yVGVzdGluZyk6CisgICAg ICAgIChXVEY6OmRlZmF1bHRQb3J0Rm9yUHJvdG9jb2wpOgorICAgICAgICAqIHd0Zi9jZi9MYW5n dWFnZUNGLmNwcDoKKyAgICAgICAgKFdURjo6V1RGX1JFUVVJUkVTX0xPQ0spOgorICAgICAgICAo V1RGOjpwbGF0Zm9ybUxhbmd1YWdlRGlkQ2hhbmdlKToKKyAgICAgICAgKFdURjo6cGxhdGZvcm1V c2VyUHJlZmVycmVkTGFuZ3VhZ2VzKToKKyAgICAgICAgKiB3dGYvdGV4dC9TdHJpbmdWaWV3LmNw cDoKKyAgICAgICAgKFdURjo6U3RyaW5nVmlldzo6aW52YWxpZGF0ZSk6CisgICAgICAgIChXVEY6 OlN0cmluZ1ZpZXc6OmFkb3B0VW5kZXJseWluZ1N0cmluZyk6CisgICAgICAgIChXVEY6OlN0cmlu Z1ZpZXc6OnNldFVuZGVybHlpbmdTdHJpbmcpOgorICAgICAgICAqIHd0Zi91bmljb2RlL2ljdS9D b2xsYXRvcklDVS5jcHA6CisgICAgICAgIChXVEY6OkNvbGxhdG9yOjpDb2xsYXRvcik6CisgICAg ICAgIChXVEY6OkNvbGxhdG9yOjp+Q29sbGF0b3IpOgorCiAyMDIxLTA1LTIwICBDaHJpcyBEdW1l eiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgVXNlIENoZWNrZWRMb2NrIG1vcmUgaW4g V1RGCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9UaHJlYWRpbmcuY3BwIGIvU291cmNlL1dU Ri93dGYvVGhyZWFkaW5nLmNwcAppbmRleCBmZjE2NzkwMmZjN2M0MGE0NTQ2NDUzMDMyMTkzMWZj YTNjNzM5NWQ2Li41NzBiNzhiNDliMzA5ZmY0OGFkODkwYWQxNTM0YzhjMjc1YzI5YjhjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9UaHJlYWRpbmcuY3BwCisrKyBiL1NvdXJjZS9XVEYvd3Rm L1RocmVhZGluZy5jcHAKQEAgLTQxLDYgKzQxLDggQEAKIAogbmFtZXNwYWNlIFdURiB7CiAKK0No ZWNrZWRMb2NrIFRocmVhZDo6c19hbGxUaHJlYWRzTG9jazsKKwogc3RhdGljIE9wdGlvbmFsPHNp emVfdD4gc3RhY2tTaXplKFRocmVhZFR5cGUgdGhyZWFkVHlwZSkKIHsKICAgICAvLyBSZXR1cm4g dGhlIHN0YWNrIHNpemUgZm9yIHRoZSBjcmVhdGVkIHRocmVhZCBiYXNlZCBvbiBpdHMgdHlwZS4K QEAgLTkxLDcgKzkzLDcgQEAgcHVibGljOgogI2VuZGlmCiB9OwogCi1IYXNoU2V0PFRocmVhZCo+ JiBUaHJlYWQ6OmFsbFRocmVhZHMoY29uc3QgTG9ja0hvbGRlciYpCitIYXNoU2V0PFRocmVhZCo+ JiBUaHJlYWQ6OmFsbFRocmVhZHMoKQogewogICAgIHN0YXRpYyBMYXp5TmV2ZXJEZXN0cm95ZWQ8 SGFzaFNldDxUaHJlYWQqPj4gYWxsVGhyZWFkczsKICAgICBzdGF0aWMgc3RkOjpvbmNlX2ZsYWcg b25jZUtleTsKQEAgLTEwMSwxMCArMTAzLDkgQEAgSGFzaFNldDxUaHJlYWQqPiYgVGhyZWFkOjph bGxUaHJlYWRzKGNvbnN0IExvY2tIb2xkZXImKQogICAgIHJldHVybiBhbGxUaHJlYWRzOwogfQog Ci1Mb2NrJiBUaHJlYWQ6OmFsbFRocmVhZHNNdXRleCgpCitDaGVja2VkTG9jayYgVGhyZWFkOjph bGxUaHJlYWRzTG9jaygpCiB7Ci0gICAgc3RhdGljIExvY2sgbXV0ZXg7Ci0gICAgcmV0dXJuIG11 dGV4OworICAgIHJldHVybiBzX2FsbFRocmVhZHNMb2NrOwogfQogCiBjb25zdCBjaGFyKiBUaHJl YWQ6Om5vcm1hbGl6ZVRocmVhZE5hbWUoY29uc3QgY2hhciogdGhyZWFkTmFtZSkKQEAgLTIxOCw5 ICsyMTksOSBAQCBSZWY8VGhyZWFkPiBUaHJlYWQ6OmNyZWF0ZShjb25zdCBjaGFyKiBuYW1lLCBG dW5jdGlvbjx2b2lkKCk+JiYgZW50cnlQb2ludCwgVGhyZQogICAgIC8vIGNhbGxlZCBUaHJlYWQ6 OmRpZEV4aXQgdG8gdW5yZWdpc3RlciBpdHNlbGYgZnJvbSBhbGxUaHJlYWRzLiBSZWdpc3Rlcmlu ZyBzdWNoIGEgdGhyZWFkIHdpbGwgcmVnaXN0ZXIgYSBzdGFsZSB0aHJlYWQgcG9pbnRlciB0byBh bGxUaHJlYWRzLCB3aGljaCB3aWxsIG5vdCBiZSByZW1vdmVkCiAgICAgLy8gZXZlbiBhZnRlciBU aHJlYWQgaXMgZGVzdHJveWVkLiBSZWdpc3RlciBhIHRocmVhZCBvbmx5IHdoZW4gaXQgaGFzIG5v dCB1bnJlZ2lzdGVyZWQgaXRzZWxmIGZyb20gYWxsVGhyZWFkcyB5ZXQuCiAgICAgewotICAgICAg ICBhdXRvIGxvY2tlciA9IGhvbGRMb2NrKGFsbFRocmVhZHNNdXRleCgpKTsKKyAgICAgICAgTG9j a2VyIGxvY2tlciB7IGFsbFRocmVhZHNMb2NrKCkgfTsKICAgICAgICAgaWYgKCF0aHJlYWQtPm1f ZGlkVW5yZWdpc3RlckZyb21BbGxUaHJlYWRzKQotICAgICAgICAgICAgYWxsVGhyZWFkcyhsb2Nr ZXIpLmFkZCh0aHJlYWQucHRyKCkpOworICAgICAgICAgICAgYWxsVGhyZWFkcygpLmFkZCh0aHJl YWQucHRyKCkpOwogICAgIH0KIAogICAgIEFTU0VSVCghdGhyZWFkLT5zdGFjaygpLmlzRW1wdHko KSk7CkBAIC0yNDQsOCArMjQ1LDggQEAgc3RhdGljIGJvb2wgc2hvdWxkUmVtb3ZlVGhyZWFkRnJv bVRocmVhZEdyb3VwKCkKIHZvaWQgVGhyZWFkOjpkaWRFeGl0KCkKIHsKICAgICB7Ci0gICAgICAg IGF1dG8gbG9ja2VyID0gaG9sZExvY2soYWxsVGhyZWFkc011dGV4KCkpOwotICAgICAgICBhbGxU aHJlYWRzKGxvY2tlcikucmVtb3ZlKHRoaXMpOworICAgICAgICBMb2NrZXIgbG9ja2VyIHsgYWxs VGhyZWFkc0xvY2soKSB9OworICAgICAgICBhbGxUaHJlYWRzKCkucmVtb3ZlKHRoaXMpOwogICAg ICAgICBtX2RpZFVucmVnaXN0ZXJGcm9tQWxsVGhyZWFkcyA9IHRydWU7CiAgICAgfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9UaHJlYWRpbmcuaCBiL1NvdXJjZS9XVEYvd3RmL1RocmVh ZGluZy5oCmluZGV4IDk0OTVkNmMxYjA4YWE0ZGNmYzUwZGQxMzBlYTMzZjEzNjQyYmM5OTYuLmM0 MmUzMDRmMzJiYjRmNzgyYjY4MjIxMjFkMzA1YjY5OWExMzJmNDMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XVEYvd3RmL1RocmVhZGluZy5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL1RocmVhZGluZy5oCkBA IC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSA8bXV0ZXg+CiAjaW5jbHVkZSA8c3RkaW50Lmg+CiAj aW5jbHVkZSA8d3RmL0F0b21pY3MuaD4KKyNpbmNsdWRlIDx3dGYvQ2hlY2tlZExvY2suaD4KICNp bmNsdWRlIDx3dGYvRXhwZWN0ZWQuaD4KICNpbmNsdWRlIDx3dGYvRmFzdFRMUy5oPgogI2luY2x1 ZGUgPHd0Zi9GdW5jdGlvbi5oPgpAQCAtMTE2LDggKzExNyw4IEBAIHB1YmxpYzoKICAgICBzdGF0 aWMgVGhyZWFkJiBjdXJyZW50KCk7CiAKICAgICAvLyBTZXQgb2YgYWxsIFdURjo6VGhyZWFkIGNy ZWF0ZWQgdGhyZWFkcy4KLSAgICBXVEZfRVhQT1JUX1BSSVZBVEUgc3RhdGljIEhhc2hTZXQ8VGhy ZWFkKj4mIGFsbFRocmVhZHMoY29uc3QgTG9ja0hvbGRlciYpOwotICAgIFdURl9FWFBPUlRfUFJJ VkFURSBzdGF0aWMgTG9jayYgYWxsVGhyZWFkc011dGV4KCk7CisgICAgV1RGX0VYUE9SVF9QUklW QVRFIHN0YXRpYyBIYXNoU2V0PFRocmVhZCo+JiBhbGxUaHJlYWRzKCkgV1RGX1JFUVVJUkVTX0xP Q0soYWxsVGhyZWFkc0xvY2soKSk7CisgICAgV1RGX0VYUE9SVF9QUklWQVRFIHN0YXRpYyBDaGVj a2VkTG9jayYgYWxsVGhyZWFkc0xvY2soKSBXVEZfUkVUVVJOU19MT0NLKHNfYWxsVGhyZWFkc0xv Y2spOwogCiAgICAgV1RGX0VYUE9SVF9QUklWQVRFIHVuc2lnbmVkIG51bWJlck9mVGhyZWFkR3Jv dXBzKCk7CiAKQEAgLTMyOCw2ICszMjksOCBAQCBwcm90ZWN0ZWQ6CiAgICAgc3RhdGljIFRocmVh ZCogY3VycmVudE1heUJlTnVsbCgpOwogI2VuZGlmCiAKKyAgICBzdGF0aWMgQ2hlY2tlZExvY2sg c19hbGxUaHJlYWRzTG9jazsKKwogICAgIEpvaW5hYmxlU3RhdGUgbV9qb2luYWJsZVN0YXRlIHsg Sm9pbmFibGUgfTsKICAgICBib29sIG1faXNTaHV0dGluZ0Rvd24gOiAxOwogICAgIGJvb2wgbV9k aWRFeGl0IDogMTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL1VSTC5jcHAgYi9Tb3VyY2Uv V1RGL3d0Zi9VUkwuY3BwCmluZGV4IGE1ZDc0YWZlYWVjZWVhN2NkZGY3YmIxNzlkNDIzZDlkZmM5 NTJjMGQuLjRkNmIwZDU1YzEwYWRiNjdkMGYxZTdlZmIzYTM1NGFhNjU3N2QwOWQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XVEYvd3RmL1VSTC5jcHAKKysrIGIvU291cmNlL1dURi93dGYvVVJMLmNwcApA QCAtMzAsNiArMzAsNyBAQAogI2luY2x1ZGUgIlVSTFBhcnNlci5oIgogI2luY2x1ZGUgPHN0ZGlv Lmg+CiAjaW5jbHVkZSA8dW5pY29kZS91aWRuYS5oPgorI2luY2x1ZGUgPHd0Zi9DaGVja2VkTG9j ay5oPgogI2luY2x1ZGUgPHd0Zi9IYXNoTWFwLmg+CiAjaW5jbHVkZSA8d3RmL05ldmVyRGVzdHJv eWVkLmg+CiAjaW5jbHVkZSA8d3RmL1ByaW50U3RyZWFtLmg+CkBAIC0yNjcsMTYgKzI2OCwxNiBA QCBzdGF0aWMgdm9pZCBhc3NlcnRQcm90b2NvbElzR29vZChTdHJpbmdWaWV3IHByb3RvY29sKQog CiAjZW5kaWYKIAotc3RhdGljIExvY2sgZGVmYXVsdFBvcnRGb3JQcm90b2NvbE1hcEZvclRlc3Rp bmdMb2NrOworc3RhdGljIENoZWNrZWRMb2NrIGRlZmF1bHRQb3J0Rm9yUHJvdG9jb2xNYXBGb3JU ZXN0aW5nTG9jazsKIAogdXNpbmcgRGVmYXVsdFBvcnRGb3JQcm90b2NvbE1hcEZvclRlc3Rpbmcg PSBIYXNoTWFwPFN0cmluZywgdWludDE2X3Q+Owotc3RhdGljIERlZmF1bHRQb3J0Rm9yUHJvdG9j b2xNYXBGb3JUZXN0aW5nKiYgZGVmYXVsdFBvcnRGb3JQcm90b2NvbE1hcEZvclRlc3RpbmcoKQor c3RhdGljIERlZmF1bHRQb3J0Rm9yUHJvdG9jb2xNYXBGb3JUZXN0aW5nKiYgZGVmYXVsdFBvcnRG b3JQcm90b2NvbE1hcEZvclRlc3RpbmcoKSBXVEZfUkVRVUlSRVNfTE9DSyhkZWZhdWx0UG9ydEZv clByb3RvY29sTWFwRm9yVGVzdGluZ0xvY2spCiB7CiAgICAgc3RhdGljIERlZmF1bHRQb3J0Rm9y UHJvdG9jb2xNYXBGb3JUZXN0aW5nKiBkZWZhdWx0UG9ydEZvclByb3RvY29sTWFwOwogICAgIHJl dHVybiBkZWZhdWx0UG9ydEZvclByb3RvY29sTWFwOwogfQogCi1zdGF0aWMgRGVmYXVsdFBvcnRG b3JQcm90b2NvbE1hcEZvclRlc3RpbmcmIGVuc3VyZURlZmF1bHRQb3J0Rm9yUHJvdG9jb2xNYXBG b3JUZXN0aW5nKCkKK3N0YXRpYyBEZWZhdWx0UG9ydEZvclByb3RvY29sTWFwRm9yVGVzdGluZyYg ZW5zdXJlRGVmYXVsdFBvcnRGb3JQcm90b2NvbE1hcEZvclRlc3RpbmcoKSBXVEZfUkVRVUlSRVNf TE9DSyhkZWZhdWx0UG9ydEZvclByb3RvY29sTWFwRm9yVGVzdGluZ0xvY2spCiB7CiAgICAgRGVm YXVsdFBvcnRGb3JQcm90b2NvbE1hcEZvclRlc3RpbmcqJiBkZWZhdWx0UG9ydEZvclByb3RvY29s TWFwID0gZGVmYXVsdFBvcnRGb3JQcm90b2NvbE1hcEZvclRlc3RpbmcoKTsKICAgICBpZiAoIWRl ZmF1bHRQb3J0Rm9yUHJvdG9jb2xNYXApCkBAIC0yODYsMjUgKzI4NywyNiBAQCBzdGF0aWMgRGVm YXVsdFBvcnRGb3JQcm90b2NvbE1hcEZvclRlc3RpbmcmIGVuc3VyZURlZmF1bHRQb3J0Rm9yUHJv dG9jb2xNYXBGb3JUZQogCiB2b2lkIHJlZ2lzdGVyRGVmYXVsdFBvcnRGb3JQcm90b2NvbEZvclRl c3RpbmcodWludDE2X3QgcG9ydCwgY29uc3QgU3RyaW5nJiBwcm90b2NvbCkKIHsKLSAgICBhdXRv IGxvY2tlciA9IGhvbGRMb2NrKGRlZmF1bHRQb3J0Rm9yUHJvdG9jb2xNYXBGb3JUZXN0aW5nTG9j ayk7CisgICAgTG9ja2VyIGxvY2tlciB7IGRlZmF1bHRQb3J0Rm9yUHJvdG9jb2xNYXBGb3JUZXN0 aW5nTG9jayB9OwogICAgIGVuc3VyZURlZmF1bHRQb3J0Rm9yUHJvdG9jb2xNYXBGb3JUZXN0aW5n KCkuYWRkKHByb3RvY29sLCBwb3J0KTsKIH0KIAogdm9pZCBjbGVhckRlZmF1bHRQb3J0Rm9yUHJv dG9jb2xNYXBGb3JUZXN0aW5nKCkKIHsKLSAgICBhdXRvIGxvY2tlciA9IGhvbGRMb2NrKGRlZmF1 bHRQb3J0Rm9yUHJvdG9jb2xNYXBGb3JUZXN0aW5nTG9jayk7CisgICAgTG9ja2VyIGxvY2tlciB7 IGRlZmF1bHRQb3J0Rm9yUHJvdG9jb2xNYXBGb3JUZXN0aW5nTG9jayB9OwogICAgIGlmIChhdXRv KiBtYXAgPSBkZWZhdWx0UG9ydEZvclByb3RvY29sTWFwRm9yVGVzdGluZygpKQogICAgICAgICBt YXAtPmNsZWFyKCk7CiB9CiAKIE9wdGlvbmFsPHVpbnQxNl90PiBkZWZhdWx0UG9ydEZvclByb3Rv Y29sKFN0cmluZ1ZpZXcgcHJvdG9jb2wpCiB7Ci0gICAgaWYgKGF1dG8qIG92ZXJyaWRlTWFwID0g ZGVmYXVsdFBvcnRGb3JQcm90b2NvbE1hcEZvclRlc3RpbmcoKSkgewotICAgICAgICBhdXRvIGxv Y2tlciA9IGhvbGRMb2NrKGRlZmF1bHRQb3J0Rm9yUHJvdG9jb2xNYXBGb3JUZXN0aW5nTG9jayk7 Ci0gICAgICAgIEFTU0VSVChvdmVycmlkZU1hcCk7IC8vIE5vIG5lZWQgdG8gbnVsbCBjaGVjayBh Z2FpbiBoZXJlIHNpbmNlIG92ZXJyaWRlTWFwIGNhbm5vdCBiZWNvbWUgbnVsbCBhZnRlciBiZWlu ZyBub24tbnVsbC4KLSAgICAgICAgYXV0byBpdGVyYXRvciA9IG92ZXJyaWRlTWFwLT5maW5kKHBy b3RvY29sLnRvU3RyaW5nV2l0aG91dENvcHlpbmcoKSk7Ci0gICAgICAgIGlmIChpdGVyYXRvciAh PSBvdmVycmlkZU1hcC0+ZW5kKCkpCi0gICAgICAgICAgICByZXR1cm4gaXRlcmF0b3ItPnZhbHVl OworICAgIHsKKyAgICAgICAgTG9ja2VyIGxvY2tlciB7IGRlZmF1bHRQb3J0Rm9yUHJvdG9jb2xN YXBGb3JUZXN0aW5nTG9jayB9OworICAgICAgICBpZiAoYXV0byogb3ZlcnJpZGVNYXAgPSBkZWZh dWx0UG9ydEZvclByb3RvY29sTWFwRm9yVGVzdGluZygpKSB7CisgICAgICAgICAgICBhdXRvIGl0 ZXJhdG9yID0gb3ZlcnJpZGVNYXAtPmZpbmQocHJvdG9jb2wudG9TdHJpbmdXaXRob3V0Q29weWlu ZygpKTsKKyAgICAgICAgICAgIGlmIChpdGVyYXRvciAhPSBvdmVycmlkZU1hcC0+ZW5kKCkpCisg ICAgICAgICAgICAgICAgcmV0dXJuIGl0ZXJhdG9yLT52YWx1ZTsKKyAgICAgICAgfQogICAgIH0K ICAgICByZXR1cm4gVVJMUGFyc2VyOjpkZWZhdWx0UG9ydEZvclByb3RvY29sKHByb3RvY29sKTsK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL2NmL0xhbmd1YWdlQ0YuY3BwIGIvU291cmNl L1dURi93dGYvY2YvTGFuZ3VhZ2VDRi5jcHAKaW5kZXggNTNjMGVmMGRjMDBiMzk0MmQzOWI2NThh OGRjYzBkNmUwNGNmNmQxMy4uZTA3MzExNTQyOTFiZmQwN2M0Y2MxNmRhMDQyYWFhZGI1OWM5ZTNi MSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvY2YvTGFuZ3VhZ2VDRi5jcHAKKysrIGIvU291 cmNlL1dURi93dGYvY2YvTGFuZ3VhZ2VDRi5jcHAKQEAgLTMwLDcgKzMwLDcgQEAKICNpbmNsdWRl IDxtdXRleD4KICNpbmNsdWRlIDx1bmljb2RlL3Vsb2MuaD4KICNpbmNsdWRlIDx3dGYvQXNzZXJ0 aW9ucy5oPgotI2luY2x1ZGUgPHd0Zi9Mb2NrLmg+CisjaW5jbHVkZSA8d3RmL0NoZWNrZWRMb2Nr Lmg+CiAjaW5jbHVkZSA8d3RmL05ldmVyRGVzdHJveWVkLmg+CiAjaW5jbHVkZSA8d3RmL1JldGFp blB0ci5oPgogI2luY2x1ZGUgPHd0Zi9zcGkvY2YvQ0ZCdW5kbGVTUEkuaD4KQEAgLTM4LDcgKzM4 LDcgQEAKIAogbmFtZXNwYWNlIFdURiB7CiAKLXN0YXRpYyBMb2NrIHByZWZlcnJlZExhbmd1YWdl c011dGV4Oworc3RhdGljIENoZWNrZWRMb2NrIHByZWZlcnJlZExhbmd1YWdlc0xvY2s7CiAKICNp ZiBQTEFURk9STShNQUMpCiBzdGF0aWMgdm9pZCBsYW5ndWFnZVByZWZlcmVuY2VzRGlkQ2hhbmdl KENGTm90aWZpY2F0aW9uQ2VudGVyUmVmLCB2b2lkKiwgQ0ZTdHJpbmdSZWYsIGNvbnN0IHZvaWQq LCBDRkRpY3Rpb25hcnlSZWYpCkBAIC00Nyw3ICs0Nyw3IEBAIHN0YXRpYyB2b2lkIGxhbmd1YWdl UHJlZmVyZW5jZXNEaWRDaGFuZ2UoQ0ZOb3RpZmljYXRpb25DZW50ZXJSZWYsIHZvaWQqLCBDRlN0 cmluCiB9CiAjZW5kaWYKIAotc3RhdGljIFZlY3RvcjxTdHJpbmc+JiBwcmVmZXJyZWRMYW5ndWFn ZXMoKQorc3RhdGljIFZlY3RvcjxTdHJpbmc+JiBwcmVmZXJyZWRMYW5ndWFnZXMoKSBXVEZfUkVR VUlSRVNfTE9DSyhwcmVmZXJyZWRMYW5ndWFnZXNMb2NrKQogewogICAgIHN0YXRpYyBMYXp5TmV2 ZXJEZXN0cm95ZWQ8VmVjdG9yPFN0cmluZz4+IGxhbmd1YWdlczsKICAgICBzdGF0aWMgc3RkOjpv bmNlX2ZsYWcgb25jZUtleTsKQEAgLTkxLDcgKzkxLDcgQEAgc3RhdGljIFN0cmluZyBodHRwU3R5 bGVMYW5ndWFnZUNvZGUoQ0ZTdHJpbmdSZWYgbGFuZ3VhZ2UpCiB2b2lkIHBsYXRmb3JtTGFuZ3Vh Z2VEaWRDaGFuZ2UoKQogewogICAgIHsKLSAgICAgICAgYXV0byBsb2NrZXIgPSBob2xkTG9jayhw cmVmZXJyZWRMYW5ndWFnZXNNdXRleCk7CisgICAgICAgIExvY2tlciBsb2NrZXIgeyBwcmVmZXJy ZWRMYW5ndWFnZXNMb2NrIH07CiAgICAgICAgIHByZWZlcnJlZExhbmd1YWdlcygpLmNsZWFyKCk7 CiAgICAgfQogfQpAQCAtMTA4LDcgKzEwOCw3IEBAIHZvaWQgbGlzdGVuRm9yTGFuZ3VhZ2VDaGFu Z2VOb3RpZmljYXRpb25zKCkKIAogVmVjdG9yPFN0cmluZz4gcGxhdGZvcm1Vc2VyUHJlZmVycmVk TGFuZ3VhZ2VzKCkKIHsKLSAgICBhdXRvIGxvY2tlciA9IGhvbGRMb2NrKHByZWZlcnJlZExhbmd1 YWdlc011dGV4KTsKKyAgICBMb2NrZXIgbG9ja2VyIHsgcHJlZmVycmVkTGFuZ3VhZ2VzTG9jayB9 OwogICAgIFZlY3RvcjxTdHJpbmc+JiB1c2VyUHJlZmVycmVkTGFuZ3VhZ2VzID0gcHJlZmVycmVk TGFuZ3VhZ2VzKCk7CiAKICAgICBpZiAodXNlclByZWZlcnJlZExhbmd1YWdlcy5pc0VtcHR5KCkp IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL3RleHQvU3RyaW5nVmlldy5jcHAgYi9Tb3Vy Y2UvV1RGL3d0Zi90ZXh0L1N0cmluZ1ZpZXcuY3BwCmluZGV4IDNjYjAxODNjODAxMWFkOGRhODJj MGU5NDJiNzY5Mzg5ODFiZDNkY2UuLjNlODQ2M2Y0OTMwODllMzVhZDk3NDMwZDU4MzE5YjYzMWNk NDU2NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL3RleHQvU3RyaW5nVmlldy5jcHAKKysr IGIvU291cmNlL1dURi93dGYvdGV4dC9TdHJpbmdWaWV3LmNwcApAQCAtMzAsOCArMzAsOCBAQCBT T0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFH RS4KICNpbmNsdWRlIDx1bmljb2RlL3VicmsuaD4KICNpbmNsdWRlIDx1bmljb2RlL3Vub3JtMi5o PgogI2luY2x1ZGUgPHd0Zi9BU0NJSUNUeXBlLmg+CisjaW5jbHVkZSA8d3RmL0NoZWNrZWRMb2Nr Lmg+CiAjaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KLSNpbmNsdWRlIDx3dGYvTG9jay5oPgogI2lu Y2x1ZGUgPHd0Zi9PcHRpb25hbC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ1RvSW50ZWdl ckNvbnZlcnNpb24uaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9UZXh0QnJlYWtJdGVyYXRvci5oPgpA QCAtMzYwLDE1ICszNjAsMTEgQEAgU3RyaW5nVmlldzo6VW5kZXJseWluZ1N0cmluZzo6VW5kZXJs eWluZ1N0cmluZyhjb25zdCBTdHJpbmdJbXBsJiBzdHJpbmcpCiB7CiB9CiAKLXN0YXRpYyBMb2Nr IHVuZGVybHlpbmdTdHJpbmdzTXV0ZXg7CitzdGF0aWMgQ2hlY2tlZExvY2sgdW5kZXJseWluZ1N0 cmluZ3NMb2NrOwogCi1zdGF0aWMgSGFzaE1hcDxjb25zdCBTdHJpbmdJbXBsKiwgU3RyaW5nVmll dzo6VW5kZXJseWluZ1N0cmluZyo+JiB1bmRlcmx5aW5nU3RyaW5ncygpCitzdGF0aWMgSGFzaE1h cDxjb25zdCBTdHJpbmdJbXBsKiwgU3RyaW5nVmlldzo6VW5kZXJseWluZ1N0cmluZyo+JiB1bmRl cmx5aW5nU3RyaW5ncygpIFdURl9SRVFVSVJFU19MT0NLKHVuZGVybHlpbmdTdHJpbmdzTG9jaykK IHsKLSAgICBzdGF0aWMgTGF6eU5ldmVyRGVzdHJveWVkPEhhc2hNYXA8Y29uc3QgU3RyaW5nSW1w bCosIFN0cmluZ1ZpZXc6OlVuZGVybHlpbmdTdHJpbmcqPj4gbWFwOwotICAgIHN0YXRpYyBzdGQ6 Om9uY2VfZmxhZyBvbmNlS2V5OwotICAgIHN0ZDo6Y2FsbF9vbmNlKG9uY2VLZXksIFsmXSB7Ci0g ICAgICAgIG1hcC5jb25zdHJ1Y3QoKTsKLSAgICB9KTsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95 ZWQ8SGFzaE1hcDxjb25zdCBTdHJpbmdJbXBsKiwgU3RyaW5nVmlldzo6VW5kZXJseWluZ1N0cmlu Zyo+PiBtYXA7CiAgICAgcmV0dXJuIG1hcDsKIH0KIApAQCAtMzc2LDcgKzM3Miw3IEBAIHZvaWQg U3RyaW5nVmlldzo6aW52YWxpZGF0ZShjb25zdCBTdHJpbmdJbXBsJiBzdHJpbmdUb0JlRGVzdHJv eWVkKQogewogICAgIFVuZGVybHlpbmdTdHJpbmcqIHVuZGVybHlpbmdTdHJpbmc7CiAgICAgewot ICAgICAgICBhdXRvIGxvY2tlciA9IGhvbGRMb2NrKHVuZGVybHlpbmdTdHJpbmdzTXV0ZXgpOwor ICAgICAgICBMb2NrZXIgbG9ja2VyIHsgdW5kZXJseWluZ1N0cmluZ3NMb2NrIH07CiAgICAgICAg IHVuZGVybHlpbmdTdHJpbmcgPSB1bmRlcmx5aW5nU3RyaW5ncygpLnRha2UoJnN0cmluZ1RvQmVE ZXN0cm95ZWQpOwogICAgICAgICBpZiAoIXVuZGVybHlpbmdTdHJpbmcpCiAgICAgICAgICAgICBy ZXR1cm47CkBAIC0zOTMsNyArMzg5LDcgQEAgYm9vbCBTdHJpbmdWaWV3Ojp1bmRlcmx5aW5nU3Ry aW5nSXNWYWxpZCgpIGNvbnN0CiB2b2lkIFN0cmluZ1ZpZXc6OmFkb3B0VW5kZXJseWluZ1N0cmlu ZyhVbmRlcmx5aW5nU3RyaW5nKiB1bmRlcmx5aW5nU3RyaW5nKQogewogICAgIGlmIChtX3VuZGVy bHlpbmdTdHJpbmcpIHsKLSAgICAgICAgYXV0byBsb2NrZXIgPSBob2xkTG9jayh1bmRlcmx5aW5n U3RyaW5nc011dGV4KTsKKyAgICAgICAgTG9ja2VyIGxvY2tlciB7IHVuZGVybHlpbmdTdHJpbmdz TG9jayB9OwogICAgICAgICBpZiAoIS0tbV91bmRlcmx5aW5nU3RyaW5nLT5yZWZDb3VudCkgewog ICAgICAgICAgICAgaWYgKG1fdW5kZXJseWluZ1N0cmluZy0+aXNWYWxpZCkgewogICAgICAgICAg ICAgICAgIHVuZGVybHlpbmdTdHJpbmdzKCkucmVtb3ZlKCZtX3VuZGVybHlpbmdTdHJpbmctPnN0 cmluZyk7CkBAIC00MTAsNyArNDA2LDcgQEAgdm9pZCBTdHJpbmdWaWV3OjpzZXRVbmRlcmx5aW5n U3RyaW5nKGNvbnN0IFN0cmluZ0ltcGwqIHN0cmluZykKICAgICBpZiAoIXN0cmluZykKICAgICAg ICAgdW5kZXJseWluZ1N0cmluZyA9IG51bGxwdHI7CiAgICAgZWxzZSB7Ci0gICAgICAgIGF1dG8g bG9ja2VyID0gaG9sZExvY2sodW5kZXJseWluZ1N0cmluZ3NNdXRleCk7CisgICAgICAgIExvY2tl ciBsb2NrZXIgeyB1bmRlcmx5aW5nU3RyaW5nc0xvY2sgfTsKICAgICAgICAgYXV0byByZXN1bHQg PSB1bmRlcmx5aW5nU3RyaW5ncygpLmFkZChzdHJpbmcsIG51bGxwdHIpOwogICAgICAgICBpZiAo cmVzdWx0LmlzTmV3RW50cnkpCiAgICAgICAgICAgICByZXN1bHQuaXRlcmF0b3ItPnZhbHVlID0g bmV3IFVuZGVybHlpbmdTdHJpbmcoKnN0cmluZyk7CkBAIC00MjUsNyArNDIxLDcgQEAgdm9pZCBT dHJpbmdWaWV3OjpzZXRVbmRlcmx5aW5nU3RyaW5nKGNvbnN0IFN0cmluZ1ZpZXcmIG90aGVyU3Ry aW5nKQogewogICAgIFVuZGVybHlpbmdTdHJpbmcqIHVuZGVybHlpbmdTdHJpbmcgPSBvdGhlclN0 cmluZy5tX3VuZGVybHlpbmdTdHJpbmc7CiAgICAgaWYgKHVuZGVybHlpbmdTdHJpbmcpIHsKLSAg ICAgICAgLy8gSXQncyBzYWZlIHRvIGluYyB0aGUgcmVmQ291bnQgaGVyZSB3aXRob3V0IGxvY2tp bmcgdW5kZXJseWluZ1N0cmluZ3NNdXRleAorICAgICAgICAvLyBJdCdzIHNhZmUgdG8gaW5jIHRo ZSByZWZDb3VudCBoZXJlIHdpdGhvdXQgbG9ja2luZyB1bmRlcmx5aW5nU3RyaW5nc0xvY2sKICAg ICAgICAgLy8gYmVjYXVzZSBVbmRlcmx5aW5nU3RyaW5nOjpyZWZDb3VudCBpcyBhIHN0ZDo6YXRv bWljX3VpbnQsIGFuZCB3ZSdyZQogICAgICAgICAvLyBndWFyYW50ZWVkIHRoYXQgdGhlIFN0cmlu Z1ZpZXcgd2UncmUgY29weWluZyBpdCBmcm9tIHdpbGwgYXQgbGVhc3QKICAgICAgICAgLy8gaGF2 ZSAxIHJlZiBvbiBpdCwgdGhlcmVieSBrZWVwaW5nIGl0IGFsaXZlIHJlZ2FyZGxlc3Mgb2Ygd2hh dCBvdGhlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvdW5pY29kZS9pY3UvQ29sbGF0b3JJ Q1UuY3BwIGIvU291cmNlL1dURi93dGYvdW5pY29kZS9pY3UvQ29sbGF0b3JJQ1UuY3BwCmluZGV4 IDY3NjYwNzNjOWY2YjljZTBmYTU2NDFmYTVjYWIxNWE5YjAxZmNiYWQuLmYxN2UwMjU5YWNiYWNk MTcyZTZlZjczNmFlYzg5NmE2ZTI5YmFhMDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL3Vu aWNvZGUvaWN1L0NvbGxhdG9ySUNVLmNwcAorKysgYi9Tb3VyY2UvV1RGL3d0Zi91bmljb2RlL2lj dS9Db2xsYXRvcklDVS5jcHAKQEAgLTM1LDcgKzM1LDcgQEAKIAogI2luY2x1ZGUgPG11dGV4Pgog I2luY2x1ZGUgPHVuaWNvZGUvdWNvbC5oPgotI2luY2x1ZGUgPHd0Zi9Mb2NrLmg+CisjaW5jbHVk ZSA8d3RmL0NoZWNrZWRMb2NrLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nVmlldy5oPgog CiAjaWYgT1MoREFSV0lOKSAmJiBVU0UoQ0YpCkBAIC00NSwxMiArNDUsMTEgQEAKIAogbmFtZXNw YWNlIFdURiB7CiAKLXN0YXRpYyBVQ29sbGF0b3IqIGNhY2hlZENvbGxhdG9yOworc3RhdGljIENo ZWNrZWRMb2NrIGNhY2hlZENvbGxhdG9yTG9jazsKK3N0YXRpYyBVQ29sbGF0b3IqIGNhY2hlZENv bGxhdG9yIFdURl9HVUFSREVEX0JZX0xPQ0soY2FjaGVkQ29sbGF0b3JMb2NrKTsKIHN0YXRpYyBj aGFyKiBjYWNoZWRDb2xsYXRvckxvY2FsZTsKIHN0YXRpYyBib29sIGNhY2hlZENvbGxhdG9yU2hv dWxkU29ydExvd2VyY2FzZUZpcnN0OwogCi1zdGF0aWMgTG9jayBjYWNoZWRDb2xsYXRvck11dGV4 OwotCiAjaWYgIShPUyhEQVJXSU4pICYmIFVTRShDRikpCiAKIHN0YXRpYyBpbmxpbmUgY29uc3Qg Y2hhciogcmVzb2x2ZURlZmF1bHRMb2NhbGUoY29uc3QgY2hhciogbG9jYWxlKQpAQCAtMTA2LDcg KzEwNSw3IEBAIENvbGxhdG9yOjpDb2xsYXRvcihjb25zdCBjaGFyKiBsb2NhbGUsIGJvb2wgc2hv dWxkU29ydExvd2VyY2FzZUZpcnN0KQogICAgIFVFcnJvckNvZGUgc3RhdHVzID0gVV9aRVJPX0VS Uk9SOwogCiAgICAgewotICAgICAgICBhdXRvIGxvY2tlciA9IGhvbGRMb2NrKGNhY2hlZENvbGxh dG9yTXV0ZXgpOworICAgICAgICBMb2NrZXIgbG9ja2VyIHsgY2FjaGVkQ29sbGF0b3JMb2NrIH07 CiAgICAgICAgIGlmIChjYWNoZWRDb2xsYXRvciAmJiBsb2NhbGVzTWF0Y2goY2FjaGVkQ29sbGF0 b3JMb2NhbGUsIGxvY2FsZSkgJiYgY2FjaGVkQ29sbGF0b3JTaG91bGRTb3J0TG93ZXJjYXNlRmly c3QgPT0gc2hvdWxkU29ydExvd2VyY2FzZUZpcnN0KSB7CiAgICAgICAgICAgICBtX2NvbGxhdG9y ID0gY2FjaGVkQ29sbGF0b3I7CiAgICAgICAgICAgICBtX2xvY2FsZSA9IGNhY2hlZENvbGxhdG9y TG9jYWxlOwpAQCAtMTM2LDcgKzEzNSw3IEBAIENvbGxhdG9yOjpDb2xsYXRvcihjb25zdCBjaGFy KiBsb2NhbGUsIGJvb2wgc2hvdWxkU29ydExvd2VyY2FzZUZpcnN0KQogCiBDb2xsYXRvcjo6fkNv bGxhdG9yKCkKIHsKLSAgICBhdXRvIGxvY2tlciA9IGhvbGRMb2NrKGNhY2hlZENvbGxhdG9yTXV0 ZXgpOworICAgIExvY2tlciBsb2NrZXIgeyBjYWNoZWRDb2xsYXRvckxvY2sgfTsKICAgICBpZiAo Y2FjaGVkQ29sbGF0b3IpIHsKICAgICAgICAgdWNvbF9jbG9zZShjYWNoZWRDb2xsYXRvcik7CiAg ICAgICAgIGZhc3RGcmVlKGNhY2hlZENvbGxhdG9yTG9jYWxlKTsK