227617 2021-07-02 03:34:38 -0700 Collect Accessibility preferences on a background queue 2021-08-09 18:06:19 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 228932 1 pvollan pvollan bfulgham oldest_to_newest 1774407 0 pvollan 2021-07-02 03:34:38 -0700 To avoid blocking the main thread of the UI process, collect Accessibility preferences on a background thread. 1774408 1 pvollan 2021-07-02 03:35:11 -0700 <rdar://80055168> 1774435 2 432783 pvollan 2021-07-02 06:11:24 -0700 Created attachment 432783 Patch 1774939 3 432927 pvollan 2021-07-06 07:43:07 -0700 Created attachment 432927 Patch 1774978 4 432927 bfulgham 2021-07-06 09:55:55 -0700 Comment on attachment 432927 Patch r=me 1774981 5 432927 pvollan 2021-07-06 10:15:33 -0700 Comment on attachment 432927 Patch Thanks for reviewing! 1774983 6 ews-feeder 2021-07-06 10:25:12 -0700 Committed r279591 (239418@main): <https://commits.webkit.org/239418@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 432927. 432783 2021-07-02 06:11:24 -0700 2021-07-02 09:49:02 -0700 Patch bug-227617-20210702151122.patch text/plain 7554 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzk1MDEpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDIxLTA3LTAyICBQZXIgQXJuZSAg PHB2b2xsYW5AYXBwbGUuY29tPgorCisgICAgICAgIENvbGxlY3QgQWNjZXNzaWJpbGl0eSBwcmVm ZXJlbmNlcyBvbiBhIGJhY2tncm91bmQgcXVldWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzYxNworICAgICAgICA8cmRhcjovLzgwMDU1MTY4Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRvIGF2b2lk IGJsb2NraW5nIHRoZSBtYWluIHRocmVhZCBvZiB0aGUgVUkgcHJvY2VzcywgY29sbGVjdCBBY2Nl c3NpYmlsaXR5IHByZWZlcmVuY2VzIG9uIGEgYmFja2dyb3VuZCB0aHJlYWQuCisKKyAgICAgICAg KiBTaGFyZWQvQWNjZXNzaWJpbGl0eVByZWZlcmVuY2VzLmg6CisgICAgICAgICogVUlQcm9jZXNz L0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OmFjY2Vzc2li aWxpdHlQcmVmZXJlbmNlcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpzZXRB Y2Nlc3NpYmlsaXR5UHJlZmVyZW5jZXMpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9v bDo6aGFzQWNjZXNzaWJpbGl0eVByZWZlcmVuY2VzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv Y2Vzc1Bvb2w6OmNvbGxlY3RBY2Nlc3NpYmlsaXR5UHJlZmVyZW5jZXMpOgorICAgICAgICAoV2Vi S2l0OjpXZWJQcm9jZXNzUG9vbDo6cGxhdGZvcm1Jbml0aWFsaXplKToKKyAgICAgICAgKFdlYktp dDo6V2ViUHJvY2Vzc1Bvb2w6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oOgorCiAyMDIxLTA3LTAyICBBbnRvaW5lIFF1 aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyNzk0Nzcp OiBXZWJLaXRfaW9zbWFjIGZhaWxlZCB0byBidWlsZCBpbiA6IE1vZGVsRWxlbWVudENvbnRyb2xs ZXJDb2NvYS5tbTo1ODoyNDogbWVtYmVyIHJlZmVyZW5jZSB0eXBlICdXZWJLaXQ6OldlYlBhZ2VQ cm94eScgaXMgbm90IGEgcG9pbnRlcjsgZGlkIHlvdSBtZWFuIHRvIHVzZSAnLic/CkluZGV4OiBT b3VyY2UvV2ViS2l0L1NoYXJlZC9BY2Nlc3NpYmlsaXR5UHJlZmVyZW5jZXMuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJlZC9BY2Nlc3NpYmlsaXR5UHJlZmVyZW5jZXMuaAkocmV2 aXNpb24gMjc5NDUzKQorKysgU291cmNlL1dlYktpdC9TaGFyZWQvQWNjZXNzaWJpbGl0eVByZWZl cmVuY2VzLmgJKHdvcmtpbmcgY29weSkKQEAgLTI2LDYgKzI2LDcgQEAKICNwcmFnbWEgb25jZQog CiAjaW5jbHVkZSAiQXJndW1lbnRDb2RlcnMuaCIKKyNpbmNsdWRlIDx3dGYvRmFzdE1hbGxvYy5o PgogCiAjaWYgSEFWRShNRURJQV9BQ0NFU1NJQklMSVRZX0ZSQU1FV09SSykKICNpbmNsdWRlIDxX ZWJDb3JlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXMuaD4KQEAgLTQ5LDYgKzUwLDcgQEAgc3RydWN0 IEFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcyB7CiAgICAgV2ViQ29yZTo6Q2FwdGlvblVzZXJQcmVm ZXJlbmNlczo6Q2FwdGlvbkRpc3BsYXlNb2RlIGNhcHRpb25EaXNwbGF5TW9kZTsKICAgICBWZWN0 b3I8U3RyaW5nPiBwcmVmZXJyZWRMYW5ndWFnZXM7CiAjZW5kaWYKKyAgICBXVEZfTUFLRV9GQVNU X0FMTE9DQVRFRDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oCShyZXZpc2lvbiAyNzk0NTMpCisrKyBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oCSh3b3JraW5nIGNvcHkpCkBAIC03 NSw2ICs3NSwxMCBAQCBPQkpDX0NMQVNTIFdLV2ViSW5zcGVjdG9yUHJlZmVyZW5jZU9ic2VyCiAj aW5jbHVkZSA8cGFsL3N5c3RlbS9TeXN0ZW1TbGVlcExpc3RlbmVyLmg+CiAjZW5kaWYKIAorI2lm IFBMQVRGT1JNKENPQ09BKQorI2luY2x1ZGUgIkFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcy5oIgor I2VuZGlmCisKIG5hbWVzcGFjZSBBUEkgewogY2xhc3MgQXV0b21hdGlvbkNsaWVudDsKIGNsYXNz IERvd25sb2FkQ2xpZW50OwpAQCAtNTkxLDYgKzU5NSwxMiBAQCBwcml2YXRlOgogICAgIHZvaWQg c3lzdGVtRGlkV2FrZSgpIGZpbmFsOwogI2VuZGlmCiAKKyNpZiBQTEFURk9STShDT0NPQSkKKyAg ICB2b2lkIHNldEFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcyhjb25zdCBBY2Nlc3NpYmlsaXR5UHJl ZmVyZW5jZXMmKTsKKyAgICBib29sIGhhc0FjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcygpOworICAg IHZvaWQgY29sbGVjdEFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcygpOworI2VuZGlmCisKICAgICBS ZWY8QVBJOjpQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24+IG1fY29uZmlndXJhdGlvbjsKIAogICAg IElQQzo6TWVzc2FnZVJlY2VpdmVyTWFwIG1fbWVzc2FnZVJlY2VpdmVyTWFwOwpAQCAtNzkxLDYg KzgwMSwxMSBAQCBwcml2YXRlOgogICAgIHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpQb3dlck9i c2VydmVyPiBtX3Bvd2VyT2JzZXJ2ZXI7CiAgICAgc3RkOjp1bmlxdWVfcHRyPFBBTDo6U3lzdGVt U2xlZXBMaXN0ZW5lcj4gbV9zeXN0ZW1TbGVlcExpc3RlbmVyOwogI2VuZGlmCisKKyNpZiBQTEFU Rk9STShDT0NPQSkKKyAgICBMb2NrIG1fYWNjZXNzaWJpbGl0eVByZWZlcmVuY2VzTG9jazsKKyAg ICBzdGQ6OnVuaXF1ZV9wdHI8QWNjZXNzaWJpbGl0eVByZWZlcmVuY2VzPiBtX2FjY2Vzc2liaWxp dHlQcmVmZXJlbmNlczsKKyNlbmRpZgogfTsKIAogdGVtcGxhdGU8dHlwZW5hbWUgVD4KSW5kZXg6 IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xD b2NvYS5tbQkocmV2aXNpb24gMjc5NDUzKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29j b2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtMjYsNyArMjYsNiBA QAogI2ltcG9ydCAiY29uZmlnLmgiCiAjaW1wb3J0ICJXZWJQcm9jZXNzUG9vbC5oIgogCi0jaW1w b3J0ICJBY2Nlc3NpYmlsaXR5UHJlZmVyZW5jZXMuaCIKICNpbXBvcnQgIkFjY2Vzc2liaWxpdHlT dXBwb3J0U1BJLmgiCiAjaW1wb3J0ICJDb29raWVTdG9yYWdlVXRpbHNDRi5oIgogI2ltcG9ydCAi RGVmYXVsdFdlYkJyb3dzZXJDaGVja3MuaCIKQEAgLTE2OCw4ICsxNjcsNTEgQEAgTlNNdXRhYmxl RGljdGlvbmFyeSAqV2ViUHJvY2Vzc1Bvb2w6OmVucwogICAgIHJldHVybiBtX2J1bmRsZVBhcmFt ZXRlcnMuZ2V0KCk7CiB9CiAKK3N0YXRpYyBBY2Nlc3NpYmlsaXR5UHJlZmVyZW5jZXMgYWNjZXNz aWJpbGl0eVByZWZlcmVuY2VzKCkKK3sKKyAgICBBY2Nlc3NpYmlsaXR5UHJlZmVyZW5jZXMgcHJl ZmVyZW5jZXM7CisjaWYgSEFWRShQRVJfQVBQX0FDQ0VTU0lCSUxJVFlfUFJFRkVSRU5DRVMpCisg ICAgYXV0byBhcHBJZCA9IFdlYkNvcmU6OmFwcGxpY2F0aW9uQnVuZGxlSWRlbnRpZmllcigpLmNy ZWF0ZUNGU3RyaW5nKCk7CisKKyAgICBwcmVmZXJlbmNlcy5yZWR1Y2VNb3Rpb25FbmFibGVkID0g X0FYU1JlZHVjZU1vdGlvbkVuYWJsZWRBcHAoYXBwSWQuZ2V0KCkpOworICAgIHByZWZlcmVuY2Vz LmluY3JlYXNlQnV0dG9uTGVnaWJpbGl0eSA9IF9BWFNJbmNyZWFzZUJ1dHRvbkxlZ2liaWxpdHlB cHAoYXBwSWQuZ2V0KCkpOworICAgIHByZWZlcmVuY2VzLmVuaGFuY2VUZXh0TGVnaWJpbGl0eSA9 IF9BWFNFbmhhbmNlVGV4dExlZ2liaWxpdHlFbmFibGVkQXBwKGFwcElkLmdldCgpKTsKKyAgICBw cmVmZXJlbmNlcy5kYXJrZW5TeXN0ZW1Db2xvcnMgPSBfQVhEYXJrZW5TeXN0ZW1Db2xvcnNBcHAo YXBwSWQuZ2V0KCkpOworICAgIHByZWZlcmVuY2VzLmludmVydENvbG9yc0VuYWJsZWQgPSBfQVhT SW52ZXJ0Q29sb3JzRW5hYmxlZEFwcChhcHBJZC5nZXQoKSk7CisjZW5kaWYKKyNpZiBIQVZFKE1F RElBX0FDQ0VTU0lCSUxJVFlfRlJBTUVXT1JLKQorICAgIHByZWZlcmVuY2VzLmNhcHRpb25EaXNw bGF5TW9kZSA9IFdlYkNvcmU6OkNhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGOjpwbGF0Zm9y bUNhcHRpb25EaXNwbGF5TW9kZSgpOworICAgIHByZWZlcmVuY2VzLnByZWZlcnJlZExhbmd1YWdl cyA9IFdlYkNvcmU6OkNhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGOjpwbGF0Zm9ybVByZWZl cnJlZExhbmd1YWdlcygpOworI2VuZGlmCisgICAgcmV0dXJuIHByZWZlcmVuY2VzOworfQorCit2 b2lkIFdlYlByb2Nlc3NQb29sOjpzZXRBY2Nlc3NpYmlsaXR5UHJlZmVyZW5jZXMoY29uc3QgQWNj ZXNzaWJpbGl0eVByZWZlcmVuY2VzJiBhY2Nlc3NpYmlsaXR5UHJlZmVyZW5jZXMpCit7CisgICAg TG9ja2VyIGxvY2tlciB7IG1fYWNjZXNzaWJpbGl0eVByZWZlcmVuY2VzTG9jayB9OworICAgIG1f YWNjZXNzaWJpbGl0eVByZWZlcmVuY2VzID0gbWFrZVVuaXF1ZTxBY2Nlc3NpYmlsaXR5UHJlZmVy ZW5jZXM+KGFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcyk7Cit9CisKK2Jvb2wgV2ViUHJvY2Vzc1Bv b2w6Omhhc0FjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcygpCit7CisgICAgTG9ja2VyIGxvY2tlciB7 IG1fYWNjZXNzaWJpbGl0eVByZWZlcmVuY2VzTG9jayB9OworICAgIHJldHVybiBtX2FjY2Vzc2li aWxpdHlQcmVmZXJlbmNlcy5nZXQoKTsKK30KKwordm9pZCBXZWJQcm9jZXNzUG9vbDo6Y29sbGVj dEFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcygpCit7CisgICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0 Y2hfZ2V0X2dsb2JhbF9xdWV1ZShESVNQQVRDSF9RVUVVRV9QUklPUklUWV9ERUZBVUxULCAwKSwg W3dlYWtUaGlzID0gbWFrZVdlYWtQdHIodGhpcyldIHsKKyAgICAgICAgQWNjZXNzaWJpbGl0eVBy ZWZlcmVuY2VzIGF4UHJlZmVyZW5jZXMgPSBhY2Nlc3NpYmlsaXR5UHJlZmVyZW5jZXMoKTsKKyAg ICAgICAgaWYgKCF3ZWFrVGhpcykKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgd2Vha1Ro aXMtPnNldEFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcyhheFByZWZlcmVuY2VzKTsKKyAgICB9KTsK K30KKwogdm9pZCBXZWJQcm9jZXNzUG9vbDo6cGxhdGZvcm1Jbml0aWFsaXplKCkKIHsKKyAgICBj b2xsZWN0QWNjZXNzaWJpbGl0eVByZWZlcmVuY2VzKCk7CisKICAgICByZWdpc3RlclVzZXJEZWZh dWx0c0lmTmVlZGVkKCk7CiAgICAgcmVnaXN0ZXJOb3RpZmljYXRpb25PYnNlcnZlcnMoKTsKICAg ICBpbml0aWFsaXplQ2xhc3Nlc0ZvclBhcmFtZXRlckNvZGluZygpOwpAQCAtMjczLDI1ICszMTUs NiBAQCBzdGF0aWMgYm9vbCByZXF1aXJlc0NvbnRhaW5lck1hbmFnZXJBY2NlCiAjZW5kaWYKIH0K IAotc3RhdGljIEFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcyBhY2Nlc3NpYmlsaXR5UHJlZmVyZW5j ZXMoKQotewotICAgIEFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcyBwcmVmZXJlbmNlczsKLSNpZiBI QVZFKFBFUl9BUFBfQUNDRVNTSUJJTElUWV9QUkVGRVJFTkNFUykKLSAgICBhdXRvIGFwcElkID0g V2ViQ29yZTo6YXBwbGljYXRpb25CdW5kbGVJZGVudGlmaWVyKCkuY3JlYXRlQ0ZTdHJpbmcoKTsK LQotICAgIHByZWZlcmVuY2VzLnJlZHVjZU1vdGlvbkVuYWJsZWQgPSBfQVhTUmVkdWNlTW90aW9u RW5hYmxlZEFwcChhcHBJZC5nZXQoKSk7Ci0gICAgcHJlZmVyZW5jZXMuaW5jcmVhc2VCdXR0b25M ZWdpYmlsaXR5ID0gX0FYU0luY3JlYXNlQnV0dG9uTGVnaWJpbGl0eUFwcChhcHBJZC5nZXQoKSk7 Ci0gICAgcHJlZmVyZW5jZXMuZW5oYW5jZVRleHRMZWdpYmlsaXR5ID0gX0FYU0VuaGFuY2VUZXh0 TGVnaWJpbGl0eUVuYWJsZWRBcHAoYXBwSWQuZ2V0KCkpOwotICAgIHByZWZlcmVuY2VzLmRhcmtl blN5c3RlbUNvbG9ycyA9IF9BWERhcmtlblN5c3RlbUNvbG9yc0FwcChhcHBJZC5nZXQoKSk7Ci0g ICAgcHJlZmVyZW5jZXMuaW52ZXJ0Q29sb3JzRW5hYmxlZCA9IF9BWFNJbnZlcnRDb2xvcnNFbmFi bGVkQXBwKGFwcElkLmdldCgpKTsKLSNlbmRpZgotI2lmIEhBVkUoTUVESUFfQUNDRVNTSUJJTElU WV9GUkFNRVdPUkspCi0gICAgcHJlZmVyZW5jZXMuY2FwdGlvbkRpc3BsYXlNb2RlID0gV2ViQ29y ZTo6Q2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OnBsYXRmb3JtQ2FwdGlvbkRpc3BsYXlN b2RlKCk7Ci0gICAgcHJlZmVyZW5jZXMucHJlZmVycmVkTGFuZ3VhZ2VzID0gV2ViQ29yZTo6Q2Fw dGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OnBsYXRmb3JtUHJlZmVycmVkTGFuZ3VhZ2VzKCk7 Ci0jZW5kaWYKLSAgICByZXR1cm4gcHJlZmVyZW5jZXM7Ci19Ci0KIHZvaWQgV2ViUHJvY2Vzc1Bv b2w6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MoY29uc3QgV2ViUHJvY2Vzc1Byb3h5JiBw cm9jZXNzLCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQogewogICAg IHBhcmFtZXRlcnMubWVkaWFNSU1FVHlwZXMgPSBwcm9jZXNzLm1lZGlhTUlNRVR5cGVzKCk7CkBA IC00ODUsNyArNTA4LDEwIEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnBsYXRmb3JtSW5pdGlhbGl6 ZVcKICAgICBpZiAobV9kZWZhdWx0UGFnZUdyb3VwLT5wcmVmZXJlbmNlcygpLnVzZUdQVVByb2Nl c3NGb3JET01SZW5kZXJpbmdFbmFibGVkKCkpCiAgICAgICAgIHBhcmFtZXRlcnMubWF4aW11bUlP U3VyZmFjZVNpemUgPSBXZWJDb3JlOjpJT1N1cmZhY2U6Om1heGltdW1TaXplKCk7CiAKLSAgICBw YXJhbWV0ZXJzLmFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcyA9IGFjY2Vzc2liaWxpdHlQcmVmZXJl bmNlcygpOworICAgIGlmIChoYXNBY2Nlc3NpYmlsaXR5UHJlZmVyZW5jZXMoKSkKKyAgICAgICAg cGFyYW1ldGVycy5hY2Nlc3NpYmlsaXR5UHJlZmVyZW5jZXMgPSAqbV9hY2Nlc3NpYmlsaXR5UHJl ZmVyZW5jZXM7CisgICAgZWxzZQorICAgICAgICBwYXJhbWV0ZXJzLmFjY2Vzc2liaWxpdHlQcmVm ZXJlbmNlcyA9IGFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcygpOwogfQogCiB2b2lkIFdlYlByb2Nl c3NQb29sOjpwbGF0Zm9ybUluaXRpYWxpemVOZXR3b3JrUHJvY2VzcyhOZXR3b3JrUHJvY2Vzc0Ny ZWF0aW9uUGFyYW1ldGVycyYgcGFyYW1ldGVycykK 432927 2021-07-06 07:43:07 -0700 2021-07-06 10:25:13 -0700 Patch bug-227617-20210706164305.patch text/plain 13072 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzk1ODApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDIxLTA3LTA2ICBQZXIgQXJuZSAg PHB2b2xsYW5AYXBwbGUuY29tPgorCisgICAgICAgIENvbGxlY3QgQWNjZXNzaWJpbGl0eSBwcmVm ZXJlbmNlcyBvbiBhIGJhY2tncm91bmQgcXVldWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzYxNworICAgICAgICA8cmRhcjovLzgwMDU1MTY4Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRvIGF2b2lk IGJsb2NraW5nIHRoZSBtYWluIHRocmVhZCBvZiB0aGUgVUkgcHJvY2VzcywgY29sbGVjdCBNZWRp YSBBY2Nlc3NpYmlsaXR5IHByZWZlcmVuY2VzIG9uIGEgYmFja2dyb3VuZCB0aHJlYWQsCisgICAg ICAgIGFuZCBzZW5kIHRoZW0gdG8gdGhlIFdlYkNvbnRlbnQgcHJvY2VzcyhlcykuCisKKyAgICAg ICAgKiBTaGFyZWQvQWNjZXNzaWJpbGl0eVByZWZlcmVuY2VzLmNwcDoKKyAgICAgICAgKElQQzo6 QXJndW1lbnRDb2RlcjxXZWJLaXQ6OkFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcz46OmVuY29kZSk6 CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8V2ViS2l0OjpBY2Nlc3NpYmlsaXR5UHJlZmVy ZW5jZXM+OjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9BY2Nlc3NpYmlsaXR5UHJlZmVyZW5j ZXMuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbToK KyAgICAgICAgKFdlYktpdDo6YWNjZXNzaWJpbGl0eVByZWZlcmVuY2VzKToKKyAgICAgICAgKFdl YktpdDo6V2ViUHJvY2Vzc1Bvb2w6OnNldE1lZGlhQWNjZXNzaWJpbGl0eVByZWZlcmVuY2VzKToK KyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6Om1lZGlhQWNjZXNzaWJpbGl0eVByZWZl cmVuY2VzQ2hhbmdlZENhbGxiYWNrKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6 OnJlZ2lzdGVyTm90aWZpY2F0aW9uT2JzZXJ2ZXJzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi UHJvY2Vzc1Bvb2wuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6aW5pdGlh bGl6ZU5ld1dlYlByb2Nlc3MpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5o OgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oOgorICAgICAgICAqIFdlYlByb2Nl c3MvV2ViUHJvY2Vzcy5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL1dl YlByb2Nlc3NDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6YWNjZXNzaWJp bGl0eVByZWZlcmVuY2VzRGlkQ2hhbmdlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6 c2V0TWVkaWFBY2Nlc3NpYmlsaXR5UHJlZmVyZW5jZXMpOgorCiAyMDIxLTA3LTA2ICBBbGV4YW5k ZXIgTWlraGF5bGVua28gIDxhbGV4bUBnbm9tZS5vcmc+CiAKICAgICAgICAgW0dUSzRdIE5hdmln YXRpb24gc3dpcGUgZG9lc24ndCB3b3JrIHdoZW4gdGhlIHBhZ2Ugc2Nyb2xscyBob3Jpem9udGFs bHkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL0FjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcy5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvQWNjZXNzaWJpbGl0eVByZWZl cmVuY2VzLmNwcAkocmV2aXNpb24gMjc5NDUzKQorKysgU291cmNlL1dlYktpdC9TaGFyZWQvQWNj ZXNzaWJpbGl0eVByZWZlcmVuY2VzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzcsMTAgKzM3LDYg QEAgdm9pZCBBcmd1bWVudENvZGVyPFdlYktpdDo6QWNjZXNzaWJpbGl0eQogICAgIGVuY29kZXIg PDwgcHJlZmVyZW5jZXMuZGFya2VuU3lzdGVtQ29sb3JzOwogICAgIGVuY29kZXIgPDwgcHJlZmVy ZW5jZXMuaW52ZXJ0Q29sb3JzRW5hYmxlZDsKICNlbmRpZgotI2lmIEhBVkUoTUVESUFfQUNDRVNT SUJJTElUWV9GUkFNRVdPUkspCi0gICAgZW5jb2RlciA8PCBwcmVmZXJlbmNlcy5jYXB0aW9uRGlz cGxheU1vZGU7Ci0gICAgZW5jb2RlciA8PCBwcmVmZXJlbmNlcy5wcmVmZXJyZWRMYW5ndWFnZXM7 Ci0jZW5kaWYKIH0KIAogc3RkOjpvcHRpb25hbDxXZWJLaXQ6OkFjY2Vzc2liaWxpdHlQcmVmZXJl bmNlcz4gQXJndW1lbnRDb2RlcjxXZWJLaXQ6OkFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcz46OmRl Y29kZShEZWNvZGVyJiBkZWNvZGVyKQpAQCAtNTgsMTIgKzU0LDYgQEAgc3RkOjpvcHRpb25hbDxX ZWJLaXQ6OkFjY2Vzc2liaWxpdHlQcmVmZQogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocHJlZmVy ZW5jZXMuaW52ZXJ0Q29sb3JzRW5hYmxlZCkpCiAgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7 CiAjZW5kaWYKLSNpZiBIQVZFKE1FRElBX0FDQ0VTU0lCSUxJVFlfRlJBTUVXT1JLKQotICAgIGlm ICghZGVjb2Rlci5kZWNvZGUocHJlZmVyZW5jZXMuY2FwdGlvbkRpc3BsYXlNb2RlKSkKLSAgICAg ICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHByZWZlcmVu Y2VzLnByZWZlcnJlZExhbmd1YWdlcykpCi0gICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7Ci0j ZW5kaWYKICAgICByZXR1cm4gcHJlZmVyZW5jZXM7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQv U2hhcmVkL0FjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvU2hhcmVkL0FjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcy5oCShyZXZpc2lvbiAyNzk0NTMp CisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9BY2Nlc3NpYmlsaXR5UHJlZmVyZW5jZXMuaAkod29y a2luZyBjb3B5KQpAQCAtMjcsMTAgKzI3LDYgQEAKIAogI2luY2x1ZGUgIkFyZ3VtZW50Q29kZXJz LmgiCiAKLSNpZiBIQVZFKE1FRElBX0FDQ0VTU0lCSUxJVFlfRlJBTUVXT1JLKQotI2luY2x1ZGUg PFdlYkNvcmUvQ2FwdGlvblVzZXJQcmVmZXJlbmNlcy5oPgotI2VuZGlmCi0KICNpZiBIQVZFKFBF Ul9BUFBfQUNDRVNTSUJJTElUWV9QUkVGRVJFTkNFUykKICNpbmNsdWRlICJBY2Nlc3NpYmlsaXR5 U3VwcG9ydFNQSS5oIgogI2VuZGlmCkBAIC00NSwxMCArNDEsNiBAQCBzdHJ1Y3QgQWNjZXNzaWJp bGl0eVByZWZlcmVuY2VzIHsKICAgICBBWFZhbHVlU3RhdGUgZGFya2VuU3lzdGVtQ29sb3JzIHsg QVhWYWx1ZVN0YXRlRW1wdHkgfTsKICAgICBBWFZhbHVlU3RhdGUgaW52ZXJ0Q29sb3JzRW5hYmxl ZCB7IEFYVmFsdWVTdGF0ZUVtcHR5IH07CiAjZW5kaWYKLSNpZiBIQVZFKE1FRElBX0FDQ0VTU0lC SUxJVFlfRlJBTUVXT1JLKQotICAgIFdlYkNvcmU6OkNhcHRpb25Vc2VyUHJlZmVyZW5jZXM6OkNh cHRpb25EaXNwbGF5TW9kZSBjYXB0aW9uRGlzcGxheU1vZGU7Ci0gICAgVmVjdG9yPFN0cmluZz4g cHJlZmVycmVkTGFuZ3VhZ2VzOwotI2VuZGlmCiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK SW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAJKHJldmlz aW9uIDI3OTQ1MykKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNw cAkod29ya2luZyBjb3B5KQpAQCAtODE0LDYgKzgxNCwxMCBAQCB2b2lkIFdlYlByb2Nlc3NQb29s Ojppbml0aWFsaXplTmV3V2ViUHJvCiAKICAgICBwcm9jZXNzLnNlbmQoTWVzc2FnZXM6OldlYlBy b2Nlc3M6OkluaXRpYWxpemVXZWJQcm9jZXNzKHBhcmFtZXRlcnMpLCAwKTsKIAorI2lmIEhBVkUo TUVESUFfQUNDRVNTSUJJTElUWV9GUkFNRVdPUkspCisgICAgc2V0TWVkaWFBY2Nlc3NpYmlsaXR5 UHJlZmVyZW5jZXMocHJvY2Vzcyk7CisjZW5kaWYKKwogICAgIGlmIChtX2F1dG9tYXRpb25TZXNz aW9uKQogICAgICAgICBwcm9jZXNzLnNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3M6OkVuc3VyZUF1 dG9tYXRpb25TZXNzaW9uUHJveHkobV9hdXRvbWF0aW9uU2Vzc2lvbi0+c2Vzc2lvbklkZW50aWZp ZXIoKSksIDApOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9v bC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29s LmgJKHJldmlzaW9uIDI3OTQ1MykKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nl c3NQb29sLmgJKHdvcmtpbmcgY29weSkKQEAgLTU3NSw2ICs1NzUsMTAgQEAgcHJpdmF0ZToKICAg ICBzdGF0aWMgdm9pZCBhY2Nlc3NpYmlsaXR5UHJlZmVyZW5jZXNDaGFuZ2VkQ2FsbGJhY2soQ0ZO b3RpZmljYXRpb25DZW50ZXJSZWYsIHZvaWQgKm9ic2VydmVyLCBDRlN0cmluZ1JlZiBuYW1lLCBj b25zdCB2b2lkICosIENGRGljdGlvbmFyeVJlZiB1c2VySW5mbyk7CiAjZW5kaWYKIAorI2lmIEhB VkUoTUVESUFfQUNDRVNTSUJJTElUWV9GUkFNRVdPUkspCisgICAgc3RhdGljIHZvaWQgbWVkaWFB Y2Nlc3NpYmlsaXR5UHJlZmVyZW5jZXNDaGFuZ2VkQ2FsbGJhY2soQ0ZOb3RpZmljYXRpb25DZW50 ZXJSZWYsIHZvaWQgKm9ic2VydmVyLCBDRlN0cmluZ1JlZiBuYW1lLCBjb25zdCB2b2lkICosIENG RGljdGlvbmFyeVJlZiB1c2VySW5mbyk7CisjZW5kaWYKKwogI2lmIFBMQVRGT1JNKE1BQykKICAg ICBzdGF0aWMgdm9pZCBjb2xvclByZWZlcmVuY2VzRGlkQ2hhbmdlQ2FsbGJhY2soQ0ZOb3RpZmlj YXRpb25DZW50ZXJSZWYsIHZvaWQgKm9ic2VydmVyLCBDRlN0cmluZ1JlZiBuYW1lLCBjb25zdCB2 b2lkICosIENGRGljdGlvbmFyeVJlZiB1c2VySW5mbyk7CiAjZW5kaWYKQEAgLTU5MSw2ICs1OTUs MTAgQEAgcHJpdmF0ZToKICAgICB2b2lkIHN5c3RlbURpZFdha2UoKSBmaW5hbDsKICNlbmRpZgog CisjaWYgSEFWRShNRURJQV9BQ0NFU1NJQklMSVRZX0ZSQU1FV09SSykKKyAgICB2b2lkIHNldE1l ZGlhQWNjZXNzaWJpbGl0eVByZWZlcmVuY2VzKFdlYlByb2Nlc3NQcm94eSYpOworI2VuZGlmCisK ICAgICBSZWY8QVBJOjpQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24+IG1fY29uZmlndXJhdGlvbjsK IAogICAgIElQQzo6TWVzc2FnZVJlY2VpdmVyTWFwIG1fbWVzc2FnZVJlY2VpdmVyTWFwOwpJbmRl eDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9v bENvY29hLm1tCShyZXZpc2lvbiAyNzk0NTMpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9D b2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xNjgsNiArMTY4 LDM1IEBAIE5TTXV0YWJsZURpY3Rpb25hcnkgKldlYlByb2Nlc3NQb29sOjplbnMKICAgICByZXR1 cm4gbV9idW5kbGVQYXJhbWV0ZXJzLmdldCgpOwogfQogCitzdGF0aWMgQWNjZXNzaWJpbGl0eVBy ZWZlcmVuY2VzIGFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcygpCit7CisgICAgQWNjZXNzaWJpbGl0 eVByZWZlcmVuY2VzIHByZWZlcmVuY2VzOworI2lmIEhBVkUoUEVSX0FQUF9BQ0NFU1NJQklMSVRZ X1BSRUZFUkVOQ0VTKQorICAgIGF1dG8gYXBwSWQgPSBXZWJDb3JlOjphcHBsaWNhdGlvbkJ1bmRs ZUlkZW50aWZpZXIoKS5jcmVhdGVDRlN0cmluZygpOworCisgICAgcHJlZmVyZW5jZXMucmVkdWNl TW90aW9uRW5hYmxlZCA9IF9BWFNSZWR1Y2VNb3Rpb25FbmFibGVkQXBwKGFwcElkLmdldCgpKTsK KyAgICBwcmVmZXJlbmNlcy5pbmNyZWFzZUJ1dHRvbkxlZ2liaWxpdHkgPSBfQVhTSW5jcmVhc2VC dXR0b25MZWdpYmlsaXR5QXBwKGFwcElkLmdldCgpKTsKKyAgICBwcmVmZXJlbmNlcy5lbmhhbmNl VGV4dExlZ2liaWxpdHkgPSBfQVhTRW5oYW5jZVRleHRMZWdpYmlsaXR5RW5hYmxlZEFwcChhcHBJ ZC5nZXQoKSk7CisgICAgcHJlZmVyZW5jZXMuZGFya2VuU3lzdGVtQ29sb3JzID0gX0FYRGFya2Vu U3lzdGVtQ29sb3JzQXBwKGFwcElkLmdldCgpKTsKKyAgICBwcmVmZXJlbmNlcy5pbnZlcnRDb2xv cnNFbmFibGVkID0gX0FYU0ludmVydENvbG9yc0VuYWJsZWRBcHAoYXBwSWQuZ2V0KCkpOworI2Vu ZGlmCisgICAgcmV0dXJuIHByZWZlcmVuY2VzOworfQorCisjaWYgSEFWRShNRURJQV9BQ0NFU1NJ QklMSVRZX0ZSQU1FV09SSykKK3ZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnNldE1lZGlhQWNjZXNzaWJp bGl0eVByZWZlcmVuY2VzKFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcykKK3sKKyAgICBkaXNwYXRj aF9hc3luYyhkaXNwYXRjaF9nZXRfZ2xvYmFsX3F1ZXVlKERJU1BBVENIX1FVRVVFX1BSSU9SSVRZ X0RFRkFVTFQsIDApLCBbd2Vha1Byb2Nlc3MgPSBtYWtlV2Vha1B0cihwcm9jZXNzKV0geworICAg ICAgICBhdXRvIGNhcHRpb25EaXNwbGF5TW9kZSA9IFdlYkNvcmU6OkNhcHRpb25Vc2VyUHJlZmVy ZW5jZXNNZWRpYUFGOjpwbGF0Zm9ybUNhcHRpb25EaXNwbGF5TW9kZSgpOworICAgICAgICBhdXRv IHByZWZlcnJlZExhbmd1YWdlcyA9IFdlYkNvcmU6OkNhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRp YUFGOjpwbGF0Zm9ybVByZWZlcnJlZExhbmd1YWdlcygpOworICAgICAgICBjYWxsT25NYWluUnVu TG9vcChbd2Vha1Byb2Nlc3MsIGNhcHRpb25EaXNwbGF5TW9kZSwgcHJlZmVycmVkTGFuZ3VhZ2Vz XSB7CisgICAgICAgICAgICBpZiAod2Vha1Byb2Nlc3MpCisgICAgICAgICAgICAgICAgd2Vha1By b2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3M6OlNldE1lZGlhQWNjZXNzaWJpbGl0eVBy ZWZlcmVuY2VzKGNhcHRpb25EaXNwbGF5TW9kZSwgcHJlZmVycmVkTGFuZ3VhZ2VzKSwgMCk7Cisg ICAgICAgIH0pOworICAgIH0pOworfQorI2VuZGlmCisKIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnBs YXRmb3JtSW5pdGlhbGl6ZSgpCiB7CiAgICAgcmVnaXN0ZXJVc2VyRGVmYXVsdHNJZk5lZWRlZCgp OwpAQCAtMjczLDI1ICszMDIsNiBAQCBzdGF0aWMgYm9vbCByZXF1aXJlc0NvbnRhaW5lck1hbmFn ZXJBY2NlCiAjZW5kaWYKIH0KIAotc3RhdGljIEFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcyBhY2Nl c3NpYmlsaXR5UHJlZmVyZW5jZXMoKQotewotICAgIEFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcyBw cmVmZXJlbmNlczsKLSNpZiBIQVZFKFBFUl9BUFBfQUNDRVNTSUJJTElUWV9QUkVGRVJFTkNFUykK LSAgICBhdXRvIGFwcElkID0gV2ViQ29yZTo6YXBwbGljYXRpb25CdW5kbGVJZGVudGlmaWVyKCku Y3JlYXRlQ0ZTdHJpbmcoKTsKLQotICAgIHByZWZlcmVuY2VzLnJlZHVjZU1vdGlvbkVuYWJsZWQg PSBfQVhTUmVkdWNlTW90aW9uRW5hYmxlZEFwcChhcHBJZC5nZXQoKSk7Ci0gICAgcHJlZmVyZW5j ZXMuaW5jcmVhc2VCdXR0b25MZWdpYmlsaXR5ID0gX0FYU0luY3JlYXNlQnV0dG9uTGVnaWJpbGl0 eUFwcChhcHBJZC5nZXQoKSk7Ci0gICAgcHJlZmVyZW5jZXMuZW5oYW5jZVRleHRMZWdpYmlsaXR5 ID0gX0FYU0VuaGFuY2VUZXh0TGVnaWJpbGl0eUVuYWJsZWRBcHAoYXBwSWQuZ2V0KCkpOwotICAg IHByZWZlcmVuY2VzLmRhcmtlblN5c3RlbUNvbG9ycyA9IF9BWERhcmtlblN5c3RlbUNvbG9yc0Fw cChhcHBJZC5nZXQoKSk7Ci0gICAgcHJlZmVyZW5jZXMuaW52ZXJ0Q29sb3JzRW5hYmxlZCA9IF9B WFNJbnZlcnRDb2xvcnNFbmFibGVkQXBwKGFwcElkLmdldCgpKTsKLSNlbmRpZgotI2lmIEhBVkUo TUVESUFfQUNDRVNTSUJJTElUWV9GUkFNRVdPUkspCi0gICAgcHJlZmVyZW5jZXMuY2FwdGlvbkRp c3BsYXlNb2RlID0gV2ViQ29yZTo6Q2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OnBsYXRm b3JtQ2FwdGlvbkRpc3BsYXlNb2RlKCk7Ci0gICAgcHJlZmVyZW5jZXMucHJlZmVycmVkTGFuZ3Vh Z2VzID0gV2ViQ29yZTo6Q2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OnBsYXRmb3JtUHJl ZmVycmVkTGFuZ3VhZ2VzKCk7Ci0jZW5kaWYKLSAgICByZXR1cm4gcHJlZmVyZW5jZXM7Ci19Ci0K IHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MoY29uc3Qg V2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzLCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJiBw YXJhbWV0ZXJzKQogewogICAgIHBhcmFtZXRlcnMubWVkaWFNSU1FVHlwZXMgPSBwcm9jZXNzLm1l ZGlhTUlNRVR5cGVzKCk7CkBAIC01OTgsNiArNjA4LDE2IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6 OmFjY2Vzc2liaWxpdHlQcmVmZXIKICAgICBwb29sLT5zZW5kVG9BbGxQcm9jZXNzZXMoTWVzc2Fn ZXM6OldlYlByb2Nlc3M6OkFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlc0RpZENoYW5nZShhY2Nlc3Np YmlsaXR5UHJlZmVyZW5jZXMoKSkpOwogfQogCisjaWYgSEFWRShNRURJQV9BQ0NFU1NJQklMSVRZ X0ZSQU1FV09SSykKK3ZvaWQgV2ViUHJvY2Vzc1Bvb2w6Om1lZGlhQWNjZXNzaWJpbGl0eVByZWZl cmVuY2VzQ2hhbmdlZENhbGxiYWNrKENGTm90aWZpY2F0aW9uQ2VudGVyUmVmLCB2b2lkICpvYnNl cnZlciwgQ0ZTdHJpbmdSZWYgbmFtZSwgY29uc3Qgdm9pZCAqLCBDRkRpY3Rpb25hcnlSZWYgdXNl ckluZm8pCit7CisgICAgYXV0byogcG9vbCA9IHJlaW50ZXJwcmV0X2Nhc3Q8V2ViUHJvY2Vzc1Bv b2wqPihvYnNlcnZlcik7CisgICAgYXV0byBjYXB0aW9uRGlzcGxheU1vZGUgPSBXZWJDb3JlOjpD YXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRjo6cGxhdGZvcm1DYXB0aW9uRGlzcGxheU1vZGUo KTsKKyAgICBhdXRvIHByZWZlcnJlZExhbmd1YWdlcyA9IFdlYkNvcmU6OkNhcHRpb25Vc2VyUHJl ZmVyZW5jZXNNZWRpYUFGOjpwbGF0Zm9ybVByZWZlcnJlZExhbmd1YWdlcygpOworICAgIHBvb2wt PnNlbmRUb0FsbFByb2Nlc3NlcyhNZXNzYWdlczo6V2ViUHJvY2Vzczo6U2V0TWVkaWFBY2Nlc3Np YmlsaXR5UHJlZmVyZW5jZXMoY2FwdGlvbkRpc3BsYXlNb2RlLCBwcmVmZXJyZWRMYW5ndWFnZXMp KTsKK30KKyNlbmRpZgorCiAjaWYgUExBVEZPUk0oTUFDKQogdm9pZCBXZWJQcm9jZXNzUG9vbDo6 Y29sb3JQcmVmZXJlbmNlc0RpZENoYW5nZUNhbGxiYWNrKENGTm90aWZpY2F0aW9uQ2VudGVyUmVm IGNlbnRlciwgdm9pZCAqb2JzZXJ2ZXIsIENGU3RyaW5nUmVmIG5hbWUsIGNvbnN0IHZvaWQgKm9i amVjdCwgQ0ZEaWN0aW9uYXJ5UmVmIHVzZXJJbmZvKQogewpAQCAtNzM1LDcgKzc1NSw3IEBAIHZv aWQgV2ViUHJvY2Vzc1Bvb2w6OnJlZ2lzdGVyTm90aWZpY2F0aW8KICAgICBDRk5vdGlmaWNhdGlv bkNlbnRlckFkZE9ic2VydmVyKENGTm90aWZpY2F0aW9uQ2VudGVyR2V0RGFyd2luTm90aWZ5Q2Vu dGVyKCksIHRoaXMsIGFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlc0NoYW5nZWRDYWxsYmFjaywga0FY U0ludmVydENvbG9yc0VuYWJsZWROb3RpZmljYXRpb24sIG51bGxwdHIsIENGTm90aWZpY2F0aW9u U3VzcGVuc2lvbkJlaGF2aW9yQ29hbGVzY2UpOwogI2VuZGlmCiAjaWYgSEFWRShNRURJQV9BQ0NF U1NJQklMSVRZX0ZSQU1FV09SSykKLSAgICBDRk5vdGlmaWNhdGlvbkNlbnRlckFkZE9ic2VydmVy KENGTm90aWZpY2F0aW9uQ2VudGVyR2V0RGFyd2luTm90aWZ5Q2VudGVyKCksIHRoaXMsIGFjY2Vz c2liaWxpdHlQcmVmZXJlbmNlc0NoYW5nZWRDYWxsYmFjaywga01BWENhcHRpb25BcHBlYXJhbmNl U2V0dGluZ3NDaGFuZ2VkTm90aWZpY2F0aW9uLCBudWxscHRyLCBDRk5vdGlmaWNhdGlvblN1c3Bl bnNpb25CZWhhdmlvckNvYWxlc2NlKTsKKyAgICBDRk5vdGlmaWNhdGlvbkNlbnRlckFkZE9ic2Vy dmVyKENGTm90aWZpY2F0aW9uQ2VudGVyR2V0RGFyd2luTm90aWZ5Q2VudGVyKCksIHRoaXMsIG1l ZGlhQWNjZXNzaWJpbGl0eVByZWZlcmVuY2VzQ2hhbmdlZENhbGxiYWNrLCBrTUFYQ2FwdGlvbkFw cGVhcmFuY2VTZXR0aW5nc0NoYW5nZWROb3RpZmljYXRpb24sIG51bGxwdHIsIENGTm90aWZpY2F0 aW9uU3VzcGVuc2lvbkJlaGF2aW9yQ29hbGVzY2UpOwogI2VuZGlmCiB9CiAKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAkocmV2aXNpb24gMjc5NDUzKQorKysgU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAkod29ya2luZyBjb3B5KQpAQCAtNzEsNiAr NzEsMTAgQEAKICNpbmNsdWRlIDxXZWJDb3JlL1BsYXRmb3JtRGlzcGxheUxpYldQRS5oPgogI2Vu ZGlmCiAKKyNpZiBIQVZFKE1FRElBX0FDQ0VTU0lCSUxJVFlfRlJBTUVXT1JLKQorI2luY2x1ZGUg PFdlYkNvcmUvQ2FwdGlvblVzZXJQcmVmZXJlbmNlcy5oPgorI2VuZGlmCisKIG5hbWVzcGFjZSBB UEkgewogY2xhc3MgT2JqZWN0OwogfQpAQCAtNTY3LDYgKzU3MSw5IEBAIHByaXZhdGU6CiAjZW5k aWYKIAogICAgIHZvaWQgYWNjZXNzaWJpbGl0eVByZWZlcmVuY2VzRGlkQ2hhbmdlKGNvbnN0IEFj Y2Vzc2liaWxpdHlQcmVmZXJlbmNlcyYpOworI2lmIEhBVkUoTUVESUFfQUNDRVNTSUJJTElUWV9G UkFNRVdPUkspCisgICAgdm9pZCBzZXRNZWRpYUFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcyhXZWJD b3JlOjpDYXB0aW9uVXNlclByZWZlcmVuY2VzOjpDYXB0aW9uRGlzcGxheU1vZGUsIGNvbnN0IFZl Y3RvcjxTdHJpbmc+Jik7CisjZW5kaWYKIAogI2lmIFBMQVRGT1JNKE1BQykgfHwgUExBVEZPUk0o TUFDQ0FUQUxZU1QpCiAgICAgdm9pZCBjb2xvclByZWZlcmVuY2VzRGlkQ2hhbmdlKCk7CkluZGV4 OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5tZXNzYWdlcy5pbgo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5tZXNzYWdlcy5pbgko cmV2aXNpb24gMjc5NDUzKQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3Mu bWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTIwMiw0ICsyMDIsOCBAQCBtZXNzYWdlcyAt PiBXZWJQcm9jZXNzIExlZ2FjeVJlY2VpdmVyIE5vCiAgICAgQ29uc3VtZUF1ZGlvQ29tcG9uZW50 UmVnaXN0cmF0aW9ucyhJUEM6OlNoYXJlZEJ1ZmZlckRhdGFSZWZlcmVuY2UgcmVnaXN0cmF0aW9u RGF0YSkKICAgICBBY2Nlc3NpYmlsaXR5UHJlZmVyZW5jZXNEaWRDaGFuZ2Uoc3RydWN0IFdlYktp dDo6QWNjZXNzaWJpbGl0eVByZWZlcmVuY2VzIGFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcykKICNl bmRpZgorCisjaWYgSEFWRShNRURJQV9BQ0NFU1NJQklMSVRZX0ZSQU1FV09SSykKKyAgICBTZXRN ZWRpYUFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcyhXZWJDb3JlOjpDYXB0aW9uVXNlclByZWZlcmVu Y2VzOjpDYXB0aW9uRGlzcGxheU1vZGUgZGlzcGxheU1vZGUsIFZlY3RvcjxTdHJpbmc+IGxhbmd1 YWdlcykKKyNlbmRpZgogfQpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dl YlByb2Nlc3NDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv Y29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCShyZXZpc2lvbiAyNzk0NTMpCisrKyBTb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBA IC0xMTExLDExICsxMTExLDE1IEBAIHZvaWQgV2ViUHJvY2Vzczo6YWNjZXNzaWJpbGl0eVByZWZl cmVuY2UKICAgICBpZiAoX0FYU0ludmVydENvbG9yc0VuYWJsZWRBcHAoYXBwSUQpICE9IGludmVy dENvbG9yc0VuYWJsZWQpCiAgICAgICAgIF9BWFNJbnZlcnRDb2xvcnNTZXRFbmFibGVkQXBwKGlu dmVydENvbG9yc0VuYWJsZWQsIGFwcElEKTsKICNlbmRpZgorfQorCiAjaWYgSEFWRShNRURJQV9B Q0NFU1NJQklMSVRZX0ZSQU1FV09SSykKLSAgICBXZWJDb3JlOjpDYXB0aW9uVXNlclByZWZlcmVu Y2VzTWVkaWFBRjo6c2V0Q2FjaGVkQ2FwdGlvbkRpc3BsYXlNb2RlKHByZWZlcmVuY2VzLmNhcHRp b25EaXNwbGF5TW9kZSk7Ci0gICAgV2ViQ29yZTo6Q2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlh QUY6OnNldENhY2hlZFByZWZlcnJlZExhbmd1YWdlcyhwcmVmZXJlbmNlcy5wcmVmZXJyZWRMYW5n dWFnZXMpOwotI2VuZGlmCit2b2lkIFdlYlByb2Nlc3M6OnNldE1lZGlhQWNjZXNzaWJpbGl0eVBy ZWZlcmVuY2VzKFdlYkNvcmU6OkNhcHRpb25Vc2VyUHJlZmVyZW5jZXM6OkNhcHRpb25EaXNwbGF5 TW9kZSBjYXB0aW9uRGlzcGxheU1vZGUsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwcmVmZXJyZWRM YW5ndWFnZXMpCit7CisgICAgV2ViQ29yZTo6Q2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6 OnNldENhY2hlZENhcHRpb25EaXNwbGF5TW9kZShjYXB0aW9uRGlzcGxheU1vZGUpOworICAgIFdl YkNvcmU6OkNhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGOjpzZXRDYWNoZWRQcmVmZXJyZWRM YW5ndWFnZXMocHJlZmVycmVkTGFuZ3VhZ2VzKTsKIH0KKyNlbmRpZgogCiAjaWYgUExBVEZPUk0o TUFDKSB8fCBQTEFURk9STShNQUNDQVRBTFlTVCkKIHZvaWQgV2ViUHJvY2Vzczo6Y29sb3JQcmVm ZXJlbmNlc0RpZENoYW5nZSgpCg==