223211 2021-03-15 13:25:36 -0700 Protect this in all PlatformOpenXR queue->dispatch() calls 2021-03-16 01:54:58 -0700 1 1 1 Unclassified WebKit WebXR WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 208988 1 ifernandez ifernandez cdumez webkit-bug-importer youennf oldest_to_newest 1739632 0 ifernandez 2021-03-15 13:25:36 -0700 As discussed in https://bugs.webkit.org/show_bug.cgi?id=222607, the WorkQueue may outlive OpenXRDevice so m_queue->dispatch([this] { /*do something with this*/}); is unsafe. 1739637 1 423231 ifernandez 2021-03-15 13:37:49 -0700 Created attachment 423231 Patch 1739641 2 423231 cdumez 2021-03-15 13:42:23 -0700 Comment on attachment 423231 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423231&action=review > Source/WebCore/platform/xr/PlatformXR.h:65 > +class Device : public RefCounted<Device>, public CanMakeWeakPtr<Device> { You want ThreadSafeRefCounted since you are passing this to another thread. > Source/WebCore/platform/xr/openxr/PlatformXROpenXR.h:50 > + virtual ~OpenXRDevice(); I don't think we need the `virtual`. 1739651 3 423233 ifernandez 2021-03-15 13:55:00 -0700 Created attachment 423233 Patch Thanks for the quick review! I added ThreadSafeRefCounted and removed the unneeded virtual destructor in the inherited class 1739653 4 423233 cdumez 2021-03-15 14:00:07 -0700 Comment on attachment 423233 Patch r=me if the bots are happy. 1739873 5 ews-feeder 2021-03-16 01:45:56 -0700 Committed r274470: <https://commits.webkit.org/r274470> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423233. 1739874 6 webkit-bug-importer 2021-03-16 01:46:15 -0700 <rdar://problem/75468705> 423231 2021-03-15 13:37:49 -0700 2021-03-15 13:54:56 -0700 Patch bug-223211-20210315213748.patch text/plain 9325 ifernandez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NDE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWJmNDc4OWYyMmE2OTA3 MzY0ZTQyNWUxZmNhYTJkOTI3MDQ2NTRlYS4uMGRhODBhNjg4MWE5MTQ3NTZmNWYxZTg4YjBhMzJk MWM4ZjQ3MDU5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTAzLTE1ICBJbWFu b2wgRmVybmFuZGV6ICA8aWZlcm5hbmRlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFByb3RlY3Qg dGhpcyBpbiBhbGwgUGxhdGZvcm1PcGVuWFIgcXVldWUtPmRpc3BhdGNoKCkgY2FsbHMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzIxMQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBPcGVuWFIgV29y a1F1ZXVlIG1heSBvdXRsaXZlIE9wZW5YUkRldmljZSBzbyBxdWV1ZS0+ZGlzcGF0Y2goKSBjYWxs cyB3aXRob3V0IHByb3RlY3RpbmcgdGhpcyBhcmUgdW5zYWZlLgorCisgICAgICAgICogTW9kdWxl cy93ZWJ4ci9XZWJYUlN5c3RlbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJYUlN5c3RlbTo6 ZW5zdXJlSW1tZXJzaXZlWFJEZXZpY2VJc1NlbGVjdGVkKToKKyAgICAgICAgKiBwbGF0Zm9ybS94 ci9QbGF0Zm9ybVhSLmg6CisgICAgICAgICogcGxhdGZvcm0veHIvb3BlbnhyL09wZW5YUkluc3Rh bmNlLmNwcDoKKyAgICAgICAgKFBsYXRmb3JtWFI6Okluc3RhbmNlOjpJbXBsOjp+SW1wbCk6Cisg ICAgICAgIChQbGF0Zm9ybVhSOjpJbnN0YW5jZTo6ZW51bWVyYXRlSW1tZXJzaXZlWFJEZXZpY2Vz KToKKyAgICAgICAgKiBwbGF0Zm9ybS94ci9vcGVueHIvUGxhdGZvcm1YUk9wZW5YUi5jcHA6Cisg ICAgICAgIChQbGF0Zm9ybVhSOjpPcGVuWFJEZXZpY2U6OmNyZWF0ZSk6CisgICAgICAgIChQbGF0 Zm9ybVhSOjpPcGVuWFJEZXZpY2U6Ok9wZW5YUkRldmljZSk6CisgICAgICAgIChQbGF0Zm9ybVhS OjpPcGVuWFJEZXZpY2U6OmluaXRpYWxpemUpOgorICAgICAgICAoUGxhdGZvcm1YUjo6T3BlblhS RGV2aWNlOjppbml0aWFsaXplVHJhY2tpbmdBbmRSZW5kZXJpbmcpOgorICAgICAgICAoUGxhdGZv cm1YUjo6T3BlblhSRGV2aWNlOjpzaHV0RG93blRyYWNraW5nQW5kUmVuZGVyaW5nKToKKyAgICAg ICAgKFBsYXRmb3JtWFI6Ok9wZW5YUkRldmljZTo6cmVxdWVzdEZyYW1lKToKKyAgICAgICAgKFBs YXRmb3JtWFI6Ok9wZW5YUkRldmljZTo6d2FpdFVudGlsU3RvcHBpbmcpOgorICAgICAgICAqIHBs YXRmb3JtL3hyL29wZW54ci9QbGF0Zm9ybVhST3BlblhSLmg6CisKIDIwMjEtMDMtMTUgIEltYW5v bCBGZXJuYW5kZXogIDxpZmVybmFuZGV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgU3BsaXQgV2Vi WFIgZmVhdHVyZXMgaW50byBlbmFibGVkRmVhdHVyZXMsIHN1cHBvcnRlZEZlYXR1cmVzIGFuZCBy ZXF1ZXN0ZWRGZWF0dXJlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJ4 ci9XZWJYUlN5c3RlbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnhyL1dlYlhSU3lz dGVtLmNwcAppbmRleCA2N2ZiNjYzYzc2MTE0NDM4ZWVhZGEzZjliODE0NzMyOTc4OGE1M2I5Li4w OWJjOGJlNTYyZTY4MjczNDVlMzQxYzVmMTE5MzliOTU5MDI1YjE3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnhyL1dlYlhSU3lzdGVtLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL3dlYnhyL1dlYlhSU3lzdGVtLmNwcApAQCAtMTAwLDcgKzEwMCw3IEBAIHZv aWQgV2ViWFJTeXN0ZW06OmVuc3VyZUltbWVyc2l2ZVhSRGV2aWNlSXNTZWxlY3RlZChDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKCk+JiYKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0g ICAgICAgIGlmIChtX2FjdGl2ZUltbWVyc2l2ZVNlc3Npb24gJiYgb2xkRGV2aWNlICYmIGltbWVy c2l2ZVhSRGV2aWNlcy5maW5kTWF0Y2hpbmcoWyZdKGF1dG8mIGVudHJ5KSB7IHJldHVybiAmZW50 cnkgPT0gb2xkRGV2aWNlOyB9KSAhPSBub3RGb3VuZCkKKyAgICAgICAgaWYgKG1fYWN0aXZlSW1t ZXJzaXZlU2Vzc2lvbiAmJiBvbGREZXZpY2UgJiYgaW1tZXJzaXZlWFJEZXZpY2VzLmZpbmRNYXRj aGluZyhbJl0oYXV0byYgZW50cnkpIHsgcmV0dXJuIGVudHJ5LnB0cigpID09IG9sZERldmljZTsg fSkgIT0gbm90Rm91bmQpCiAgICAgICAgICAgICBBU1NFUlQobV9hY3RpdmVJbW1lcnNpdmVEZXZp Y2UuZ2V0KCkgPT0gb2xkRGV2aWNlKTsKICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICAvLyBG SVhNRTogaW1wbGVtZW50IGEgYmV0dGVyIFVBIHNlbGVjdGlvbiBtZWNoYW5pc20gaWYgcmVxdWly ZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS94ci9QbGF0Zm9ybVhSLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS94ci9QbGF0Zm9ybVhSLmgKaW5kZXggNzI0NmUzMjg4 MDVhMTdkYmRkNjFhYTBkMzU1MWNlMDAyYWJkNTUxOS4uYzA5OWQ3YzA3YzNlNjRjMGNmMDdlNzRh YzFmYmE5YjdlYjdjZGE0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0veHIv UGxhdGZvcm1YUi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3hyL1BsYXRmb3JtWFIu aApAQCAtMjMsNiArMjMsNyBAQAogI2luY2x1ZGUgPG1lbW9yeT4KICNpbmNsdWRlIDx3dGYvQ29t cGxldGlvbkhhbmRsZXIuaD4KICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgorI2luY2x1ZGUgPHd0 Zi9SZWYuaD4KICNpbmNsdWRlIDx3dGYvVW5pcXVlUmVmLmg+CiAjaW5jbHVkZSA8d3RmL1Zhcmlh bnQuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CkBAIC02MSw3ICs2Miw3IEBAIHB1YmxpYzoK ICAgICAvLyBGSVhNRTogaGFuZGxlIHZpc2liaWxpdHkgY2hhbmdlcwogfTsKIAotY2xhc3MgRGV2 aWNlIDogcHVibGljIENhbk1ha2VXZWFrUHRyPERldmljZT4geworY2xhc3MgRGV2aWNlIDogcHVi bGljIFJlZkNvdW50ZWQ8RGV2aWNlPiwgcHVibGljIENhbk1ha2VXZWFrUHRyPERldmljZT4gewog ICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKERl dmljZSk7CiBwdWJsaWM6CkBAIC0xNTksNyArMTYwLDcgQEAgY2xhc3MgSW5zdGFuY2UgewogcHVi bGljOgogICAgIHN0YXRpYyBJbnN0YW5jZSYgc2luZ2xldG9uKCk7CiAKLSAgICB1c2luZyBEZXZp Y2VMaXN0ID0gVmVjdG9yPFVuaXF1ZVJlZjxEZXZpY2U+PjsKKyAgICB1c2luZyBEZXZpY2VMaXN0 ID0gVmVjdG9yPFJlZjxEZXZpY2U+PjsKICAgICB2b2lkIGVudW1lcmF0ZUltbWVyc2l2ZVhSRGV2 aWNlcyhDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IERldmljZUxpc3QmKT4mJik7CiAKIHBy aXZhdGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS94ci9vcGVueHIvT3Bl blhSSW5zdGFuY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0veHIvb3BlbnhyL09wZW5Y Ukluc3RhbmNlLmNwcAppbmRleCA4Y2FjN2E3MWZjNmZjYTFjMGNmNTk3ZTI1MzJmOGYwNDY3MTY5 MjMxLi5kNWNhNzA4NzVmMWRiMjc0YmU4YTY5ZWM1Y2IyMmFmMjA1MGJhNWI0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS94ci9vcGVueHIvT3BlblhSSW5zdGFuY2UuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3hyL29wZW54ci9PcGVuWFJJbnN0YW5jZS5jcHAK QEAgLTg2LDkgKzg2LDkgQEAgSW5zdGFuY2U6OkltcGw6OkltcGwoKQogCiBJbnN0YW5jZTo6SW1w bDo6fkltcGwoKQogewotICAgIG1fd29ya1F1ZXVlLT5kaXNwYXRjaChbdGhpc10gewotICAgICAg ICBpZiAobV9pbnN0YW5jZSAhPSBYUl9OVUxMX0hBTkRMRSkKLSAgICAgICAgICAgIHhyRGVzdHJv eUluc3RhbmNlKG1faW5zdGFuY2UpOworICAgIG1fd29ya1F1ZXVlLT5kaXNwYXRjaChbaW5zdGFu Y2UgPSBtX2luc3RhbmNlXSB7CisgICAgICAgIGlmIChpbnN0YW5jZSAhPSBYUl9OVUxMX0hBTkRM RSkKKyAgICAgICAgICAgIHhyRGVzdHJveUluc3RhbmNlKGluc3RhbmNlKTsKICAgICB9KTsKIH0K IApAQCAtMTMyLDcgKzEzMiw3IEBAIHZvaWQgSW5zdGFuY2U6OmVudW1lcmF0ZUltbWVyc2l2ZVhS RGV2aWNlcyhDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IERldmljZUxpCiAgICAgICAgIGNh bGxiYWNrT25FeGl0LnJlbGVhc2UoKTsKIAogICAgICAgICBjYWxsT25NYWluVGhyZWFkKFt0aGlz LCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spLCBzeXN0ZW1JZF0oKSBtdXRhYmxlIHsKLSAg ICAgICAgICAgIG1faW1tZXJzaXZlWFJEZXZpY2VzID0gRGV2aWNlTGlzdDo6ZnJvbShtYWtlVW5p cXVlUmVmPE9wZW5YUkRldmljZT4obV9pbXBsLT54ckluc3RhbmNlKCksIHN5c3RlbUlkLCBtX2lt cGwtPnF1ZXVlKCksICptX2ltcGwtPmV4dGVuc2lvbnMoKSwgW3RoaXMsIGNhbGxiYWNrID0gV1RG TW92ZShjYWxsYmFjayldKCkgbXV0YWJsZSB7CisgICAgICAgICAgICBtX2ltbWVyc2l2ZVhSRGV2 aWNlcyA9IERldmljZUxpc3Q6OmZyb20oT3BlblhSRGV2aWNlOjpjcmVhdGUobV9pbXBsLT54cklu c3RhbmNlKCksIHN5c3RlbUlkLCBtX2ltcGwtPnF1ZXVlKCksICptX2ltcGwtPmV4dGVuc2lvbnMo KSwgW3RoaXMsIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldKCkgbXV0YWJsZSB7CiAgICAg ICAgICAgICAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAgICAgICAgICAgICAgICBjYWxs YmFjayhtX2ltbWVyc2l2ZVhSRGV2aWNlcyk7CiAgICAgICAgICAgICB9KSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS94ci9vcGVueHIvUGxhdGZvcm1YUk9wZW5YUi5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS94ci9vcGVueHIvUGxhdGZvcm1YUk9wZW5YUi5jcHAK aW5kZXggYTIwMzJjYTA3NmNlNTQ5ZjJiNjU0MzM5ZWQxYjlkMDgzZTJiMmU4My4uYWZmYzE2ZDUx NjdlZTVhYTE2ODM2OGYwM2VlZmVhZmI4ODZlYWVmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0veHIvb3BlbnhyL1BsYXRmb3JtWFJPcGVuWFIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL3hyL29wZW54ci9QbGF0Zm9ybVhST3BlblhSLmNwcApAQCAtNDIsMTQg KzQyLDI3IEBAIHN0YXRpYyBib29sIGlzU2Vzc2lvblJlYWR5KFhyU2Vzc2lvblN0YXRlIHN0YXRl KQogICAgIHJldHVybiBzdGF0ZSA+PSBYUl9TRVNTSU9OX1NUQVRFX1JFQURZICAmJiBzdGF0ZSA8 IFhSX1NFU1NJT05fU1RBVEVfU1RPUFBJTkc7CiB9CiAKLU9wZW5YUkRldmljZTo6T3BlblhSRGV2 aWNlKFhySW5zdGFuY2UgaW5zdGFuY2UsIFhyU3lzdGVtSWQgc3lzdGVtLCBXb3JrUXVldWUmIHF1 ZXVlLCBjb25zdCBPcGVuWFJFeHRlbnNpb25zJiBleHRlbnNpb25zLCBDb21wbGV0aW9uSGFuZGxl cjx2b2lkKCk+JiYgY2FsbGJhY2spCitSZWY8T3BlblhSRGV2aWNlPiBPcGVuWFJEZXZpY2U6OmNy ZWF0ZShYckluc3RhbmNlIGluc3RhbmNlLCBYclN5c3RlbUlkIHN5c3RlbSwgUmVmPFdvcmtRdWV1 ZT4mJiBxdWV1ZSwgY29uc3QgT3BlblhSRXh0ZW5zaW9ucyYgZXh0ZW5zaW9ucywgQ29tcGxldGlv bkhhbmRsZXI8dm9pZCgpPiYmIGNhbGxiYWNrKQoreworICAgIGF1dG8gZGV2aWNlID0gYWRvcHRS ZWYoKm5ldyBPcGVuWFJEZXZpY2UoaW5zdGFuY2UsIHN5c3RlbSwgV1RGTW92ZShxdWV1ZSksIGV4 dGVuc2lvbnMpKTsKKyAgICBkZXZpY2UtPmluaXRpYWxpemUoV1RGTW92ZShjYWxsYmFjaykpOwor ICAgIHJldHVybiBkZXZpY2U7Cit9CisKK09wZW5YUkRldmljZTo6T3BlblhSRGV2aWNlKFhySW5z dGFuY2UgaW5zdGFuY2UsIFhyU3lzdGVtSWQgc3lzdGVtLCBSZWY8V29ya1F1ZXVlPiYmIHF1ZXVl LCBjb25zdCBPcGVuWFJFeHRlbnNpb25zJiBleHRlbnNpb25zKQogICAgIDogbV9pbnN0YW5jZShp bnN0YW5jZSkKICAgICAsIG1fc3lzdGVtSWQoc3lzdGVtKQogICAgICwgbV9xdWV1ZShxdWV1ZSkK ICAgICAsIG1fZXh0ZW5zaW9ucyhleHRlbnNpb25zKQoreworfQorCitPcGVuWFJEZXZpY2U6On5P cGVuWFJEZXZpY2UoKSA9IGRlZmF1bHQ7CisKK3ZvaWQgT3BlblhSRGV2aWNlOjppbml0aWFsaXpl KENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjYWxsYmFjaykKIHsKICAgICBBU1NFUlQoaXNN YWluVGhyZWFkKCkpOwotICAgIG1fcXVldWUuZGlzcGF0Y2goW3RoaXMsIGNhbGxiYWNrID0gV1RG TW92ZShjYWxsYmFjayldKCkgbXV0YWJsZSB7CisgICAgbV9xdWV1ZS5kaXNwYXRjaChbdGhpcywg cHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJh Y2spXSgpIG11dGFibGUgewogICAgICAgICBhdXRvIHN5c3RlbVByb3BlcnRpZXMgPSBjcmVhdGVT dHJ1Y3R1cmU8WHJTeXN0ZW1Qcm9wZXJ0aWVzLCBYUl9UWVBFX1NZU1RFTV9QUk9QRVJUSUVTPigp OwogICAgICAgICBhdXRvIHJlc3VsdCA9IHhyR2V0U3lzdGVtUHJvcGVydGllcyhtX2luc3RhbmNl LCBtX3N5c3RlbUlkLCAmc3lzdGVtUHJvcGVydGllcyk7CiAgICAgICAgIGlmIChYUl9TVUNDRUVE RUQocmVzdWx0KSkKQEAgLTc4LDcgKzkxLDcgQEAgV2ViQ29yZTo6SW50U2l6ZSBPcGVuWFJEZXZp Y2U6OnJlY29tbWVuZGVkUmVzb2x1dGlvbihTZXNzaW9uTW9kZSBtb2RlKQogCiB2b2lkIE9wZW5Y UkRldmljZTo6aW5pdGlhbGl6ZVRyYWNraW5nQW5kUmVuZGVyaW5nKFNlc3Npb25Nb2RlIG1vZGUp CiB7Ci0gICAgbV9xdWV1ZS5kaXNwYXRjaChbdGhpcywgbW9kZV0oKSB7CisgICAgbV9xdWV1ZS5k aXNwYXRjaChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBtb2RlXSgpIHsK ICAgICAgICAgQVNTRVJUKG1faW5zdGFuY2UgIT0gWFJfTlVMTF9IQU5ETEUpOwogICAgICAgICBB U1NFUlQobV9zZXNzaW9uID09IFhSX05VTExfSEFORExFKTsKICAgICAgICAgQVNTRVJUKG1fZXh0 ZW5zaW9ucy5tZXRob2RzKCkueHJHZXRPcGVuR0xHcmFwaGljc1JlcXVpcmVtZW50c0tIUik7CkBA IC0xMjMsNyArMTM2LDcgQEAgdm9pZCBPcGVuWFJEZXZpY2U6OmluaXRpYWxpemVUcmFja2luZ0Fu ZFJlbmRlcmluZyhTZXNzaW9uTW9kZSBtb2RlKQogCiB2b2lkIE9wZW5YUkRldmljZTo6c2h1dERv d25UcmFja2luZ0FuZFJlbmRlcmluZygpCiB7Ci0gICAgbV9xdWV1ZS5kaXNwYXRjaChbdGhpc10o KSB7CisgICAgbV9xdWV1ZS5kaXNwYXRjaChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYo KnRoaXMpXSgpIHsKICAgICAgICAgaWYgKG1fc2Vzc2lvbiA9PSBYUl9OVUxMX0hBTkRMRSkKICAg ICAgICAgICAgIHJldHVybjsKIApAQCAtMTQ5LDcgKzE2Miw3IEBAIHZvaWQgT3BlblhSRGV2aWNl Ojppbml0aWFsaXplUmVmZXJlbmNlU3BhY2UoUGxhdGZvcm1YUjo6UmVmZXJlbmNlU3BhY2VUeXBl IHNwYWNlCiAKIHZvaWQgT3BlblhSRGV2aWNlOjpyZXF1ZXN0RnJhbWUoUmVxdWVzdEZyYW1lQ2Fs bGJhY2smJiBjYWxsYmFjaykKIHsKLSAgICBtX3F1ZXVlLmRpc3BhdGNoKFt0aGlzLCBjYWxsYmFj ayA9IFdURk1vdmUoY2FsbGJhY2spXSgpIG11dGFibGUgeworICAgIG1fcXVldWUuZGlzcGF0Y2go W3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgY2FsbGJhY2sgPSBXVEZNb3Zl KGNhbGxiYWNrKV0oKSBtdXRhYmxlIHsKICAgICAgICAgcG9sbEV2ZW50cygpOwogICAgICAgICBp ZiAoIWlzU2Vzc2lvblJlYWR5KG1fc2Vzc2lvblN0YXRlKSkgewogICAgICAgICAgICAgY2FsbE9u TWFpblRocmVhZChbY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0oKSBtdXRhYmxlIHsKQEAg LTQ0OCw3ICs0NjEsNyBAQCB2b2lkIE9wZW5YUkRldmljZTo6d2FpdFVudGlsU3RvcHBpbmcoKQog ICAgIHBvbGxFdmVudHMoKTsKICAgICBpZiAobV9zZXNzaW9uU3RhdGUgPj0gWFJfU0VTU0lPTl9T VEFURV9TVE9QUElORykKICAgICAgICAgcmV0dXJuOwotICAgIG1fcXVldWUuZGlzcGF0Y2goW3Ro aXNdKCkgeworICAgIG1fcXVldWUuZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtl UmVmKCp0aGlzKV0oKSB7CiAgICAgICAgIHdhaXRVbnRpbFN0b3BwaW5nKCk7CiAgICAgfSk7CiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS94ci9vcGVueHIvUGxhdGZvcm1Y Uk9wZW5YUi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0veHIvb3BlbnhyL1BsYXRmb3JtWFJP cGVuWFIuaAppbmRleCA2ODdmM2JiMDI3ODE0NGMxZTExNDFjM2U0M2M4YTI0ZWEyYTVhNDUxLi5h YTgxNzU4ZGQ3YTlmZTc3YzEwMmRkNTU1MTI1YmExM2Q0MGE3YjUzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS94ci9vcGVueHIvUGxhdGZvcm1YUk9wZW5YUi5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL3hyL29wZW54ci9QbGF0Zm9ybVhST3BlblhSLmgKQEAgLTQ2 LDkgKzQ2LDEzIEBAIGNsYXNzIE9wZW5YUkV4dGVuc2lvbnM7CiAvLyB0aGUgWFJTeXN0ZW0gaXMg YmFzaWNhbGx5IHRoZSBlbnRyeSBwb2ludCBmb3IgdGhlIFdlYlhSIEFQSSBhdmFpbGFibGUgdmlh IHRoZSBOYXZpZ2F0b3Igb2JqZWN0LgogY2xhc3MgT3BlblhSRGV2aWNlIGZpbmFsIDogcHVibGlj IERldmljZSB7CiBwdWJsaWM6Ci0gICAgT3BlblhSRGV2aWNlKFhySW5zdGFuY2UsIFhyU3lzdGVt SWQsIFdvcmtRdWV1ZSYsIGNvbnN0IE9wZW5YUkV4dGVuc2lvbnMmLCBDb21wbGV0aW9uSGFuZGxl cjx2b2lkKCk+JiYpOworICAgIHN0YXRpYyBSZWY8T3BlblhSRGV2aWNlPiBjcmVhdGUoWHJJbnN0 YW5jZSwgWHJTeXN0ZW1JZCwgUmVmPFdvcmtRdWV1ZT4mJiwgY29uc3QgT3BlblhSRXh0ZW5zaW9u cyYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJik7CisgICAgdmlydHVhbCB+T3BlblhSRGV2 aWNlKCk7CiAKIHByaXZhdGU6CisgICAgT3BlblhSRGV2aWNlKFhySW5zdGFuY2UsIFhyU3lzdGVt SWQsIFJlZjxXb3JrUXVldWU+JiYsIGNvbnN0IE9wZW5YUkV4dGVuc2lvbnMmKTsKKyAgICB2b2lk IGluaXRpYWxpemUoQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNhbGxiYWNrKTsKKwogICAg IC8vIFBsYXRmb3JtWFI6OkRldmljZQogICAgIFdlYkNvcmU6OkludFNpemUgcmVjb21tZW5kZWRS ZXNvbHV0aW9uKFNlc3Npb25Nb2RlKSBmaW5hbDsKICAgICB2b2lkIGluaXRpYWxpemVUcmFja2lu Z0FuZFJlbmRlcmluZyhTZXNzaW9uTW9kZSkgZmluYWw7Cg== 423233 2021-03-15 13:55:00 -0700 2021-03-16 01:45:56 -0700 Patch bug-223211-20210315215459.patch text/plain 9261 ifernandez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NDE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWJmNDc4OWYyMmE2OTA3 MzY0ZTQyNWUxZmNhYTJkOTI3MDQ2NTRlYS4uMGRhODBhNjg4MWE5MTQ3NTZmNWYxZTg4YjBhMzJk MWM4ZjQ3MDU5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTAzLTE1ICBJbWFu b2wgRmVybmFuZGV6ICA8aWZlcm5hbmRlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFByb3RlY3Qg dGhpcyBpbiBhbGwgUGxhdGZvcm1PcGVuWFIgcXVldWUtPmRpc3BhdGNoKCkgY2FsbHMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzIxMQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBPcGVuWFIgV29y a1F1ZXVlIG1heSBvdXRsaXZlIE9wZW5YUkRldmljZSBzbyBxdWV1ZS0+ZGlzcGF0Y2goKSBjYWxs cyB3aXRob3V0IHByb3RlY3RpbmcgdGhpcyBhcmUgdW5zYWZlLgorCisgICAgICAgICogTW9kdWxl cy93ZWJ4ci9XZWJYUlN5c3RlbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJYUlN5c3RlbTo6 ZW5zdXJlSW1tZXJzaXZlWFJEZXZpY2VJc1NlbGVjdGVkKToKKyAgICAgICAgKiBwbGF0Zm9ybS94 ci9QbGF0Zm9ybVhSLmg6CisgICAgICAgICogcGxhdGZvcm0veHIvb3BlbnhyL09wZW5YUkluc3Rh bmNlLmNwcDoKKyAgICAgICAgKFBsYXRmb3JtWFI6Okluc3RhbmNlOjpJbXBsOjp+SW1wbCk6Cisg ICAgICAgIChQbGF0Zm9ybVhSOjpJbnN0YW5jZTo6ZW51bWVyYXRlSW1tZXJzaXZlWFJEZXZpY2Vz KToKKyAgICAgICAgKiBwbGF0Zm9ybS94ci9vcGVueHIvUGxhdGZvcm1YUk9wZW5YUi5jcHA6Cisg ICAgICAgIChQbGF0Zm9ybVhSOjpPcGVuWFJEZXZpY2U6OmNyZWF0ZSk6CisgICAgICAgIChQbGF0 Zm9ybVhSOjpPcGVuWFJEZXZpY2U6Ok9wZW5YUkRldmljZSk6CisgICAgICAgIChQbGF0Zm9ybVhS OjpPcGVuWFJEZXZpY2U6OmluaXRpYWxpemUpOgorICAgICAgICAoUGxhdGZvcm1YUjo6T3BlblhS RGV2aWNlOjppbml0aWFsaXplVHJhY2tpbmdBbmRSZW5kZXJpbmcpOgorICAgICAgICAoUGxhdGZv cm1YUjo6T3BlblhSRGV2aWNlOjpzaHV0RG93blRyYWNraW5nQW5kUmVuZGVyaW5nKToKKyAgICAg ICAgKFBsYXRmb3JtWFI6Ok9wZW5YUkRldmljZTo6cmVxdWVzdEZyYW1lKToKKyAgICAgICAgKFBs YXRmb3JtWFI6Ok9wZW5YUkRldmljZTo6d2FpdFVudGlsU3RvcHBpbmcpOgorICAgICAgICAqIHBs YXRmb3JtL3hyL29wZW54ci9QbGF0Zm9ybVhST3BlblhSLmg6CisKIDIwMjEtMDMtMTUgIEltYW5v bCBGZXJuYW5kZXogIDxpZmVybmFuZGV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgU3BsaXQgV2Vi WFIgZmVhdHVyZXMgaW50byBlbmFibGVkRmVhdHVyZXMsIHN1cHBvcnRlZEZlYXR1cmVzIGFuZCBy ZXF1ZXN0ZWRGZWF0dXJlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJ4 ci9XZWJYUlN5c3RlbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnhyL1dlYlhSU3lz dGVtLmNwcAppbmRleCA2N2ZiNjYzYzc2MTE0NDM4ZWVhZGEzZjliODE0NzMyOTc4OGE1M2I5Li4w OWJjOGJlNTYyZTY4MjczNDVlMzQxYzVmMTE5MzliOTU5MDI1YjE3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnhyL1dlYlhSU3lzdGVtLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL3dlYnhyL1dlYlhSU3lzdGVtLmNwcApAQCAtMTAwLDcgKzEwMCw3IEBAIHZv aWQgV2ViWFJTeXN0ZW06OmVuc3VyZUltbWVyc2l2ZVhSRGV2aWNlSXNTZWxlY3RlZChDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKCk+JiYKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0g ICAgICAgIGlmIChtX2FjdGl2ZUltbWVyc2l2ZVNlc3Npb24gJiYgb2xkRGV2aWNlICYmIGltbWVy c2l2ZVhSRGV2aWNlcy5maW5kTWF0Y2hpbmcoWyZdKGF1dG8mIGVudHJ5KSB7IHJldHVybiAmZW50 cnkgPT0gb2xkRGV2aWNlOyB9KSAhPSBub3RGb3VuZCkKKyAgICAgICAgaWYgKG1fYWN0aXZlSW1t ZXJzaXZlU2Vzc2lvbiAmJiBvbGREZXZpY2UgJiYgaW1tZXJzaXZlWFJEZXZpY2VzLmZpbmRNYXRj aGluZyhbJl0oYXV0byYgZW50cnkpIHsgcmV0dXJuIGVudHJ5LnB0cigpID09IG9sZERldmljZTsg fSkgIT0gbm90Rm91bmQpCiAgICAgICAgICAgICBBU1NFUlQobV9hY3RpdmVJbW1lcnNpdmVEZXZp Y2UuZ2V0KCkgPT0gb2xkRGV2aWNlKTsKICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICAvLyBG SVhNRTogaW1wbGVtZW50IGEgYmV0dGVyIFVBIHNlbGVjdGlvbiBtZWNoYW5pc20gaWYgcmVxdWly ZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS94ci9QbGF0Zm9ybVhSLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS94ci9QbGF0Zm9ybVhSLmgKaW5kZXggNzI0NmUzMjg4 MDVhMTdkYmRkNjFhYTBkMzU1MWNlMDAyYWJkNTUxOS4uNTZkOGM2YzhiZGEyZDFiODY4MzMzMWQx ZDEyZTQ2YWExM2VjMWYxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0veHIv UGxhdGZvcm1YUi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3hyL1BsYXRmb3JtWFIu aApAQCAtMjMsNiArMjMsNyBAQAogI2luY2x1ZGUgPG1lbW9yeT4KICNpbmNsdWRlIDx3dGYvQ29t cGxldGlvbkhhbmRsZXIuaD4KICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgorI2luY2x1ZGUgPHd0 Zi9SZWYuaD4KICNpbmNsdWRlIDx3dGYvVW5pcXVlUmVmLmg+CiAjaW5jbHVkZSA8d3RmL1Zhcmlh bnQuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CkBAIC02MSw3ICs2Miw3IEBAIHB1YmxpYzoK ICAgICAvLyBGSVhNRTogaGFuZGxlIHZpc2liaWxpdHkgY2hhbmdlcwogfTsKIAotY2xhc3MgRGV2 aWNlIDogcHVibGljIENhbk1ha2VXZWFrUHRyPERldmljZT4geworY2xhc3MgRGV2aWNlIDogcHVi bGljIFRocmVhZFNhZmVSZWZDb3VudGVkPERldmljZT4sIHB1YmxpYyBDYW5NYWtlV2Vha1B0cjxE ZXZpY2U+IHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKICAgICBXVEZfTUFLRV9OT05D T1BZQUJMRShEZXZpY2UpOwogcHVibGljOgpAQCAtMTU5LDcgKzE2MCw3IEBAIGNsYXNzIEluc3Rh bmNlIHsKIHB1YmxpYzoKICAgICBzdGF0aWMgSW5zdGFuY2UmIHNpbmdsZXRvbigpOwogCi0gICAg dXNpbmcgRGV2aWNlTGlzdCA9IFZlY3RvcjxVbmlxdWVSZWY8RGV2aWNlPj47CisgICAgdXNpbmcg RGV2aWNlTGlzdCA9IFZlY3RvcjxSZWY8RGV2aWNlPj47CiAgICAgdm9pZCBlbnVtZXJhdGVJbW1l cnNpdmVYUkRldmljZXMoQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBEZXZpY2VMaXN0Jik+ JiYpOwogCiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0veHIv b3BlbnhyL09wZW5YUkluc3RhbmNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3hyL29w ZW54ci9PcGVuWFJJbnN0YW5jZS5jcHAKaW5kZXggOGNhYzdhNzFmYzZmY2ExYzBjZjU5N2UyNTMy ZjhmMDQ2NzE2OTIzMS4uZDVjYTcwODc1ZjFkYjI3NGJlOGE2OWVjNWNiMjJhZjIwNTBiYTViNCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0veHIvb3BlbnhyL09wZW5YUkluc3Rh bmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS94ci9vcGVueHIvT3BlblhSSW5z dGFuY2UuY3BwCkBAIC04Niw5ICs4Niw5IEBAIEluc3RhbmNlOjpJbXBsOjpJbXBsKCkKIAogSW5z dGFuY2U6OkltcGw6On5JbXBsKCkKIHsKLSAgICBtX3dvcmtRdWV1ZS0+ZGlzcGF0Y2goW3RoaXNd IHsKLSAgICAgICAgaWYgKG1faW5zdGFuY2UgIT0gWFJfTlVMTF9IQU5ETEUpCi0gICAgICAgICAg ICB4ckRlc3Ryb3lJbnN0YW5jZShtX2luc3RhbmNlKTsKKyAgICBtX3dvcmtRdWV1ZS0+ZGlzcGF0 Y2goW2luc3RhbmNlID0gbV9pbnN0YW5jZV0geworICAgICAgICBpZiAoaW5zdGFuY2UgIT0gWFJf TlVMTF9IQU5ETEUpCisgICAgICAgICAgICB4ckRlc3Ryb3lJbnN0YW5jZShpbnN0YW5jZSk7CiAg ICAgfSk7CiB9CiAKQEAgLTEzMiw3ICsxMzIsNyBAQCB2b2lkIEluc3RhbmNlOjplbnVtZXJhdGVJ bW1lcnNpdmVYUkRldmljZXMoQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBEZXZpY2VMaQog ICAgICAgICBjYWxsYmFja09uRXhpdC5yZWxlYXNlKCk7CiAKICAgICAgICAgY2FsbE9uTWFpblRo cmVhZChbdGhpcywgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKSwgc3lzdGVtSWRdKCkgbXV0 YWJsZSB7Ci0gICAgICAgICAgICBtX2ltbWVyc2l2ZVhSRGV2aWNlcyA9IERldmljZUxpc3Q6OmZy b20obWFrZVVuaXF1ZVJlZjxPcGVuWFJEZXZpY2U+KG1faW1wbC0+eHJJbnN0YW5jZSgpLCBzeXN0 ZW1JZCwgbV9pbXBsLT5xdWV1ZSgpLCAqbV9pbXBsLT5leHRlbnNpb25zKCksIFt0aGlzLCBjYWxs YmFjayA9IFdURk1vdmUoY2FsbGJhY2spXSgpIG11dGFibGUgeworICAgICAgICAgICAgbV9pbW1l cnNpdmVYUkRldmljZXMgPSBEZXZpY2VMaXN0Ojpmcm9tKE9wZW5YUkRldmljZTo6Y3JlYXRlKG1f aW1wbC0+eHJJbnN0YW5jZSgpLCBzeXN0ZW1JZCwgbV9pbXBsLT5xdWV1ZSgpLCAqbV9pbXBsLT5l eHRlbnNpb25zKCksIFt0aGlzLCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spXSgpIG11dGFi bGUgewogICAgICAgICAgICAgICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAgICAgICAgICAg ICAgICAgY2FsbGJhY2sobV9pbW1lcnNpdmVYUkRldmljZXMpOwogICAgICAgICAgICAgfSkpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0veHIvb3BlbnhyL1BsYXRmb3JtWFJP cGVuWFIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0veHIvb3BlbnhyL1BsYXRmb3JtWFJP cGVuWFIuY3BwCmluZGV4IGEyMDMyY2EwNzZjZTU0OWYyYjY1NDMzOWVkMWI5ZDA4M2UyYjJlODMu LmE1ZWM5ZjE4ZDkwZDk5ODRiY2VlNTlkYjYyMzk0NjE1NDM3MTI4MjMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL3hyL29wZW54ci9QbGF0Zm9ybVhST3BlblhSLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS94ci9vcGVueHIvUGxhdGZvcm1YUk9wZW5YUi5jcHAK QEAgLTQyLDE0ICs0MiwyNSBAQCBzdGF0aWMgYm9vbCBpc1Nlc3Npb25SZWFkeShYclNlc3Npb25T dGF0ZSBzdGF0ZSkKICAgICByZXR1cm4gc3RhdGUgPj0gWFJfU0VTU0lPTl9TVEFURV9SRUFEWSAg JiYgc3RhdGUgPCBYUl9TRVNTSU9OX1NUQVRFX1NUT1BQSU5HOwogfQogCi1PcGVuWFJEZXZpY2U6 Ok9wZW5YUkRldmljZShYckluc3RhbmNlIGluc3RhbmNlLCBYclN5c3RlbUlkIHN5c3RlbSwgV29y a1F1ZXVlJiBxdWV1ZSwgY29uc3QgT3BlblhSRXh0ZW5zaW9ucyYgZXh0ZW5zaW9ucywgQ29tcGxl dGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNhbGxiYWNrKQorUmVmPE9wZW5YUkRldmljZT4gT3BlblhS RGV2aWNlOjpjcmVhdGUoWHJJbnN0YW5jZSBpbnN0YW5jZSwgWHJTeXN0ZW1JZCBzeXN0ZW0sIFJl ZjxXb3JrUXVldWU+JiYgcXVldWUsIGNvbnN0IE9wZW5YUkV4dGVuc2lvbnMmIGV4dGVuc2lvbnMs IENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjYWxsYmFjaykKK3sKKyAgICBhdXRvIGRldmlj ZSA9IGFkb3B0UmVmKCpuZXcgT3BlblhSRGV2aWNlKGluc3RhbmNlLCBzeXN0ZW0sIFdURk1vdmUo cXVldWUpLCBleHRlbnNpb25zKSk7CisgICAgZGV2aWNlLT5pbml0aWFsaXplKFdURk1vdmUoY2Fs bGJhY2spKTsKKyAgICByZXR1cm4gZGV2aWNlOworfQorCitPcGVuWFJEZXZpY2U6Ok9wZW5YUkRl dmljZShYckluc3RhbmNlIGluc3RhbmNlLCBYclN5c3RlbUlkIHN5c3RlbSwgUmVmPFdvcmtRdWV1 ZT4mJiBxdWV1ZSwgY29uc3QgT3BlblhSRXh0ZW5zaW9ucyYgZXh0ZW5zaW9ucykKICAgICA6IG1f aW5zdGFuY2UoaW5zdGFuY2UpCiAgICAgLCBtX3N5c3RlbUlkKHN5c3RlbSkKICAgICAsIG1fcXVl dWUocXVldWUpCiAgICAgLCBtX2V4dGVuc2lvbnMoZXh0ZW5zaW9ucykKK3sKK30KKwordm9pZCBP cGVuWFJEZXZpY2U6OmluaXRpYWxpemUoQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNhbGxi YWNrKQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Ci0gICAgbV9xdWV1ZS5kaXNwYXRj aChbdGhpcywgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0oKSBtdXRhYmxlIHsKKyAgICBt X3F1ZXVlLmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGNh bGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldKCkgbXV0YWJsZSB7CiAgICAgICAgIGF1dG8gc3lz dGVtUHJvcGVydGllcyA9IGNyZWF0ZVN0cnVjdHVyZTxYclN5c3RlbVByb3BlcnRpZXMsIFhSX1RZ UEVfU1lTVEVNX1BST1BFUlRJRVM+KCk7CiAgICAgICAgIGF1dG8gcmVzdWx0ID0geHJHZXRTeXN0 ZW1Qcm9wZXJ0aWVzKG1faW5zdGFuY2UsIG1fc3lzdGVtSWQsICZzeXN0ZW1Qcm9wZXJ0aWVzKTsK ICAgICAgICAgaWYgKFhSX1NVQ0NFRURFRChyZXN1bHQpKQpAQCAtNzgsNyArODksNyBAQCBXZWJD b3JlOjpJbnRTaXplIE9wZW5YUkRldmljZTo6cmVjb21tZW5kZWRSZXNvbHV0aW9uKFNlc3Npb25N b2RlIG1vZGUpCiAKIHZvaWQgT3BlblhSRGV2aWNlOjppbml0aWFsaXplVHJhY2tpbmdBbmRSZW5k ZXJpbmcoU2Vzc2lvbk1vZGUgbW9kZSkKIHsKLSAgICBtX3F1ZXVlLmRpc3BhdGNoKFt0aGlzLCBt b2RlXSgpIHsKKyAgICBtX3F1ZXVlLmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFr ZVJlZigqdGhpcyksIG1vZGVdKCkgewogICAgICAgICBBU1NFUlQobV9pbnN0YW5jZSAhPSBYUl9O VUxMX0hBTkRMRSk7CiAgICAgICAgIEFTU0VSVChtX3Nlc3Npb24gPT0gWFJfTlVMTF9IQU5ETEUp OwogICAgICAgICBBU1NFUlQobV9leHRlbnNpb25zLm1ldGhvZHMoKS54ckdldE9wZW5HTEdyYXBo aWNzUmVxdWlyZW1lbnRzS0hSKTsKQEAgLTEyMyw3ICsxMzQsNyBAQCB2b2lkIE9wZW5YUkRldmlj ZTo6aW5pdGlhbGl6ZVRyYWNraW5nQW5kUmVuZGVyaW5nKFNlc3Npb25Nb2RlIG1vZGUpCiAKIHZv aWQgT3BlblhSRGV2aWNlOjpzaHV0RG93blRyYWNraW5nQW5kUmVuZGVyaW5nKCkKIHsKLSAgICBt X3F1ZXVlLmRpc3BhdGNoKFt0aGlzXSgpIHsKKyAgICBtX3F1ZXVlLmRpc3BhdGNoKFt0aGlzLCBw cm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldKCkgewogICAgICAgICBpZiAobV9zZXNzaW9u ID09IFhSX05VTExfSEFORExFKQogICAgICAgICAgICAgcmV0dXJuOwogCkBAIC0xNDksNyArMTYw LDcgQEAgdm9pZCBPcGVuWFJEZXZpY2U6OmluaXRpYWxpemVSZWZlcmVuY2VTcGFjZShQbGF0Zm9y bVhSOjpSZWZlcmVuY2VTcGFjZVR5cGUgc3BhY2UKIAogdm9pZCBPcGVuWFJEZXZpY2U6OnJlcXVl c3RGcmFtZShSZXF1ZXN0RnJhbWVDYWxsYmFjayYmIGNhbGxiYWNrKQogewotICAgIG1fcXVldWUu ZGlzcGF0Y2goW3RoaXMsIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldKCkgbXV0YWJsZSB7 CisgICAgbV9xdWV1ZS5kaXNwYXRjaChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRo aXMpLCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spXSgpIG11dGFibGUgewogICAgICAgICBw b2xsRXZlbnRzKCk7CiAgICAgICAgIGlmICghaXNTZXNzaW9uUmVhZHkobV9zZXNzaW9uU3RhdGUp KSB7CiAgICAgICAgICAgICBjYWxsT25NYWluVGhyZWFkKFtjYWxsYmFjayA9IFdURk1vdmUoY2Fs bGJhY2spXSgpIG11dGFibGUgewpAQCAtNDQ4LDcgKzQ1OSw3IEBAIHZvaWQgT3BlblhSRGV2aWNl Ojp3YWl0VW50aWxTdG9wcGluZygpCiAgICAgcG9sbEV2ZW50cygpOwogICAgIGlmIChtX3Nlc3Np b25TdGF0ZSA+PSBYUl9TRVNTSU9OX1NUQVRFX1NUT1BQSU5HKQogICAgICAgICByZXR1cm47Ci0g ICAgbV9xdWV1ZS5kaXNwYXRjaChbdGhpc10oKSB7CisgICAgbV9xdWV1ZS5kaXNwYXRjaChbdGhp cywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXSgpIHsKICAgICAgICAgd2FpdFVudGls U3RvcHBpbmcoKTsKICAgICB9KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3hyL29wZW54ci9QbGF0Zm9ybVhST3BlblhSLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS94ci9vcGVueHIvUGxhdGZvcm1YUk9wZW5YUi5oCmluZGV4IDY4N2YzYmIwMjc4MTQ0YzFlMTE0 MWMzZTQzYzhhMjRlYTJhNWE0NTEuLmQ0ZTI2ZmNlODU1YTU2MWUyZGQzM2YwMjM0YTIxNWM0YmVm YzQyMDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3hyL29wZW54ci9QbGF0 Zm9ybVhST3BlblhSLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0veHIvb3BlbnhyL1Bs YXRmb3JtWFJPcGVuWFIuaApAQCAtNDYsOSArNDYsMTIgQEAgY2xhc3MgT3BlblhSRXh0ZW5zaW9u czsKIC8vIHRoZSBYUlN5c3RlbSBpcyBiYXNpY2FsbHkgdGhlIGVudHJ5IHBvaW50IGZvciB0aGUg V2ViWFIgQVBJIGF2YWlsYWJsZSB2aWEgdGhlIE5hdmlnYXRvciBvYmplY3QuCiBjbGFzcyBPcGVu WFJEZXZpY2UgZmluYWwgOiBwdWJsaWMgRGV2aWNlIHsKIHB1YmxpYzoKLSAgICBPcGVuWFJEZXZp Y2UoWHJJbnN0YW5jZSwgWHJTeXN0ZW1JZCwgV29ya1F1ZXVlJiwgY29uc3QgT3BlblhSRXh0ZW5z aW9ucyYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJik7CisgICAgc3RhdGljIFJlZjxPcGVu WFJEZXZpY2U+IGNyZWF0ZShYckluc3RhbmNlLCBYclN5c3RlbUlkLCBSZWY8V29ya1F1ZXVlPiYm LCBjb25zdCBPcGVuWFJFeHRlbnNpb25zJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsK IAogcHJpdmF0ZToKKyAgICBPcGVuWFJEZXZpY2UoWHJJbnN0YW5jZSwgWHJTeXN0ZW1JZCwgUmVm PFdvcmtRdWV1ZT4mJiwgY29uc3QgT3BlblhSRXh0ZW5zaW9ucyYpOworICAgIHZvaWQgaW5pdGlh bGl6ZShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY2FsbGJhY2spOworCiAgICAgLy8gUGxh dGZvcm1YUjo6RGV2aWNlCiAgICAgV2ViQ29yZTo6SW50U2l6ZSByZWNvbW1lbmRlZFJlc29sdXRp b24oU2Vzc2lvbk1vZGUpIGZpbmFsOwogICAgIHZvaWQgaW5pdGlhbGl6ZVRyYWNraW5nQW5kUmVu ZGVyaW5nKFNlc3Npb25Nb2RlKSBmaW5hbDsK