241836 2022-06-21 19:44:46 -0700 Make sure return value of dispatch_source_create is memory managed correctly 2022-06-22 11:36:12 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen benjamin cdumez cmarcelo ddkilzer ews-watchlist webkit-bug-importer oldest_to_newest 1877189 0 achristensen 2022-06-21 19:44:46 -0700 Most of the time we can use smart pointers. This should make the leaks tool happier. 1877190 1 achristensen 2022-06-21 19:44:55 -0700 rdar://95625990 1877192 2 460402 achristensen 2022-06-21 19:46:24 -0700 Created attachment 460402 Patch 1877235 3 460406 achristensen 2022-06-22 00:16:33 -0700 Created attachment 460406 Patch 1877243 4 460409 achristensen 2022-06-22 00:41:41 -0700 Created attachment 460409 Patch 1877297 5 460409 cdumez 2022-06-22 08:42:19 -0700 Comment on attachment 460409 Patch r=me 1877322 6 460409 ddkilzer 2022-06-22 10:05:58 -0700 Comment on attachment 460409 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=460409&action=review > Source/bmalloc/bmalloc/Scavenger.cpp:88 > +#if BPLATFORM(WATCHOS) > + // FIXME: This is concerning. > + static_assert(!__has_feature(objc_arc)); > +#else > + static_assert(__has_feature(objc_arc)); > +#endif I'm not sure why ARC is disabled on watchOS as it's set to be enabled in Configurations/Base.xcconfig. 1877326 7 achristensen 2022-06-22 10:12:13 -0700 The definition of BENABLE_LIBPAS is dependent on whether the CPU has 64-bit address spaces, and watchOS is the only EWS that is 32-bit and that code was inside #if !BUSE(LIBPAS) 1877330 8 460418 achristensen 2022-06-22 10:17:26 -0700 Created attachment 460418 Patch 1877352 9 ews-feeder 2022-06-22 11:35:52 -0700 Committed r295740 (251745@main): <https://commits.webkit.org/251745@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 460418. 1877353 10 webkit-bug-importer 2022-06-22 11:36:12 -0700 <rdar://problem/95709464> 460402 2022-06-21 19:46:24 -0700 2022-06-22 00:16:31 -0700 Patch bug-241836-20220621194623.patch text/plain 11029 achristensen RnJvbSA3NWIzNDA1NGU4NjIzNTcxODhmOTI3MWZmNDljYjhlODViMGVmMGQ5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4IENocmlzdGVuc2VuIDxhY2hyaXN0ZW5zZW5AYXBwbGUu Y29tPgpEYXRlOiBUdWUsIDIxIEp1biAyMDIyIDE5OjQzOjU2IC0wNzAwClN1YmplY3Q6IFtQQVRD SF0gTWFrZSBzdXJlIHJldHVybiB2YWx1ZSBvZiBkaXNwYXRjaF9zb3VyY2VfY3JlYXRlIGlzIG1l bW9yeQogbWFuYWdlZCBjb3JyZWN0bHkgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTI0MTgzNgogcmRhcjovLzk1NjI1OTkwCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KCiogU291cmNlL1dURi93dGYvY29jb2EvTWVtb3J5UHJlc3N1cmVIYW5kbGVyQ29jb2EubW06 CihXVEY6Om1lbW9yeVByZXNzdXJlRXZlbnRTb3VyY2UpOgooV1RGOjp0aW1lckV2ZW50U291cmNl KToKKFdURjo6TWVtb3J5UHJlc3N1cmVIYW5kbGVyOjppbnN0YWxsKToKKFdURjo6TWVtb3J5UHJl c3N1cmVIYW5kbGVyOjp1bmluc3RhbGwpOgooV1RGOjpNZW1vcnlQcmVzc3VyZUhhbmRsZXI6Omhv bGRPZmYpOgoqIFNvdXJjZS9XVEYvd3RmL3RocmVhZHMvU2lnbmFscy5jcHA6CihXVEY6OnN0YXJ0 TWFjaEV4Y2VwdGlvbkhhbmRsZXJUaHJlYWQpOgoqIFNvdXJjZS9XZWJLaXQvU2hhcmVkL0VudHJ5 UG9pbnRVdGlsaXRpZXMvQ29jb2EvWFBDU2VydmljZS9YUENTZXJ2aWNlRW50cnlQb2ludC5tbToK KFdlYktpdDo6c2V0T1NUcmFuc2FjdGlvbik6CiogU291cmNlL2JtYWxsb2MvYm1hbGxvYy9TY2F2 ZW5nZXIuY3BwOgooYm1hbGxvYzo6U2NhdmVuZ2VyOjpTY2F2ZW5nZXIpOgotLS0KIC4uLi93dGYv Y29jb2EvTWVtb3J5UHJlc3N1cmVIYW5kbGVyQ29jb2EubW0gICB8IDU0ICsrKysrKysrKysrLS0t LS0tLS0KIFNvdXJjZS9XVEYvd3RmL3RocmVhZHMvU2lnbmFscy5jcHAgICAgICAgICAgICB8IDE2 ICsrKy0tLQogLi4uL0NvY29hL1hQQ1NlcnZpY2UvWFBDU2VydmljZUVudHJ5UG9pbnQubW0gIHwg IDcgKy0tCiBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL1NjYXZlbmdlci5jcHAgICAgICAgICAgfCAg MSArCiA0IGZpbGVzIGNoYW5nZWQsIDQ1IGluc2VydGlvbnMoKyksIDMzIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL2NvY29hL01lbW9yeVByZXNzdXJlSGFuZGxlckNv Y29hLm1tIGIvU291cmNlL1dURi93dGYvY29jb2EvTWVtb3J5UHJlc3N1cmVIYW5kbGVyQ29jb2Eu bW0KaW5kZXggMzljZjdjODZmNjg1Li5jN2Q1MGRmNzhlZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X VEYvd3RmL2NvY29hL01lbW9yeVByZXNzdXJlSGFuZGxlckNvY29hLm1tCisrKyBiL1NvdXJjZS9X VEYvd3RmL2NvY29hL01lbW9yeVByZXNzdXJlSGFuZGxlckNvY29hLm1tCkBAIC00OSw4ICs0OSwx OCBAQCB2b2lkIE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6cGxhdGZvcm1SZWxlYXNlTWVtb3J5KENy aXRpY2FsIGNyaXRpY2FsKQogICAgIH0KIH0KIAotc3RhdGljIGRpc3BhdGNoX3NvdXJjZV90IG1l bW9yeVByZXNzdXJlRXZlbnRTb3VyY2UgPSBudWxscHRyOwotc3RhdGljIGRpc3BhdGNoX3NvdXJj ZV90IHRpbWVyRXZlbnRTb3VyY2UgPSBudWxscHRyOworc3RhdGljIE9TT2JqZWN0UHRyPGRpc3Bh dGNoX3NvdXJjZV90PiYgbWVtb3J5UHJlc3N1cmVFdmVudFNvdXJjZSgpCit7CisgICAgc3RhdGlj IE5ldmVyRGVzdHJveWVkPE9TT2JqZWN0UHRyPGRpc3BhdGNoX3NvdXJjZV90Pj4gc291cmNlOwor ICAgIHJldHVybiBzb3VyY2UuZ2V0KCk7Cit9CisKK3N0YXRpYyBPU09iamVjdFB0cjxkaXNwYXRj aF9zb3VyY2VfdD4mIHRpbWVyRXZlbnRTb3VyY2UoKQoreworICAgIHN0YXRpYyBOZXZlckRlc3Ry b3llZDxPU09iamVjdFB0cjxkaXNwYXRjaF9zb3VyY2VfdD4+IHNvdXJjZTsKKyAgICByZXR1cm4g c291cmNlLmdldCgpOworfQorCiBzdGF0aWMgaW50IG5vdGlmeVRva2Vuc1szXTsKIAogLy8gRGlz YWJsZSBtZW1vcnkgZXZlbnQgcmVjZXB0aW9uIGZvciBhIG1pbmltdW0gb2Ygc19taW5pbXVtSG9s ZE9mZlRpbWUKQEAgLTY2LDE1ICs3NiwxNSBAQCBzdGF0aWMgY29uc3RleHByIHVuc2lnbmVkIHNf aG9sZE9mZk11bHRpcGxpZXIgPSAyMDsKIAogdm9pZCBNZW1vcnlQcmVzc3VyZUhhbmRsZXI6Omlu c3RhbGwoKQogewotICAgIGlmIChtX2luc3RhbGxlZCB8fCB0aW1lckV2ZW50U291cmNlKQorICAg IGlmIChtX2luc3RhbGxlZCB8fCB0aW1lckV2ZW50U291cmNlKCkpCiAgICAgICAgIHJldHVybjsK IAogICAgIGRpc3BhdGNoX2FzeW5jKG1fZGlzcGF0Y2hRdWV1ZS5nZXQoKSwgXnsKICAgICAgICAg YXV0byBtZW1vcnlTdGF0dXNGbGFncyA9IERJU1BBVENIX01FTU9SWVBSRVNTVVJFX05PUk1BTCB8 IERJU1BBVENIX01FTU9SWVBSRVNTVVJFX1dBUk4gfCBESVNQQVRDSF9NRU1PUllQUkVTU1VSRV9D UklUSUNBTCB8IERJU1BBVENIX01FTU9SWVBSRVNTVVJFX1BST0NfTElNSVRfV0FSTiB8IERJU1BB VENIX01FTU9SWVBSRVNTVVJFX1BST0NfTElNSVRfQ1JJVElDQUw7Ci0gICAgICAgIG1lbW9yeVBy ZXNzdXJlRXZlbnRTb3VyY2UgPSBkaXNwYXRjaF9zb3VyY2VfY3JlYXRlKERJU1BBVENIX1NPVVJD RV9UWVBFX01FTU9SWVBSRVNTVVJFLCAwLCBtZW1vcnlTdGF0dXNGbGFncywgbV9kaXNwYXRjaFF1 ZXVlLmdldCgpKTsKKyAgICAgICAgbWVtb3J5UHJlc3N1cmVFdmVudFNvdXJjZSgpID0gYWRvcHRP U09iamVjdChkaXNwYXRjaF9zb3VyY2VfY3JlYXRlKERJU1BBVENIX1NPVVJDRV9UWVBFX01FTU9S WVBSRVNTVVJFLCAwLCBtZW1vcnlTdGF0dXNGbGFncywgbV9kaXNwYXRjaFF1ZXVlLmdldCgpKSk7 CiAKLSAgICAgICAgZGlzcGF0Y2hfc291cmNlX3NldF9ldmVudF9oYW5kbGVyKG1lbW9yeVByZXNz dXJlRXZlbnRTb3VyY2UsIF57Ci0gICAgICAgICAgICBhdXRvIHN0YXR1cyA9IGRpc3BhdGNoX3Nv dXJjZV9nZXRfZGF0YShtZW1vcnlQcmVzc3VyZUV2ZW50U291cmNlKTsKKyAgICAgICAgZGlzcGF0 Y2hfc291cmNlX3NldF9ldmVudF9oYW5kbGVyKG1lbW9yeVByZXNzdXJlRXZlbnRTb3VyY2UoKS5n ZXQoKSwgXnsKKyAgICAgICAgICAgIGF1dG8gc3RhdHVzID0gZGlzcGF0Y2hfc291cmNlX2dldF9k YXRhKG1lbW9yeVByZXNzdXJlRXZlbnRTb3VyY2UoKS5nZXQoKSk7CiAgICAgICAgICAgICBzd2l0 Y2ggKHN0YXR1cykgewogICAgICAgICAgICAgLy8gVk0gcHJlc3N1cmUgZXZlbnRzLgogICAgICAg ICAgICAgY2FzZSBESVNQQVRDSF9NRU1PUllQUkVTU1VSRV9OT1JNQUw6CkBAIC0xMDEsNyArMTEx LDcgQEAgdm9pZCBNZW1vcnlQcmVzc3VyZUhhbmRsZXI6Omluc3RhbGwoKQogICAgICAgICAgICAg aWYgKG1fc2hvdWxkTG9nTWVtb3J5TWVtb3J5UHJlc3N1cmVFdmVudHMpCiAgICAgICAgICAgICAg ICAgUkVMRUFTRV9MT0coTWVtb3J5UHJlc3N1cmUsICJSZWNlaXZlZCBtZW1vcnkgcHJlc3N1cmUg ZXZlbnQgJWx1IHZtIHByZXNzdXJlICVkIiwgc3RhdHVzLCBpc1VuZGVyTWVtb3J5UHJlc3N1cmUo KSk7CiAgICAgICAgIH0pOwotICAgICAgICBkaXNwYXRjaF9yZXN1bWUobWVtb3J5UHJlc3N1cmVF dmVudFNvdXJjZSk7CisgICAgICAgIGRpc3BhdGNoX3Jlc3VtZShtZW1vcnlQcmVzc3VyZUV2ZW50 U291cmNlKCkuZ2V0KCkpOwogICAgIH0pOwogCiAgICAgLy8gQWxsb3cgc2ltdWxhdGlvbiBvZiBt ZW1vcnkgcHJlc3N1cmUgd2l0aCAibm90aWZ5dXRpbCAtcCBvcmcuV2ViS2l0Lmxvd01lbW9yeSIK QEAgLTE0MCwxNCArMTUwLDE0IEBAIHZvaWQgTWVtb3J5UHJlc3N1cmVIYW5kbGVyOjp1bmluc3Rh bGwoKQogICAgICAgICByZXR1cm47CiAKICAgICBkaXNwYXRjaF9hc3luYyhtX2Rpc3BhdGNoUXVl dWUuZ2V0KCksIF57Ci0gICAgICAgIGlmIChtZW1vcnlQcmVzc3VyZUV2ZW50U291cmNlKSB7Ci0g ICAgICAgICAgICBkaXNwYXRjaF9zb3VyY2VfY2FuY2VsKG1lbW9yeVByZXNzdXJlRXZlbnRTb3Vy Y2UpOwotICAgICAgICAgICAgbWVtb3J5UHJlc3N1cmVFdmVudFNvdXJjZSA9IG51bGxwdHI7Cisg ICAgICAgIGlmIChtZW1vcnlQcmVzc3VyZUV2ZW50U291cmNlKCkpIHsKKyAgICAgICAgICAgIGRp c3BhdGNoX3NvdXJjZV9jYW5jZWwobWVtb3J5UHJlc3N1cmVFdmVudFNvdXJjZSgpLmdldCgpKTsK KyAgICAgICAgICAgIG1lbW9yeVByZXNzdXJlRXZlbnRTb3VyY2UoKSA9IG51bGxwdHI7CiAgICAg ICAgIH0KIAotICAgICAgICBpZiAodGltZXJFdmVudFNvdXJjZSkgewotICAgICAgICAgICAgZGlz cGF0Y2hfc291cmNlX2NhbmNlbCh0aW1lckV2ZW50U291cmNlKTsKLSAgICAgICAgICAgIHRpbWVy RXZlbnRTb3VyY2UgPSBudWxscHRyOworICAgICAgICBpZiAodGltZXJFdmVudFNvdXJjZSgpKSB7 CisgICAgICAgICAgICBkaXNwYXRjaF9zb3VyY2VfY2FuY2VsKHRpbWVyRXZlbnRTb3VyY2UoKS5n ZXQoKSk7CisgICAgICAgICAgICB0aW1lckV2ZW50U291cmNlKCkgPSBudWxscHRyOwogICAgICAg ICB9CiAgICAgfSk7CiAKQEAgLTE2MCwyMCArMTcwLDIwIEBAIHZvaWQgTWVtb3J5UHJlc3N1cmVI YW5kbGVyOjp1bmluc3RhbGwoKQogdm9pZCBNZW1vcnlQcmVzc3VyZUhhbmRsZXI6OmhvbGRPZmYo U2Vjb25kcyBzZWNvbmRzKQogewogICAgIGRpc3BhdGNoX2FzeW5jKG1fZGlzcGF0Y2hRdWV1ZS5n ZXQoKSwgXnsKLSAgICAgICAgdGltZXJFdmVudFNvdXJjZSA9IGRpc3BhdGNoX3NvdXJjZV9jcmVh dGUoRElTUEFUQ0hfU09VUkNFX1RZUEVfVElNRVIsIDAsIDAsIG1fZGlzcGF0Y2hRdWV1ZS5nZXQo KSk7Ci0gICAgICAgIGlmICh0aW1lckV2ZW50U291cmNlKSB7Ci0gICAgICAgICAgICBkaXNwYXRj aF9zZXRfY29udGV4dCh0aW1lckV2ZW50U291cmNlLCB0aGlzKTsKKyAgICAgICAgdGltZXJFdmVu dFNvdXJjZSgpID0gYWRvcHRPU09iamVjdChkaXNwYXRjaF9zb3VyY2VfY3JlYXRlKERJU1BBVENI X1NPVVJDRV9UWVBFX1RJTUVSLCAwLCAwLCBtX2Rpc3BhdGNoUXVldWUuZ2V0KCkpKTsKKyAgICAg ICAgaWYgKHRpbWVyRXZlbnRTb3VyY2UoKSkgeworICAgICAgICAgICAgZGlzcGF0Y2hfc2V0X2Nv bnRleHQodGltZXJFdmVudFNvdXJjZSgpLmdldCgpLCB0aGlzKTsKICAgICAgICAgICAgIC8vIEZJ WE1FOiBUaGUgZmluYWwgYXJndW1lbnQgYHNfbWluaW11bUhvbGRPZmZUaW1lLnNlY29uZHMoKWAg c2VlbXMgd3JvbmcuCiAgICAgICAgICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTgzMjc3Ci0gICAgICAgICAgICBkaXNwYXRjaF9zb3VyY2Vfc2V0X3RpbWVy KHRpbWVyRXZlbnRTb3VyY2UsIGRpc3BhdGNoX3RpbWUoRElTUEFUQ0hfVElNRV9OT1csIHNlY29u ZHMuc2Vjb25kcygpICogTlNFQ19QRVJfU0VDKSwgRElTUEFUQ0hfVElNRV9GT1JFVkVSLCBzX21p bmltdW1Ib2xkT2ZmVGltZS5zZWNvbmRzKCkpOwotICAgICAgICAgICAgZGlzcGF0Y2hfc291cmNl X3NldF9ldmVudF9oYW5kbGVyKHRpbWVyRXZlbnRTb3VyY2UsIF57Ci0gICAgICAgICAgICAgICAg aWYgKHRpbWVyRXZlbnRTb3VyY2UpIHsKLSAgICAgICAgICAgICAgICAgICAgZGlzcGF0Y2hfc291 cmNlX2NhbmNlbCh0aW1lckV2ZW50U291cmNlKTsKLSAgICAgICAgICAgICAgICAgICAgdGltZXJF dmVudFNvdXJjZSA9IG51bGxwdHI7CisgICAgICAgICAgICBkaXNwYXRjaF9zb3VyY2Vfc2V0X3Rp bWVyKHRpbWVyRXZlbnRTb3VyY2UoKS5nZXQoKSwgZGlzcGF0Y2hfdGltZShESVNQQVRDSF9USU1F X05PVywgc2Vjb25kcy5zZWNvbmRzKCkgKiBOU0VDX1BFUl9TRUMpLCBESVNQQVRDSF9USU1FX0ZP UkVWRVIsIHNfbWluaW11bUhvbGRPZmZUaW1lLnNlY29uZHMoKSk7CisgICAgICAgICAgICBkaXNw YXRjaF9zb3VyY2Vfc2V0X2V2ZW50X2hhbmRsZXIodGltZXJFdmVudFNvdXJjZSgpLmdldCgpLCBe eworICAgICAgICAgICAgICAgIGlmICh0aW1lckV2ZW50U291cmNlKCkuZ2V0KCkpIHsKKyAgICAg ICAgICAgICAgICAgICAgZGlzcGF0Y2hfc291cmNlX2NhbmNlbCh0aW1lckV2ZW50U291cmNlKCku Z2V0KCkpOworICAgICAgICAgICAgICAgICAgICB0aW1lckV2ZW50U291cmNlKCkgPSBudWxscHRy OwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBNZW1vcnlQcmVzc3VyZUhhbmRs ZXI6OnNpbmdsZXRvbigpLmluc3RhbGwoKTsKICAgICAgICAgICAgIH0pOwotICAgICAgICAgICAg ZGlzcGF0Y2hfcmVzdW1lKHRpbWVyRXZlbnRTb3VyY2UpOworICAgICAgICAgICAgZGlzcGF0Y2hf cmVzdW1lKHRpbWVyRXZlbnRTb3VyY2UoKS5nZXQoKSk7CiAgICAgICAgIH0KICAgICB9KTsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL3RocmVhZHMvU2lnbmFscy5jcHAgYi9Tb3VyY2Uv V1RGL3d0Zi90aHJlYWRzL1NpZ25hbHMuY3BwCmluZGV4IDBlMjdjNjUyNGY5Ni4uMmRhZjIxMWNk OTMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi90aHJlYWRzL1NpZ25hbHMuY3BwCisrKyBi L1NvdXJjZS9XVEYvd3RmL3RocmVhZHMvU2lnbmFscy5jcHAKQEAgLTUyLDYgKzUyLDcgQEAgZXh0 ZXJuICJDIiB7CiAjaW5jbHVkZSA8d3RmL0RhdGFMb2cuaD4KICNpbmNsdWRlIDx3dGYvTWF0aEV4 dHJhcy5oPgogI2luY2x1ZGUgPHd0Zi9OZXZlckRlc3Ryb3llZC5oPgorI2luY2x1ZGUgPHd0Zi9P U09iamVjdFB0ci5oPgogI2luY2x1ZGUgPHd0Zi9QbGF0Zm9ybVJlZ2lzdGVycy5oPgogI2luY2x1 ZGUgPHd0Zi9UaHJlYWRHcm91cC5oPgogI2luY2x1ZGUgPHd0Zi9UaHJlYWRpbmcuaD4KQEAgLTEw OSw4ICsxMTAsOSBAQCBzdGF0aWMgY29uc3RleHByIHNpemVfdCBtYXhNZXNzYWdlU2l6ZSA9IDEg KiBLQjsKIAogdm9pZCBzdGFydE1hY2hFeGNlcHRpb25IYW5kbGVyVGhyZWFkKCkKIHsKKyAgICBz dGF0aWMgTmV2ZXJEZXN0cm95ZWQ8T1NPYmplY3RQdHI8ZGlzcGF0Y2hfc291cmNlX3Q+PiBzb3Vy Y2U7CiAgICAgc3RhdGljIHN0ZDo6b25jZV9mbGFnIG9uY2U7Ci0gICAgc3RkOjpjYWxsX29uY2Uo b25jZSwgW10geworICAgIHN0ZDo6Y2FsbF9vbmNlKG9uY2UsIFsmXSB7CiAgICAgICAgIENvbmZp Zzo6QXNzZXJ0Tm90RnJvemVuU2NvcGUgYXNzZXJ0U2NvcGU7CiAgICAgICAgIFNpZ25hbEhhbmRs ZXJzJiBoYW5kbGVycyA9IGdfd3RmQ29uZmlnLnNpZ25hbEhhbmRsZXJzOwogICAgICAgICBrZXJu X3JldHVybl90IGtyID0gbWFjaF9wb3J0X2FsbG9jYXRlKG1hY2hfdGFza19zZWxmKCksIE1BQ0hf UE9SVF9SSUdIVF9SRUNFSVZFLCAmaGFuZGxlcnMuZXhjZXB0aW9uUG9ydCk7CkBAIC0xMTgsMTMg KzEyMCwxMSBAQCB2b2lkIHN0YXJ0TWFjaEV4Y2VwdGlvbkhhbmRsZXJUaHJlYWQoKQogICAgICAg ICBrciA9IG1hY2hfcG9ydF9pbnNlcnRfcmlnaHQobWFjaF90YXNrX3NlbGYoKSwgaGFuZGxlcnMu ZXhjZXB0aW9uUG9ydCwgaGFuZGxlcnMuZXhjZXB0aW9uUG9ydCwgTUFDSF9NU0dfVFlQRV9NQUtF X1NFTkQpOwogICAgICAgICBSRUxFQVNFX0FTU0VSVChrciA9PSBLRVJOX1NVQ0NFU1MpOwogCi0g ICAgICAgIGRpc3BhdGNoX3NvdXJjZV90IHNvdXJjZSA9IGRpc3BhdGNoX3NvdXJjZV9jcmVhdGUo Ci0gICAgICAgICAgICBESVNQQVRDSF9TT1VSQ0VfVFlQRV9NQUNIX1JFQ1YsIGhhbmRsZXJzLmV4 Y2VwdGlvblBvcnQsIDAsIERJU1BBVENIX1RBUkdFVF9RVUVVRV9ERUZBVUxUKTsKLSAgICAgICAg UkVMRUFTRV9BU1NFUlQoc291cmNlKTsKLQotICAgICAgICBkaXNwYXRjaF9zb3VyY2Vfc2V0X2V2 ZW50X2hhbmRsZXIoc291cmNlLCBeewotICAgICAgICAgICAgVU5VU0VEX1BBUkFNKHNvdXJjZSk7 IC8vIENhcHR1cmUgYSBwb2ludGVyIHRvIHNvdXJjZSBpbiB1c2VyIHNwYWNlIHRvIHNpbGVuY2Ug dGhlIGxlYWtzIHRvb2wuCisgICAgICAgIHNvdXJjZS5nZXQoKSA9IGFkb3B0T1NPYmplY3QoZGlz cGF0Y2hfc291cmNlX2NyZWF0ZSgKKyAgICAgICAgICAgIERJU1BBVENIX1NPVVJDRV9UWVBFX01B Q0hfUkVDViwgaGFuZGxlcnMuZXhjZXB0aW9uUG9ydCwgMCwgRElTUEFUQ0hfVEFSR0VUX1FVRVVF X0RFRkFVTFQpKTsKKyAgICAgICAgUkVMRUFTRV9BU1NFUlQoc291cmNlLmdldCgpKTsKIAorICAg ICAgICBkaXNwYXRjaF9zb3VyY2Vfc2V0X2V2ZW50X2hhbmRsZXIoc291cmNlLmdldCgpLmdldCgp LCBeewogICAgICAgICAgICAga2Vybl9yZXR1cm5fdCBrciA9IG1hY2hfbXNnX3NlcnZlcl9vbmNl KAogICAgICAgICAgICAgICAgIG1hY2hfZXhjX3NlcnZlciwgbWF4TWVzc2FnZVNpemUsIGhhbmRs ZXJzLmV4Y2VwdGlvblBvcnQsIE1BQ0hfTVNHX1RJTUVPVVRfTk9ORSk7CiAgICAgICAgICAgICBS RUxFQVNFX0FTU0VSVChrciA9PSBLRVJOX1NVQ0NFU1MpOwpAQCAtMTMyLDcgKzEzMiw3IEBAIHZv aWQgc3RhcnRNYWNoRXhjZXB0aW9uSGFuZGxlclRocmVhZCgpCiAKICAgICAgICAgLy8gTm8gbmVl ZCBmb3IgYSBjYW5jZWwgaGFuZGxlciBiZWNhdXNlIHdlIG5ldmVyIGRlc3Ryb3kgZXhjZXB0aW9u UG9ydC4KIAotICAgICAgICBkaXNwYXRjaF9yZXN1bWUoc291cmNlKTsKKyAgICAgICAgZGlzcGF0 Y2hfcmVzdW1lKHNvdXJjZS5nZXQoKS5nZXQoKSk7CiAgICAgfSk7CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvU2hhcmVkL0VudHJ5UG9pbnRVdGlsaXRpZXMvQ29jb2EvWFBDU2Vydmlj ZS9YUENTZXJ2aWNlRW50cnlQb2ludC5tbSBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0VudHJ5UG9p bnRVdGlsaXRpZXMvQ29jb2EvWFBDU2VydmljZS9YUENTZXJ2aWNlRW50cnlQb2ludC5tbQppbmRl eCBiYzA1OTJhNDQyOTUuLjNmZTljOWMwMzBkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9T aGFyZWQvRW50cnlQb2ludFV0aWxpdGllcy9Db2NvYS9YUENTZXJ2aWNlL1hQQ1NlcnZpY2VFbnRy eVBvaW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0VudHJ5UG9pbnRVdGlsaXRpZXMv Q29jb2EvWFBDU2VydmljZS9YUENTZXJ2aWNlRW50cnlQb2ludC5tbQpAQCAtMTU4LDYgKzE1OCw3 IEBAIGJvb2wgWFBDU2VydmljZUluaXRpYWxpemVyRGVsZWdhdGU6OmlzQ2xpZW50U2FuZGJveGVk KCkKIHZvaWQgc2V0T1NUcmFuc2FjdGlvbihPU09iamVjdFB0cjxvc190cmFuc2FjdGlvbl90PiYm IHRyYW5zYWN0aW9uKQogewogICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxPU09iamVjdFB0cjxv c190cmFuc2FjdGlvbl90Pj4gZ2xvYmFsVHJhbnNhY3Rpb247CisgICAgc3RhdGljIE5ldmVyRGVz dHJveWVkPE9TT2JqZWN0UHRyPGRpc3BhdGNoX3NvdXJjZV90Pj4gZ2xvYmFsU291cmNlOwogCiAg ICAgLy8gQmVjYXVzZSB3ZSBkb24ndCB1c2UgUnVubmluZ0JvYXJkIG9uIG1hY09TLCB3ZSBsZWFr IGFuIE9TIHRyYW5zYWN0aW9uIHRvIGNvbnRyb2wgdGhlIGxpZmV0aW1lIG9mIG91ciBYUEMKICAg ICAvLyBzZXJ2aWNlcyBvdXJzZWx2ZXMuIEhvd2V2ZXIsIG9uZSBvZiB0aGUgc2lkZSBlZmZlY3Rz IG9mIGxlYWtpbmcgdGhpcyB0cmFuc2FjdGlvbiBpcyB0aGF0IHRoZSBkZWZhdWx0IFNJR1RFUk0K QEAgLTE2NywxMSArMTY4LDExIEBAIHZvaWQgc2V0T1NUcmFuc2FjdGlvbihPU09iamVjdFB0cjxv c190cmFuc2FjdGlvbl90PiYmIHRyYW5zYWN0aW9uKQogICAgIC8vIGNvbnRyb2wgb3VyIGxpZmV0 aW1lIHZpYSBwcm9jZXNzIGFzc2VydGlvbnMgaW5zdGVhZCBvZiBsZWFraW5nIHRoaXMgT1MgdHJh bnNhY3Rpb24uCiAgICAgc3RhdGljIGRpc3BhdGNoX29uY2VfdCBmbGFnOwogICAgIGRpc3BhdGNo X29uY2UoJmZsYWcsIF57Ci0gICAgICAgIGF1dG8gc2lnVGVybVNvdXJjZSA9IGRpc3BhdGNoX3Nv dXJjZV9jcmVhdGUoRElTUEFUQ0hfU09VUkNFX1RZUEVfU0lHTkFMLCBTSUdURVJNLCAwLCBkaXNw YXRjaF9nZXRfbWFpbl9xdWV1ZSgpKTsKLSAgICAgICAgZGlzcGF0Y2hfc291cmNlX3NldF9ldmVu dF9oYW5kbGVyKHNpZ1Rlcm1Tb3VyY2UsIF57CisgICAgICAgIGdsb2JhbFNvdXJjZS5nZXQoKSA9 IGFkb3B0T1NPYmplY3QoZGlzcGF0Y2hfc291cmNlX2NyZWF0ZShESVNQQVRDSF9TT1VSQ0VfVFlQ RV9TSUdOQUwsIFNJR1RFUk0sIDAsIGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCkpKTsKKyAgICAg ICAgZGlzcGF0Y2hfc291cmNlX3NldF9ldmVudF9oYW5kbGVyKGdsb2JhbFNvdXJjZS5nZXQoKS5n ZXQoKSwgXnsKICAgICAgICAgICAgIGV4aXQoMCk7CiAgICAgICAgIH0pOwotICAgICAgICBkaXNw YXRjaF9yZXN1bWUoc2lnVGVybVNvdXJjZSk7CisgICAgICAgIGRpc3BhdGNoX3Jlc3VtZShnbG9i YWxTb3VyY2UuZ2V0KCkuZ2V0KCkpOwogICAgIH0pOwogCiAgICAgZ2xvYmFsVHJhbnNhY3Rpb24u Z2V0KCkgPSBXVEZNb3ZlKHRyYW5zYWN0aW9uKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9ibWFsbG9j L2JtYWxsb2MvU2NhdmVuZ2VyLmNwcCBiL1NvdXJjZS9ibWFsbG9jL2JtYWxsb2MvU2NhdmVuZ2Vy LmNwcAppbmRleCA4NmRiYjg2NGVhNzcuLmRkMGU5YTRlNmZlZSAxMDA2NDQKLS0tIGEvU291cmNl L2JtYWxsb2MvYm1hbGxvYy9TY2F2ZW5nZXIuY3BwCisrKyBiL1NvdXJjZS9ibWFsbG9jL2JtYWxs b2MvU2NhdmVuZ2VyLmNwcApAQCAtODAsNiArODAsNyBAQCBTY2F2ZW5nZXI6OlNjYXZlbmdlcihj b25zdCBMb2NrSG9sZGVyJikKIAogI2lmIEJPUyhEQVJXSU4pCiAgICAgYXV0byBxdWV1ZSA9IGRp c3BhdGNoX3F1ZXVlX2NyZWF0ZSgiV2ViS2l0IE1hbGxvYyBNZW1vcnkgUHJlc3N1cmUgSGFuZGxl ciIsIERJU1BBVENIX1FVRVVFX1NFUklBTCk7CisgICAgc3RhdGljX2Fzc2VydChfX2hhc19mZWF0 dXJlKG9iamNfYXJjKSk7CiAgICAgbV9wcmVzc3VyZUhhbmRsZXJEaXNwYXRjaFNvdXJjZSA9IGRp c3BhdGNoX3NvdXJjZV9jcmVhdGUoRElTUEFUQ0hfU09VUkNFX1RZUEVfTUVNT1JZUFJFU1NVUkUs IDAsIERJU1BBVENIX01FTU9SWVBSRVNTVVJFX0NSSVRJQ0FMLCBxdWV1ZSk7CiAgICAgZGlzcGF0 Y2hfc291cmNlX3NldF9ldmVudF9oYW5kbGVyKG1fcHJlc3N1cmVIYW5kbGVyRGlzcGF0Y2hTb3Vy Y2UsIF57CiAgICAgICAgIHNjYXZlbmdlKCk7Cg== 460406 2022-06-22 00:16:33 -0700 2022-06-22 00:41:39 -0700 Patch bug-241836-20220622001633.patch text/plain 11081 achristensen RnJvbSBlYWQwZjI3NTUwOGQ0ODE2YmFiMThkYjQxNGRmNWM0Yjc1YWIyNGMzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4IENocmlzdGVuc2VuIDxhY2hyaXN0ZW5zZW5AYXBwbGUu Y29tPgpEYXRlOiBUdWUsIDIxIEp1biAyMDIyIDE5OjQzOjU2IC0wNzAwClN1YmplY3Q6IFtQQVRD SF0gTWFrZSBzdXJlIHJldHVybiB2YWx1ZSBvZiBkaXNwYXRjaF9zb3VyY2VfY3JlYXRlIGlzIG1l bW9yeQogbWFuYWdlZCBjb3JyZWN0bHkgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTI0MTgzNgogcmRhcjovLzk1NjI1OTkwCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KCiogU291cmNlL1dURi93dGYvY29jb2EvTWVtb3J5UHJlc3N1cmVIYW5kbGVyQ29jb2EubW06 CihXVEY6Om1lbW9yeVByZXNzdXJlRXZlbnRTb3VyY2UpOgooV1RGOjp0aW1lckV2ZW50U291cmNl KToKKFdURjo6TWVtb3J5UHJlc3N1cmVIYW5kbGVyOjppbnN0YWxsKToKKFdURjo6TWVtb3J5UHJl c3N1cmVIYW5kbGVyOjp1bmluc3RhbGwpOgooV1RGOjpNZW1vcnlQcmVzc3VyZUhhbmRsZXI6Omhv bGRPZmYpOgoqIFNvdXJjZS9XVEYvd3RmL3RocmVhZHMvU2lnbmFscy5jcHA6CihXVEY6OnN0YXJ0 TWFjaEV4Y2VwdGlvbkhhbmRsZXJUaHJlYWQpOgoqIFNvdXJjZS9XZWJLaXQvU2hhcmVkL0VudHJ5 UG9pbnRVdGlsaXRpZXMvQ29jb2EvWFBDU2VydmljZS9YUENTZXJ2aWNlRW50cnlQb2ludC5tbToK KFdlYktpdDo6c2V0T1NUcmFuc2FjdGlvbik6CiogU291cmNlL2JtYWxsb2MvYm1hbGxvYy9TY2F2 ZW5nZXIuY3BwOgooYm1hbGxvYzo6U2NhdmVuZ2VyOjpTY2F2ZW5nZXIpOgotLS0KIC4uLi93dGYv Y29jb2EvTWVtb3J5UHJlc3N1cmVIYW5kbGVyQ29jb2EubW0gICB8IDU0ICsrKysrKysrKysrLS0t LS0tLS0KIFNvdXJjZS9XVEYvd3RmL3RocmVhZHMvU2lnbmFscy5jcHAgICAgICAgICAgICB8IDE2 ICsrKy0tLQogLi4uL0NvY29hL1hQQ1NlcnZpY2UvWFBDU2VydmljZUVudHJ5UG9pbnQubW0gIHwg IDcgKy0tCiBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL1NjYXZlbmdlci5jcHAgICAgICAgICAgfCAg NiArKysKIDQgZmlsZXMgY2hhbmdlZCwgNTAgaW5zZXJ0aW9ucygrKSwgMzMgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvY29jb2EvTWVtb3J5UHJlc3N1cmVIYW5kbGVy Q29jb2EubW0gYi9Tb3VyY2UvV1RGL3d0Zi9jb2NvYS9NZW1vcnlQcmVzc3VyZUhhbmRsZXJDb2Nv YS5tbQppbmRleCAzOWNmN2M4NmY2ODUuLmM3ZDUwZGY3OGVmYyAxMDA2NDQKLS0tIGEvU291cmNl L1dURi93dGYvY29jb2EvTWVtb3J5UHJlc3N1cmVIYW5kbGVyQ29jb2EubW0KKysrIGIvU291cmNl L1dURi93dGYvY29jb2EvTWVtb3J5UHJlc3N1cmVIYW5kbGVyQ29jb2EubW0KQEAgLTQ5LDggKzQ5 LDE4IEBAIHZvaWQgTWVtb3J5UHJlc3N1cmVIYW5kbGVyOjpwbGF0Zm9ybVJlbGVhc2VNZW1vcnko Q3JpdGljYWwgY3JpdGljYWwpCiAgICAgfQogfQogCi1zdGF0aWMgZGlzcGF0Y2hfc291cmNlX3Qg bWVtb3J5UHJlc3N1cmVFdmVudFNvdXJjZSA9IG51bGxwdHI7Ci1zdGF0aWMgZGlzcGF0Y2hfc291 cmNlX3QgdGltZXJFdmVudFNvdXJjZSA9IG51bGxwdHI7CitzdGF0aWMgT1NPYmplY3RQdHI8ZGlz cGF0Y2hfc291cmNlX3Q+JiBtZW1vcnlQcmVzc3VyZUV2ZW50U291cmNlKCkKK3sKKyAgICBzdGF0 aWMgTmV2ZXJEZXN0cm95ZWQ8T1NPYmplY3RQdHI8ZGlzcGF0Y2hfc291cmNlX3Q+PiBzb3VyY2U7 CisgICAgcmV0dXJuIHNvdXJjZS5nZXQoKTsKK30KKworc3RhdGljIE9TT2JqZWN0UHRyPGRpc3Bh dGNoX3NvdXJjZV90PiYgdGltZXJFdmVudFNvdXJjZSgpCit7CisgICAgc3RhdGljIE5ldmVyRGVz dHJveWVkPE9TT2JqZWN0UHRyPGRpc3BhdGNoX3NvdXJjZV90Pj4gc291cmNlOworICAgIHJldHVy biBzb3VyY2UuZ2V0KCk7Cit9CisKIHN0YXRpYyBpbnQgbm90aWZ5VG9rZW5zWzNdOwogCiAvLyBE aXNhYmxlIG1lbW9yeSBldmVudCByZWNlcHRpb24gZm9yIGEgbWluaW11bSBvZiBzX21pbmltdW1I b2xkT2ZmVGltZQpAQCAtNjYsMTUgKzc2LDE1IEBAIHN0YXRpYyBjb25zdGV4cHIgdW5zaWduZWQg c19ob2xkT2ZmTXVsdGlwbGllciA9IDIwOwogCiB2b2lkIE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6 aW5zdGFsbCgpCiB7Ci0gICAgaWYgKG1faW5zdGFsbGVkIHx8IHRpbWVyRXZlbnRTb3VyY2UpCisg ICAgaWYgKG1faW5zdGFsbGVkIHx8IHRpbWVyRXZlbnRTb3VyY2UoKSkKICAgICAgICAgcmV0dXJu OwogCiAgICAgZGlzcGF0Y2hfYXN5bmMobV9kaXNwYXRjaFF1ZXVlLmdldCgpLCBeewogICAgICAg ICBhdXRvIG1lbW9yeVN0YXR1c0ZsYWdzID0gRElTUEFUQ0hfTUVNT1JZUFJFU1NVUkVfTk9STUFM IHwgRElTUEFUQ0hfTUVNT1JZUFJFU1NVUkVfV0FSTiB8IERJU1BBVENIX01FTU9SWVBSRVNTVVJF X0NSSVRJQ0FMIHwgRElTUEFUQ0hfTUVNT1JZUFJFU1NVUkVfUFJPQ19MSU1JVF9XQVJOIHwgRElT UEFUQ0hfTUVNT1JZUFJFU1NVUkVfUFJPQ19MSU1JVF9DUklUSUNBTDsKLSAgICAgICAgbWVtb3J5 UHJlc3N1cmVFdmVudFNvdXJjZSA9IGRpc3BhdGNoX3NvdXJjZV9jcmVhdGUoRElTUEFUQ0hfU09V UkNFX1RZUEVfTUVNT1JZUFJFU1NVUkUsIDAsIG1lbW9yeVN0YXR1c0ZsYWdzLCBtX2Rpc3BhdGNo UXVldWUuZ2V0KCkpOworICAgICAgICBtZW1vcnlQcmVzc3VyZUV2ZW50U291cmNlKCkgPSBhZG9w dE9TT2JqZWN0KGRpc3BhdGNoX3NvdXJjZV9jcmVhdGUoRElTUEFUQ0hfU09VUkNFX1RZUEVfTUVN T1JZUFJFU1NVUkUsIDAsIG1lbW9yeVN0YXR1c0ZsYWdzLCBtX2Rpc3BhdGNoUXVldWUuZ2V0KCkp KTsKIAotICAgICAgICBkaXNwYXRjaF9zb3VyY2Vfc2V0X2V2ZW50X2hhbmRsZXIobWVtb3J5UHJl c3N1cmVFdmVudFNvdXJjZSwgXnsKLSAgICAgICAgICAgIGF1dG8gc3RhdHVzID0gZGlzcGF0Y2hf c291cmNlX2dldF9kYXRhKG1lbW9yeVByZXNzdXJlRXZlbnRTb3VyY2UpOworICAgICAgICBkaXNw YXRjaF9zb3VyY2Vfc2V0X2V2ZW50X2hhbmRsZXIobWVtb3J5UHJlc3N1cmVFdmVudFNvdXJjZSgp LmdldCgpLCBeeworICAgICAgICAgICAgYXV0byBzdGF0dXMgPSBkaXNwYXRjaF9zb3VyY2VfZ2V0 X2RhdGEobWVtb3J5UHJlc3N1cmVFdmVudFNvdXJjZSgpLmdldCgpKTsKICAgICAgICAgICAgIHN3 aXRjaCAoc3RhdHVzKSB7CiAgICAgICAgICAgICAvLyBWTSBwcmVzc3VyZSBldmVudHMuCiAgICAg ICAgICAgICBjYXNlIERJU1BBVENIX01FTU9SWVBSRVNTVVJFX05PUk1BTDoKQEAgLTEwMSw3ICsx MTEsNyBAQCB2b2lkIE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6aW5zdGFsbCgpCiAgICAgICAgICAg ICBpZiAobV9zaG91bGRMb2dNZW1vcnlNZW1vcnlQcmVzc3VyZUV2ZW50cykKICAgICAgICAgICAg ICAgICBSRUxFQVNFX0xPRyhNZW1vcnlQcmVzc3VyZSwgIlJlY2VpdmVkIG1lbW9yeSBwcmVzc3Vy ZSBldmVudCAlbHUgdm0gcHJlc3N1cmUgJWQiLCBzdGF0dXMsIGlzVW5kZXJNZW1vcnlQcmVzc3Vy ZSgpKTsKICAgICAgICAgfSk7Ci0gICAgICAgIGRpc3BhdGNoX3Jlc3VtZShtZW1vcnlQcmVzc3Vy ZUV2ZW50U291cmNlKTsKKyAgICAgICAgZGlzcGF0Y2hfcmVzdW1lKG1lbW9yeVByZXNzdXJlRXZl bnRTb3VyY2UoKS5nZXQoKSk7CiAgICAgfSk7CiAKICAgICAvLyBBbGxvdyBzaW11bGF0aW9uIG9m IG1lbW9yeSBwcmVzc3VyZSB3aXRoICJub3RpZnl1dGlsIC1wIG9yZy5XZWJLaXQubG93TWVtb3J5 IgpAQCAtMTQwLDE0ICsxNTAsMTQgQEAgdm9pZCBNZW1vcnlQcmVzc3VyZUhhbmRsZXI6OnVuaW5z dGFsbCgpCiAgICAgICAgIHJldHVybjsKIAogICAgIGRpc3BhdGNoX2FzeW5jKG1fZGlzcGF0Y2hR dWV1ZS5nZXQoKSwgXnsKLSAgICAgICAgaWYgKG1lbW9yeVByZXNzdXJlRXZlbnRTb3VyY2UpIHsK LSAgICAgICAgICAgIGRpc3BhdGNoX3NvdXJjZV9jYW5jZWwobWVtb3J5UHJlc3N1cmVFdmVudFNv dXJjZSk7Ci0gICAgICAgICAgICBtZW1vcnlQcmVzc3VyZUV2ZW50U291cmNlID0gbnVsbHB0cjsK KyAgICAgICAgaWYgKG1lbW9yeVByZXNzdXJlRXZlbnRTb3VyY2UoKSkgeworICAgICAgICAgICAg ZGlzcGF0Y2hfc291cmNlX2NhbmNlbChtZW1vcnlQcmVzc3VyZUV2ZW50U291cmNlKCkuZ2V0KCkp OworICAgICAgICAgICAgbWVtb3J5UHJlc3N1cmVFdmVudFNvdXJjZSgpID0gbnVsbHB0cjsKICAg ICAgICAgfQogCi0gICAgICAgIGlmICh0aW1lckV2ZW50U291cmNlKSB7Ci0gICAgICAgICAgICBk aXNwYXRjaF9zb3VyY2VfY2FuY2VsKHRpbWVyRXZlbnRTb3VyY2UpOwotICAgICAgICAgICAgdGlt ZXJFdmVudFNvdXJjZSA9IG51bGxwdHI7CisgICAgICAgIGlmICh0aW1lckV2ZW50U291cmNlKCkp IHsKKyAgICAgICAgICAgIGRpc3BhdGNoX3NvdXJjZV9jYW5jZWwodGltZXJFdmVudFNvdXJjZSgp LmdldCgpKTsKKyAgICAgICAgICAgIHRpbWVyRXZlbnRTb3VyY2UoKSA9IG51bGxwdHI7CiAgICAg ICAgIH0KICAgICB9KTsKIApAQCAtMTYwLDIwICsxNzAsMjAgQEAgdm9pZCBNZW1vcnlQcmVzc3Vy ZUhhbmRsZXI6OnVuaW5zdGFsbCgpCiB2b2lkIE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6aG9sZE9m ZihTZWNvbmRzIHNlY29uZHMpCiB7CiAgICAgZGlzcGF0Y2hfYXN5bmMobV9kaXNwYXRjaFF1ZXVl LmdldCgpLCBeewotICAgICAgICB0aW1lckV2ZW50U291cmNlID0gZGlzcGF0Y2hfc291cmNlX2Ny ZWF0ZShESVNQQVRDSF9TT1VSQ0VfVFlQRV9USU1FUiwgMCwgMCwgbV9kaXNwYXRjaFF1ZXVlLmdl dCgpKTsKLSAgICAgICAgaWYgKHRpbWVyRXZlbnRTb3VyY2UpIHsKLSAgICAgICAgICAgIGRpc3Bh dGNoX3NldF9jb250ZXh0KHRpbWVyRXZlbnRTb3VyY2UsIHRoaXMpOworICAgICAgICB0aW1lckV2 ZW50U291cmNlKCkgPSBhZG9wdE9TT2JqZWN0KGRpc3BhdGNoX3NvdXJjZV9jcmVhdGUoRElTUEFU Q0hfU09VUkNFX1RZUEVfVElNRVIsIDAsIDAsIG1fZGlzcGF0Y2hRdWV1ZS5nZXQoKSkpOworICAg ICAgICBpZiAodGltZXJFdmVudFNvdXJjZSgpKSB7CisgICAgICAgICAgICBkaXNwYXRjaF9zZXRf Y29udGV4dCh0aW1lckV2ZW50U291cmNlKCkuZ2V0KCksIHRoaXMpOwogICAgICAgICAgICAgLy8g RklYTUU6IFRoZSBmaW5hbCBhcmd1bWVudCBgc19taW5pbXVtSG9sZE9mZlRpbWUuc2Vjb25kcygp YCBzZWVtcyB3cm9uZy4KICAgICAgICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xODMyNzcKLSAgICAgICAgICAgIGRpc3BhdGNoX3NvdXJjZV9zZXRfdGlt ZXIodGltZXJFdmVudFNvdXJjZSwgZGlzcGF0Y2hfdGltZShESVNQQVRDSF9USU1FX05PVywgc2Vj b25kcy5zZWNvbmRzKCkgKiBOU0VDX1BFUl9TRUMpLCBESVNQQVRDSF9USU1FX0ZPUkVWRVIsIHNf bWluaW11bUhvbGRPZmZUaW1lLnNlY29uZHMoKSk7Ci0gICAgICAgICAgICBkaXNwYXRjaF9zb3Vy Y2Vfc2V0X2V2ZW50X2hhbmRsZXIodGltZXJFdmVudFNvdXJjZSwgXnsKLSAgICAgICAgICAgICAg ICBpZiAodGltZXJFdmVudFNvdXJjZSkgewotICAgICAgICAgICAgICAgICAgICBkaXNwYXRjaF9z b3VyY2VfY2FuY2VsKHRpbWVyRXZlbnRTb3VyY2UpOwotICAgICAgICAgICAgICAgICAgICB0aW1l ckV2ZW50U291cmNlID0gbnVsbHB0cjsKKyAgICAgICAgICAgIGRpc3BhdGNoX3NvdXJjZV9zZXRf dGltZXIodGltZXJFdmVudFNvdXJjZSgpLmdldCgpLCBkaXNwYXRjaF90aW1lKERJU1BBVENIX1RJ TUVfTk9XLCBzZWNvbmRzLnNlY29uZHMoKSAqIE5TRUNfUEVSX1NFQyksIERJU1BBVENIX1RJTUVf Rk9SRVZFUiwgc19taW5pbXVtSG9sZE9mZlRpbWUuc2Vjb25kcygpKTsKKyAgICAgICAgICAgIGRp c3BhdGNoX3NvdXJjZV9zZXRfZXZlbnRfaGFuZGxlcih0aW1lckV2ZW50U291cmNlKCkuZ2V0KCks IF57CisgICAgICAgICAgICAgICAgaWYgKHRpbWVyRXZlbnRTb3VyY2UoKS5nZXQoKSkgeworICAg ICAgICAgICAgICAgICAgICBkaXNwYXRjaF9zb3VyY2VfY2FuY2VsKHRpbWVyRXZlbnRTb3VyY2Uo KS5nZXQoKSk7CisgICAgICAgICAgICAgICAgICAgIHRpbWVyRXZlbnRTb3VyY2UoKSA9IG51bGxw dHI7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIE1lbW9yeVByZXNzdXJlSGFu ZGxlcjo6c2luZ2xldG9uKCkuaW5zdGFsbCgpOwogICAgICAgICAgICAgfSk7Ci0gICAgICAgICAg ICBkaXNwYXRjaF9yZXN1bWUodGltZXJFdmVudFNvdXJjZSk7CisgICAgICAgICAgICBkaXNwYXRj aF9yZXN1bWUodGltZXJFdmVudFNvdXJjZSgpLmdldCgpKTsKICAgICAgICAgfQogICAgIH0pOwog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvdGhyZWFkcy9TaWduYWxzLmNwcCBiL1NvdXJj ZS9XVEYvd3RmL3RocmVhZHMvU2lnbmFscy5jcHAKaW5kZXggMGUyN2M2NTI0Zjk2Li4zOWFkYmNk OGM4MmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL3RocmVhZHMvU2lnbmFscy5jcHAKKysr IGIvU291cmNlL1dURi93dGYvdGhyZWFkcy9TaWduYWxzLmNwcApAQCAtNDIsNiArNDIsNyBAQCBl eHRlcm4gIkMiIHsKICNpbmNsdWRlIDxkaXNwYXRjaC9kaXNwYXRjaC5oPgogI2luY2x1ZGUgPG1h Y2gvbWFjaC5oPgogI2luY2x1ZGUgPG1hY2gvdGhyZWFkX2FjdC5oPgorI2luY2x1ZGUgPHd0Zi9P U09iamVjdFB0ci5oPgogI2VuZGlmCiAKICNpZiBPUyhEQVJXSU4pCkBAIC0xMDksOCArMTEwLDkg QEAgc3RhdGljIGNvbnN0ZXhwciBzaXplX3QgbWF4TWVzc2FnZVNpemUgPSAxICogS0I7CiAKIHZv aWQgc3RhcnRNYWNoRXhjZXB0aW9uSGFuZGxlclRocmVhZCgpCiB7CisgICAgc3RhdGljIE5ldmVy RGVzdHJveWVkPE9TT2JqZWN0UHRyPGRpc3BhdGNoX3NvdXJjZV90Pj4gc291cmNlOwogICAgIHN0 YXRpYyBzdGQ6Om9uY2VfZmxhZyBvbmNlOwotICAgIHN0ZDo6Y2FsbF9vbmNlKG9uY2UsIFtdIHsK KyAgICBzdGQ6OmNhbGxfb25jZShvbmNlLCBbJl0gewogICAgICAgICBDb25maWc6OkFzc2VydE5v dEZyb3plblNjb3BlIGFzc2VydFNjb3BlOwogICAgICAgICBTaWduYWxIYW5kbGVycyYgaGFuZGxl cnMgPSBnX3d0ZkNvbmZpZy5zaWduYWxIYW5kbGVyczsKICAgICAgICAga2Vybl9yZXR1cm5fdCBr ciA9IG1hY2hfcG9ydF9hbGxvY2F0ZShtYWNoX3Rhc2tfc2VsZigpLCBNQUNIX1BPUlRfUklHSFRf UkVDRUlWRSwgJmhhbmRsZXJzLmV4Y2VwdGlvblBvcnQpOwpAQCAtMTE4LDEzICsxMjAsMTEgQEAg dm9pZCBzdGFydE1hY2hFeGNlcHRpb25IYW5kbGVyVGhyZWFkKCkKICAgICAgICAga3IgPSBtYWNo X3BvcnRfaW5zZXJ0X3JpZ2h0KG1hY2hfdGFza19zZWxmKCksIGhhbmRsZXJzLmV4Y2VwdGlvblBv cnQsIGhhbmRsZXJzLmV4Y2VwdGlvblBvcnQsIE1BQ0hfTVNHX1RZUEVfTUFLRV9TRU5EKTsKICAg ICAgICAgUkVMRUFTRV9BU1NFUlQoa3IgPT0gS0VSTl9TVUNDRVNTKTsKIAotICAgICAgICBkaXNw YXRjaF9zb3VyY2VfdCBzb3VyY2UgPSBkaXNwYXRjaF9zb3VyY2VfY3JlYXRlKAotICAgICAgICAg ICAgRElTUEFUQ0hfU09VUkNFX1RZUEVfTUFDSF9SRUNWLCBoYW5kbGVycy5leGNlcHRpb25Qb3J0 LCAwLCBESVNQQVRDSF9UQVJHRVRfUVVFVUVfREVGQVVMVCk7Ci0gICAgICAgIFJFTEVBU0VfQVNT RVJUKHNvdXJjZSk7Ci0KLSAgICAgICAgZGlzcGF0Y2hfc291cmNlX3NldF9ldmVudF9oYW5kbGVy KHNvdXJjZSwgXnsKLSAgICAgICAgICAgIFVOVVNFRF9QQVJBTShzb3VyY2UpOyAvLyBDYXB0dXJl IGEgcG9pbnRlciB0byBzb3VyY2UgaW4gdXNlciBzcGFjZSB0byBzaWxlbmNlIHRoZSBsZWFrcyB0 b29sLgorICAgICAgICBzb3VyY2UuZ2V0KCkgPSBhZG9wdE9TT2JqZWN0KGRpc3BhdGNoX3NvdXJj ZV9jcmVhdGUoCisgICAgICAgICAgICBESVNQQVRDSF9TT1VSQ0VfVFlQRV9NQUNIX1JFQ1YsIGhh bmRsZXJzLmV4Y2VwdGlvblBvcnQsIDAsIERJU1BBVENIX1RBUkdFVF9RVUVVRV9ERUZBVUxUKSk7 CisgICAgICAgIFJFTEVBU0VfQVNTRVJUKHNvdXJjZS5nZXQoKSk7CiAKKyAgICAgICAgZGlzcGF0 Y2hfc291cmNlX3NldF9ldmVudF9oYW5kbGVyKHNvdXJjZS5nZXQoKS5nZXQoKSwgXnsKICAgICAg ICAgICAgIGtlcm5fcmV0dXJuX3Qga3IgPSBtYWNoX21zZ19zZXJ2ZXJfb25jZSgKICAgICAgICAg ICAgICAgICBtYWNoX2V4Y19zZXJ2ZXIsIG1heE1lc3NhZ2VTaXplLCBoYW5kbGVycy5leGNlcHRp b25Qb3J0LCBNQUNIX01TR19USU1FT1VUX05PTkUpOwogICAgICAgICAgICAgUkVMRUFTRV9BU1NF UlQoa3IgPT0gS0VSTl9TVUNDRVNTKTsKQEAgLTEzMiw3ICsxMzIsNyBAQCB2b2lkIHN0YXJ0TWFj aEV4Y2VwdGlvbkhhbmRsZXJUaHJlYWQoKQogCiAgICAgICAgIC8vIE5vIG5lZWQgZm9yIGEgY2Fu Y2VsIGhhbmRsZXIgYmVjYXVzZSB3ZSBuZXZlciBkZXN0cm95IGV4Y2VwdGlvblBvcnQuCiAKLSAg ICAgICAgZGlzcGF0Y2hfcmVzdW1lKHNvdXJjZSk7CisgICAgICAgIGRpc3BhdGNoX3Jlc3VtZShz b3VyY2UuZ2V0KCkuZ2V0KCkpOwogICAgIH0pOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1NoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVzL0NvY29hL1hQQ1NlcnZpY2UvWFBDU2Vydmlj ZUVudHJ5UG9pbnQubW0gYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVz L0NvY29hL1hQQ1NlcnZpY2UvWFBDU2VydmljZUVudHJ5UG9pbnQubW0KaW5kZXggYmMwNTkyYTQ0 Mjk1Li4zZmU5YzljMDMwZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0VudHJ5 UG9pbnRVdGlsaXRpZXMvQ29jb2EvWFBDU2VydmljZS9YUENTZXJ2aWNlRW50cnlQb2ludC5tbQor KysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVzL0NvY29hL1hQQ1Nl cnZpY2UvWFBDU2VydmljZUVudHJ5UG9pbnQubW0KQEAgLTE1OCw2ICsxNTgsNyBAQCBib29sIFhQ Q1NlcnZpY2VJbml0aWFsaXplckRlbGVnYXRlOjppc0NsaWVudFNhbmRib3hlZCgpCiB2b2lkIHNl dE9TVHJhbnNhY3Rpb24oT1NPYmplY3RQdHI8b3NfdHJhbnNhY3Rpb25fdD4mJiB0cmFuc2FjdGlv bikKIHsKICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8T1NPYmplY3RQdHI8b3NfdHJhbnNhY3Rp b25fdD4+IGdsb2JhbFRyYW5zYWN0aW9uOworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxPU09i amVjdFB0cjxkaXNwYXRjaF9zb3VyY2VfdD4+IGdsb2JhbFNvdXJjZTsKIAogICAgIC8vIEJlY2F1 c2Ugd2UgZG9uJ3QgdXNlIFJ1bm5pbmdCb2FyZCBvbiBtYWNPUywgd2UgbGVhayBhbiBPUyB0cmFu c2FjdGlvbiB0byBjb250cm9sIHRoZSBsaWZldGltZSBvZiBvdXIgWFBDCiAgICAgLy8gc2Vydmlj ZXMgb3Vyc2VsdmVzLiBIb3dldmVyLCBvbmUgb2YgdGhlIHNpZGUgZWZmZWN0cyBvZiBsZWFraW5n IHRoaXMgdHJhbnNhY3Rpb24gaXMgdGhhdCB0aGUgZGVmYXVsdCBTSUdURVJNCkBAIC0xNjcsMTEg KzE2OCwxMSBAQCB2b2lkIHNldE9TVHJhbnNhY3Rpb24oT1NPYmplY3RQdHI8b3NfdHJhbnNhY3Rp b25fdD4mJiB0cmFuc2FjdGlvbikKICAgICAvLyBjb250cm9sIG91ciBsaWZldGltZSB2aWEgcHJv Y2VzcyBhc3NlcnRpb25zIGluc3RlYWQgb2YgbGVha2luZyB0aGlzIE9TIHRyYW5zYWN0aW9uLgog ICAgIHN0YXRpYyBkaXNwYXRjaF9vbmNlX3QgZmxhZzsKICAgICBkaXNwYXRjaF9vbmNlKCZmbGFn LCBeewotICAgICAgICBhdXRvIHNpZ1Rlcm1Tb3VyY2UgPSBkaXNwYXRjaF9zb3VyY2VfY3JlYXRl KERJU1BBVENIX1NPVVJDRV9UWVBFX1NJR05BTCwgU0lHVEVSTSwgMCwgZGlzcGF0Y2hfZ2V0X21h aW5fcXVldWUoKSk7Ci0gICAgICAgIGRpc3BhdGNoX3NvdXJjZV9zZXRfZXZlbnRfaGFuZGxlcihz aWdUZXJtU291cmNlLCBeeworICAgICAgICBnbG9iYWxTb3VyY2UuZ2V0KCkgPSBhZG9wdE9TT2Jq ZWN0KGRpc3BhdGNoX3NvdXJjZV9jcmVhdGUoRElTUEFUQ0hfU09VUkNFX1RZUEVfU0lHTkFMLCBT SUdURVJNLCAwLCBkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpKSk7CisgICAgICAgIGRpc3BhdGNo X3NvdXJjZV9zZXRfZXZlbnRfaGFuZGxlcihnbG9iYWxTb3VyY2UuZ2V0KCkuZ2V0KCksIF57CiAg ICAgICAgICAgICBleGl0KDApOwogICAgICAgICB9KTsKLSAgICAgICAgZGlzcGF0Y2hfcmVzdW1l KHNpZ1Rlcm1Tb3VyY2UpOworICAgICAgICBkaXNwYXRjaF9yZXN1bWUoZ2xvYmFsU291cmNlLmdl dCgpLmdldCgpKTsKICAgICB9KTsKIAogICAgIGdsb2JhbFRyYW5zYWN0aW9uLmdldCgpID0gV1RG TW92ZSh0cmFuc2FjdGlvbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvYm1hbGxvYy9ibWFsbG9jL1Nj YXZlbmdlci5jcHAgYi9Tb3VyY2UvYm1hbGxvYy9ibWFsbG9jL1NjYXZlbmdlci5jcHAKaW5kZXgg ODZkYmI4NjRlYTc3Li5iMWY2N2FmYTA4NDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9ibWFsbG9jL2Jt YWxsb2MvU2NhdmVuZ2VyLmNwcAorKysgYi9Tb3VyY2UvYm1hbGxvYy9ibWFsbG9jL1NjYXZlbmdl ci5jcHAKQEAgLTgwLDYgKzgwLDEyIEBAIFNjYXZlbmdlcjo6U2NhdmVuZ2VyKGNvbnN0IExvY2tI b2xkZXImKQogCiAjaWYgQk9TKERBUldJTikKICAgICBhdXRvIHF1ZXVlID0gZGlzcGF0Y2hfcXVl dWVfY3JlYXRlKCJXZWJLaXQgTWFsbG9jIE1lbW9yeSBQcmVzc3VyZSBIYW5kbGVyIiwgRElTUEFU Q0hfUVVFVUVfU0VSSUFMKTsKKyNpZiBQTEFURk9STShXQVRDSE9TKQorICAgIC8vIEZJWE1FOiBU aGlzIGlzIGNvbmNlcm5pbmcuCisgICAgc3RhdGljX2Fzc2VydCghX19oYXNfZmVhdHVyZShvYmpj X2FyYykpOworI2Vsc2UKKyAgICBzdGF0aWNfYXNzZXJ0KF9faGFzX2ZlYXR1cmUob2JqY19hcmMp KTsKKyNlbmRpZgogICAgIG1fcHJlc3N1cmVIYW5kbGVyRGlzcGF0Y2hTb3VyY2UgPSBkaXNwYXRj aF9zb3VyY2VfY3JlYXRlKERJU1BBVENIX1NPVVJDRV9UWVBFX01FTU9SWVBSRVNTVVJFLCAwLCBE SVNQQVRDSF9NRU1PUllQUkVTU1VSRV9DUklUSUNBTCwgcXVldWUpOwogICAgIGRpc3BhdGNoX3Nv dXJjZV9zZXRfZXZlbnRfaGFuZGxlcihtX3ByZXNzdXJlSGFuZGxlckRpc3BhdGNoU291cmNlLCBe ewogICAgICAgICBzY2F2ZW5nZSgpOwo= 460409 2022-06-22 00:41:41 -0700 2022-06-22 10:17:23 -0700 Patch bug-241836-20220622004140.patch text/plain 11082 achristensen RnJvbSBjZDRmZDZlOThmZGNiYjNkMmZiZGU4ZGU0MmQ4ZGYzNDQ3OTE5ODVjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4IENocmlzdGVuc2VuIDxhY2hyaXN0ZW5zZW5AYXBwbGUu Y29tPgpEYXRlOiBXZWQsIDIyIEp1biAyMDIyIDAwOjQwOjU3IC0wNzAwClN1YmplY3Q6IFtQQVRD SF0gTWFrZSBzdXJlIHJldHVybiB2YWx1ZSBvZiBkaXNwYXRjaF9zb3VyY2VfY3JlYXRlIGlzIG1l bW9yeQogbWFuYWdlZCBjb3JyZWN0bHkgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTI0MTgzNgogcmRhcjovLzk1NjI1OTkwCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KCiogU291cmNlL1dURi93dGYvY29jb2EvTWVtb3J5UHJlc3N1cmVIYW5kbGVyQ29jb2EubW06 CihXVEY6Om1lbW9yeVByZXNzdXJlRXZlbnRTb3VyY2UpOgooV1RGOjp0aW1lckV2ZW50U291cmNl KToKKFdURjo6TWVtb3J5UHJlc3N1cmVIYW5kbGVyOjppbnN0YWxsKToKKFdURjo6TWVtb3J5UHJl c3N1cmVIYW5kbGVyOjp1bmluc3RhbGwpOgooV1RGOjpNZW1vcnlQcmVzc3VyZUhhbmRsZXI6Omhv bGRPZmYpOgoqIFNvdXJjZS9XVEYvd3RmL3RocmVhZHMvU2lnbmFscy5jcHA6CihXVEY6OnN0YXJ0 TWFjaEV4Y2VwdGlvbkhhbmRsZXJUaHJlYWQpOgoqIFNvdXJjZS9XZWJLaXQvU2hhcmVkL0VudHJ5 UG9pbnRVdGlsaXRpZXMvQ29jb2EvWFBDU2VydmljZS9YUENTZXJ2aWNlRW50cnlQb2ludC5tbToK KFdlYktpdDo6c2V0T1NUcmFuc2FjdGlvbik6CiogU291cmNlL2JtYWxsb2MvYm1hbGxvYy9TY2F2 ZW5nZXIuY3BwOgooYm1hbGxvYzo6U2NhdmVuZ2VyOjpTY2F2ZW5nZXIpOgotLS0KIC4uLi93dGYv Y29jb2EvTWVtb3J5UHJlc3N1cmVIYW5kbGVyQ29jb2EubW0gICB8IDU0ICsrKysrKysrKysrLS0t LS0tLS0KIFNvdXJjZS9XVEYvd3RmL3RocmVhZHMvU2lnbmFscy5jcHAgICAgICAgICAgICB8IDE2 ICsrKy0tLQogLi4uL0NvY29hL1hQQ1NlcnZpY2UvWFBDU2VydmljZUVudHJ5UG9pbnQubW0gIHwg IDcgKy0tCiBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL1NjYXZlbmdlci5jcHAgICAgICAgICAgfCAg NiArKysKIDQgZmlsZXMgY2hhbmdlZCwgNTAgaW5zZXJ0aW9ucygrKSwgMzMgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvY29jb2EvTWVtb3J5UHJlc3N1cmVIYW5kbGVy Q29jb2EubW0gYi9Tb3VyY2UvV1RGL3d0Zi9jb2NvYS9NZW1vcnlQcmVzc3VyZUhhbmRsZXJDb2Nv YS5tbQppbmRleCAzOWNmN2M4NmY2ODUuLmM3ZDUwZGY3OGVmYyAxMDA2NDQKLS0tIGEvU291cmNl L1dURi93dGYvY29jb2EvTWVtb3J5UHJlc3N1cmVIYW5kbGVyQ29jb2EubW0KKysrIGIvU291cmNl L1dURi93dGYvY29jb2EvTWVtb3J5UHJlc3N1cmVIYW5kbGVyQ29jb2EubW0KQEAgLTQ5LDggKzQ5 LDE4IEBAIHZvaWQgTWVtb3J5UHJlc3N1cmVIYW5kbGVyOjpwbGF0Zm9ybVJlbGVhc2VNZW1vcnko Q3JpdGljYWwgY3JpdGljYWwpCiAgICAgfQogfQogCi1zdGF0aWMgZGlzcGF0Y2hfc291cmNlX3Qg bWVtb3J5UHJlc3N1cmVFdmVudFNvdXJjZSA9IG51bGxwdHI7Ci1zdGF0aWMgZGlzcGF0Y2hfc291 cmNlX3QgdGltZXJFdmVudFNvdXJjZSA9IG51bGxwdHI7CitzdGF0aWMgT1NPYmplY3RQdHI8ZGlz cGF0Y2hfc291cmNlX3Q+JiBtZW1vcnlQcmVzc3VyZUV2ZW50U291cmNlKCkKK3sKKyAgICBzdGF0 aWMgTmV2ZXJEZXN0cm95ZWQ8T1NPYmplY3RQdHI8ZGlzcGF0Y2hfc291cmNlX3Q+PiBzb3VyY2U7 CisgICAgcmV0dXJuIHNvdXJjZS5nZXQoKTsKK30KKworc3RhdGljIE9TT2JqZWN0UHRyPGRpc3Bh dGNoX3NvdXJjZV90PiYgdGltZXJFdmVudFNvdXJjZSgpCit7CisgICAgc3RhdGljIE5ldmVyRGVz dHJveWVkPE9TT2JqZWN0UHRyPGRpc3BhdGNoX3NvdXJjZV90Pj4gc291cmNlOworICAgIHJldHVy biBzb3VyY2UuZ2V0KCk7Cit9CisKIHN0YXRpYyBpbnQgbm90aWZ5VG9rZW5zWzNdOwogCiAvLyBE aXNhYmxlIG1lbW9yeSBldmVudCByZWNlcHRpb24gZm9yIGEgbWluaW11bSBvZiBzX21pbmltdW1I b2xkT2ZmVGltZQpAQCAtNjYsMTUgKzc2LDE1IEBAIHN0YXRpYyBjb25zdGV4cHIgdW5zaWduZWQg c19ob2xkT2ZmTXVsdGlwbGllciA9IDIwOwogCiB2b2lkIE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6 aW5zdGFsbCgpCiB7Ci0gICAgaWYgKG1faW5zdGFsbGVkIHx8IHRpbWVyRXZlbnRTb3VyY2UpCisg ICAgaWYgKG1faW5zdGFsbGVkIHx8IHRpbWVyRXZlbnRTb3VyY2UoKSkKICAgICAgICAgcmV0dXJu OwogCiAgICAgZGlzcGF0Y2hfYXN5bmMobV9kaXNwYXRjaFF1ZXVlLmdldCgpLCBeewogICAgICAg ICBhdXRvIG1lbW9yeVN0YXR1c0ZsYWdzID0gRElTUEFUQ0hfTUVNT1JZUFJFU1NVUkVfTk9STUFM IHwgRElTUEFUQ0hfTUVNT1JZUFJFU1NVUkVfV0FSTiB8IERJU1BBVENIX01FTU9SWVBSRVNTVVJF X0NSSVRJQ0FMIHwgRElTUEFUQ0hfTUVNT1JZUFJFU1NVUkVfUFJPQ19MSU1JVF9XQVJOIHwgRElT UEFUQ0hfTUVNT1JZUFJFU1NVUkVfUFJPQ19MSU1JVF9DUklUSUNBTDsKLSAgICAgICAgbWVtb3J5 UHJlc3N1cmVFdmVudFNvdXJjZSA9IGRpc3BhdGNoX3NvdXJjZV9jcmVhdGUoRElTUEFUQ0hfU09V UkNFX1RZUEVfTUVNT1JZUFJFU1NVUkUsIDAsIG1lbW9yeVN0YXR1c0ZsYWdzLCBtX2Rpc3BhdGNo UXVldWUuZ2V0KCkpOworICAgICAgICBtZW1vcnlQcmVzc3VyZUV2ZW50U291cmNlKCkgPSBhZG9w dE9TT2JqZWN0KGRpc3BhdGNoX3NvdXJjZV9jcmVhdGUoRElTUEFUQ0hfU09VUkNFX1RZUEVfTUVN T1JZUFJFU1NVUkUsIDAsIG1lbW9yeVN0YXR1c0ZsYWdzLCBtX2Rpc3BhdGNoUXVldWUuZ2V0KCkp KTsKIAotICAgICAgICBkaXNwYXRjaF9zb3VyY2Vfc2V0X2V2ZW50X2hhbmRsZXIobWVtb3J5UHJl c3N1cmVFdmVudFNvdXJjZSwgXnsKLSAgICAgICAgICAgIGF1dG8gc3RhdHVzID0gZGlzcGF0Y2hf c291cmNlX2dldF9kYXRhKG1lbW9yeVByZXNzdXJlRXZlbnRTb3VyY2UpOworICAgICAgICBkaXNw YXRjaF9zb3VyY2Vfc2V0X2V2ZW50X2hhbmRsZXIobWVtb3J5UHJlc3N1cmVFdmVudFNvdXJjZSgp LmdldCgpLCBeeworICAgICAgICAgICAgYXV0byBzdGF0dXMgPSBkaXNwYXRjaF9zb3VyY2VfZ2V0 X2RhdGEobWVtb3J5UHJlc3N1cmVFdmVudFNvdXJjZSgpLmdldCgpKTsKICAgICAgICAgICAgIHN3 aXRjaCAoc3RhdHVzKSB7CiAgICAgICAgICAgICAvLyBWTSBwcmVzc3VyZSBldmVudHMuCiAgICAg ICAgICAgICBjYXNlIERJU1BBVENIX01FTU9SWVBSRVNTVVJFX05PUk1BTDoKQEAgLTEwMSw3ICsx MTEsNyBAQCB2b2lkIE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6aW5zdGFsbCgpCiAgICAgICAgICAg ICBpZiAobV9zaG91bGRMb2dNZW1vcnlNZW1vcnlQcmVzc3VyZUV2ZW50cykKICAgICAgICAgICAg ICAgICBSRUxFQVNFX0xPRyhNZW1vcnlQcmVzc3VyZSwgIlJlY2VpdmVkIG1lbW9yeSBwcmVzc3Vy ZSBldmVudCAlbHUgdm0gcHJlc3N1cmUgJWQiLCBzdGF0dXMsIGlzVW5kZXJNZW1vcnlQcmVzc3Vy ZSgpKTsKICAgICAgICAgfSk7Ci0gICAgICAgIGRpc3BhdGNoX3Jlc3VtZShtZW1vcnlQcmVzc3Vy ZUV2ZW50U291cmNlKTsKKyAgICAgICAgZGlzcGF0Y2hfcmVzdW1lKG1lbW9yeVByZXNzdXJlRXZl bnRTb3VyY2UoKS5nZXQoKSk7CiAgICAgfSk7CiAKICAgICAvLyBBbGxvdyBzaW11bGF0aW9uIG9m IG1lbW9yeSBwcmVzc3VyZSB3aXRoICJub3RpZnl1dGlsIC1wIG9yZy5XZWJLaXQubG93TWVtb3J5 IgpAQCAtMTQwLDE0ICsxNTAsMTQgQEAgdm9pZCBNZW1vcnlQcmVzc3VyZUhhbmRsZXI6OnVuaW5z dGFsbCgpCiAgICAgICAgIHJldHVybjsKIAogICAgIGRpc3BhdGNoX2FzeW5jKG1fZGlzcGF0Y2hR dWV1ZS5nZXQoKSwgXnsKLSAgICAgICAgaWYgKG1lbW9yeVByZXNzdXJlRXZlbnRTb3VyY2UpIHsK LSAgICAgICAgICAgIGRpc3BhdGNoX3NvdXJjZV9jYW5jZWwobWVtb3J5UHJlc3N1cmVFdmVudFNv dXJjZSk7Ci0gICAgICAgICAgICBtZW1vcnlQcmVzc3VyZUV2ZW50U291cmNlID0gbnVsbHB0cjsK KyAgICAgICAgaWYgKG1lbW9yeVByZXNzdXJlRXZlbnRTb3VyY2UoKSkgeworICAgICAgICAgICAg ZGlzcGF0Y2hfc291cmNlX2NhbmNlbChtZW1vcnlQcmVzc3VyZUV2ZW50U291cmNlKCkuZ2V0KCkp OworICAgICAgICAgICAgbWVtb3J5UHJlc3N1cmVFdmVudFNvdXJjZSgpID0gbnVsbHB0cjsKICAg ICAgICAgfQogCi0gICAgICAgIGlmICh0aW1lckV2ZW50U291cmNlKSB7Ci0gICAgICAgICAgICBk aXNwYXRjaF9zb3VyY2VfY2FuY2VsKHRpbWVyRXZlbnRTb3VyY2UpOwotICAgICAgICAgICAgdGlt ZXJFdmVudFNvdXJjZSA9IG51bGxwdHI7CisgICAgICAgIGlmICh0aW1lckV2ZW50U291cmNlKCkp IHsKKyAgICAgICAgICAgIGRpc3BhdGNoX3NvdXJjZV9jYW5jZWwodGltZXJFdmVudFNvdXJjZSgp LmdldCgpKTsKKyAgICAgICAgICAgIHRpbWVyRXZlbnRTb3VyY2UoKSA9IG51bGxwdHI7CiAgICAg ICAgIH0KICAgICB9KTsKIApAQCAtMTYwLDIwICsxNzAsMjAgQEAgdm9pZCBNZW1vcnlQcmVzc3Vy ZUhhbmRsZXI6OnVuaW5zdGFsbCgpCiB2b2lkIE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6aG9sZE9m ZihTZWNvbmRzIHNlY29uZHMpCiB7CiAgICAgZGlzcGF0Y2hfYXN5bmMobV9kaXNwYXRjaFF1ZXVl LmdldCgpLCBeewotICAgICAgICB0aW1lckV2ZW50U291cmNlID0gZGlzcGF0Y2hfc291cmNlX2Ny ZWF0ZShESVNQQVRDSF9TT1VSQ0VfVFlQRV9USU1FUiwgMCwgMCwgbV9kaXNwYXRjaFF1ZXVlLmdl dCgpKTsKLSAgICAgICAgaWYgKHRpbWVyRXZlbnRTb3VyY2UpIHsKLSAgICAgICAgICAgIGRpc3Bh dGNoX3NldF9jb250ZXh0KHRpbWVyRXZlbnRTb3VyY2UsIHRoaXMpOworICAgICAgICB0aW1lckV2 ZW50U291cmNlKCkgPSBhZG9wdE9TT2JqZWN0KGRpc3BhdGNoX3NvdXJjZV9jcmVhdGUoRElTUEFU Q0hfU09VUkNFX1RZUEVfVElNRVIsIDAsIDAsIG1fZGlzcGF0Y2hRdWV1ZS5nZXQoKSkpOworICAg ICAgICBpZiAodGltZXJFdmVudFNvdXJjZSgpKSB7CisgICAgICAgICAgICBkaXNwYXRjaF9zZXRf Y29udGV4dCh0aW1lckV2ZW50U291cmNlKCkuZ2V0KCksIHRoaXMpOwogICAgICAgICAgICAgLy8g RklYTUU6IFRoZSBmaW5hbCBhcmd1bWVudCBgc19taW5pbXVtSG9sZE9mZlRpbWUuc2Vjb25kcygp YCBzZWVtcyB3cm9uZy4KICAgICAgICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xODMyNzcKLSAgICAgICAgICAgIGRpc3BhdGNoX3NvdXJjZV9zZXRfdGlt ZXIodGltZXJFdmVudFNvdXJjZSwgZGlzcGF0Y2hfdGltZShESVNQQVRDSF9USU1FX05PVywgc2Vj b25kcy5zZWNvbmRzKCkgKiBOU0VDX1BFUl9TRUMpLCBESVNQQVRDSF9USU1FX0ZPUkVWRVIsIHNf bWluaW11bUhvbGRPZmZUaW1lLnNlY29uZHMoKSk7Ci0gICAgICAgICAgICBkaXNwYXRjaF9zb3Vy Y2Vfc2V0X2V2ZW50X2hhbmRsZXIodGltZXJFdmVudFNvdXJjZSwgXnsKLSAgICAgICAgICAgICAg ICBpZiAodGltZXJFdmVudFNvdXJjZSkgewotICAgICAgICAgICAgICAgICAgICBkaXNwYXRjaF9z b3VyY2VfY2FuY2VsKHRpbWVyRXZlbnRTb3VyY2UpOwotICAgICAgICAgICAgICAgICAgICB0aW1l ckV2ZW50U291cmNlID0gbnVsbHB0cjsKKyAgICAgICAgICAgIGRpc3BhdGNoX3NvdXJjZV9zZXRf dGltZXIodGltZXJFdmVudFNvdXJjZSgpLmdldCgpLCBkaXNwYXRjaF90aW1lKERJU1BBVENIX1RJ TUVfTk9XLCBzZWNvbmRzLnNlY29uZHMoKSAqIE5TRUNfUEVSX1NFQyksIERJU1BBVENIX1RJTUVf Rk9SRVZFUiwgc19taW5pbXVtSG9sZE9mZlRpbWUuc2Vjb25kcygpKTsKKyAgICAgICAgICAgIGRp c3BhdGNoX3NvdXJjZV9zZXRfZXZlbnRfaGFuZGxlcih0aW1lckV2ZW50U291cmNlKCkuZ2V0KCks IF57CisgICAgICAgICAgICAgICAgaWYgKHRpbWVyRXZlbnRTb3VyY2UoKS5nZXQoKSkgeworICAg ICAgICAgICAgICAgICAgICBkaXNwYXRjaF9zb3VyY2VfY2FuY2VsKHRpbWVyRXZlbnRTb3VyY2Uo KS5nZXQoKSk7CisgICAgICAgICAgICAgICAgICAgIHRpbWVyRXZlbnRTb3VyY2UoKSA9IG51bGxw dHI7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIE1lbW9yeVByZXNzdXJlSGFu ZGxlcjo6c2luZ2xldG9uKCkuaW5zdGFsbCgpOwogICAgICAgICAgICAgfSk7Ci0gICAgICAgICAg ICBkaXNwYXRjaF9yZXN1bWUodGltZXJFdmVudFNvdXJjZSk7CisgICAgICAgICAgICBkaXNwYXRj aF9yZXN1bWUodGltZXJFdmVudFNvdXJjZSgpLmdldCgpKTsKICAgICAgICAgfQogICAgIH0pOwog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvdGhyZWFkcy9TaWduYWxzLmNwcCBiL1NvdXJj ZS9XVEYvd3RmL3RocmVhZHMvU2lnbmFscy5jcHAKaW5kZXggMGUyN2M2NTI0Zjk2Li4zOWFkYmNk OGM4MmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL3RocmVhZHMvU2lnbmFscy5jcHAKKysr IGIvU291cmNlL1dURi93dGYvdGhyZWFkcy9TaWduYWxzLmNwcApAQCAtNDIsNiArNDIsNyBAQCBl eHRlcm4gIkMiIHsKICNpbmNsdWRlIDxkaXNwYXRjaC9kaXNwYXRjaC5oPgogI2luY2x1ZGUgPG1h Y2gvbWFjaC5oPgogI2luY2x1ZGUgPG1hY2gvdGhyZWFkX2FjdC5oPgorI2luY2x1ZGUgPHd0Zi9P U09iamVjdFB0ci5oPgogI2VuZGlmCiAKICNpZiBPUyhEQVJXSU4pCkBAIC0xMDksOCArMTEwLDkg QEAgc3RhdGljIGNvbnN0ZXhwciBzaXplX3QgbWF4TWVzc2FnZVNpemUgPSAxICogS0I7CiAKIHZv aWQgc3RhcnRNYWNoRXhjZXB0aW9uSGFuZGxlclRocmVhZCgpCiB7CisgICAgc3RhdGljIE5ldmVy RGVzdHJveWVkPE9TT2JqZWN0UHRyPGRpc3BhdGNoX3NvdXJjZV90Pj4gc291cmNlOwogICAgIHN0 YXRpYyBzdGQ6Om9uY2VfZmxhZyBvbmNlOwotICAgIHN0ZDo6Y2FsbF9vbmNlKG9uY2UsIFtdIHsK KyAgICBzdGQ6OmNhbGxfb25jZShvbmNlLCBbJl0gewogICAgICAgICBDb25maWc6OkFzc2VydE5v dEZyb3plblNjb3BlIGFzc2VydFNjb3BlOwogICAgICAgICBTaWduYWxIYW5kbGVycyYgaGFuZGxl cnMgPSBnX3d0ZkNvbmZpZy5zaWduYWxIYW5kbGVyczsKICAgICAgICAga2Vybl9yZXR1cm5fdCBr ciA9IG1hY2hfcG9ydF9hbGxvY2F0ZShtYWNoX3Rhc2tfc2VsZigpLCBNQUNIX1BPUlRfUklHSFRf UkVDRUlWRSwgJmhhbmRsZXJzLmV4Y2VwdGlvblBvcnQpOwpAQCAtMTE4LDEzICsxMjAsMTEgQEAg dm9pZCBzdGFydE1hY2hFeGNlcHRpb25IYW5kbGVyVGhyZWFkKCkKICAgICAgICAga3IgPSBtYWNo X3BvcnRfaW5zZXJ0X3JpZ2h0KG1hY2hfdGFza19zZWxmKCksIGhhbmRsZXJzLmV4Y2VwdGlvblBv cnQsIGhhbmRsZXJzLmV4Y2VwdGlvblBvcnQsIE1BQ0hfTVNHX1RZUEVfTUFLRV9TRU5EKTsKICAg ICAgICAgUkVMRUFTRV9BU1NFUlQoa3IgPT0gS0VSTl9TVUNDRVNTKTsKIAotICAgICAgICBkaXNw YXRjaF9zb3VyY2VfdCBzb3VyY2UgPSBkaXNwYXRjaF9zb3VyY2VfY3JlYXRlKAotICAgICAgICAg ICAgRElTUEFUQ0hfU09VUkNFX1RZUEVfTUFDSF9SRUNWLCBoYW5kbGVycy5leGNlcHRpb25Qb3J0 LCAwLCBESVNQQVRDSF9UQVJHRVRfUVVFVUVfREVGQVVMVCk7Ci0gICAgICAgIFJFTEVBU0VfQVNT RVJUKHNvdXJjZSk7Ci0KLSAgICAgICAgZGlzcGF0Y2hfc291cmNlX3NldF9ldmVudF9oYW5kbGVy KHNvdXJjZSwgXnsKLSAgICAgICAgICAgIFVOVVNFRF9QQVJBTShzb3VyY2UpOyAvLyBDYXB0dXJl IGEgcG9pbnRlciB0byBzb3VyY2UgaW4gdXNlciBzcGFjZSB0byBzaWxlbmNlIHRoZSBsZWFrcyB0 b29sLgorICAgICAgICBzb3VyY2UuZ2V0KCkgPSBhZG9wdE9TT2JqZWN0KGRpc3BhdGNoX3NvdXJj ZV9jcmVhdGUoCisgICAgICAgICAgICBESVNQQVRDSF9TT1VSQ0VfVFlQRV9NQUNIX1JFQ1YsIGhh bmRsZXJzLmV4Y2VwdGlvblBvcnQsIDAsIERJU1BBVENIX1RBUkdFVF9RVUVVRV9ERUZBVUxUKSk7 CisgICAgICAgIFJFTEVBU0VfQVNTRVJUKHNvdXJjZS5nZXQoKSk7CiAKKyAgICAgICAgZGlzcGF0 Y2hfc291cmNlX3NldF9ldmVudF9oYW5kbGVyKHNvdXJjZS5nZXQoKS5nZXQoKSwgXnsKICAgICAg ICAgICAgIGtlcm5fcmV0dXJuX3Qga3IgPSBtYWNoX21zZ19zZXJ2ZXJfb25jZSgKICAgICAgICAg ICAgICAgICBtYWNoX2V4Y19zZXJ2ZXIsIG1heE1lc3NhZ2VTaXplLCBoYW5kbGVycy5leGNlcHRp b25Qb3J0LCBNQUNIX01TR19USU1FT1VUX05PTkUpOwogICAgICAgICAgICAgUkVMRUFTRV9BU1NF UlQoa3IgPT0gS0VSTl9TVUNDRVNTKTsKQEAgLTEzMiw3ICsxMzIsNyBAQCB2b2lkIHN0YXJ0TWFj aEV4Y2VwdGlvbkhhbmRsZXJUaHJlYWQoKQogCiAgICAgICAgIC8vIE5vIG5lZWQgZm9yIGEgY2Fu Y2VsIGhhbmRsZXIgYmVjYXVzZSB3ZSBuZXZlciBkZXN0cm95IGV4Y2VwdGlvblBvcnQuCiAKLSAg ICAgICAgZGlzcGF0Y2hfcmVzdW1lKHNvdXJjZSk7CisgICAgICAgIGRpc3BhdGNoX3Jlc3VtZShz b3VyY2UuZ2V0KCkuZ2V0KCkpOwogICAgIH0pOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1NoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVzL0NvY29hL1hQQ1NlcnZpY2UvWFBDU2Vydmlj ZUVudHJ5UG9pbnQubW0gYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVz L0NvY29hL1hQQ1NlcnZpY2UvWFBDU2VydmljZUVudHJ5UG9pbnQubW0KaW5kZXggYmMwNTkyYTQ0 Mjk1Li4zZmU5YzljMDMwZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0VudHJ5 UG9pbnRVdGlsaXRpZXMvQ29jb2EvWFBDU2VydmljZS9YUENTZXJ2aWNlRW50cnlQb2ludC5tbQor KysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVzL0NvY29hL1hQQ1Nl cnZpY2UvWFBDU2VydmljZUVudHJ5UG9pbnQubW0KQEAgLTE1OCw2ICsxNTgsNyBAQCBib29sIFhQ Q1NlcnZpY2VJbml0aWFsaXplckRlbGVnYXRlOjppc0NsaWVudFNhbmRib3hlZCgpCiB2b2lkIHNl dE9TVHJhbnNhY3Rpb24oT1NPYmplY3RQdHI8b3NfdHJhbnNhY3Rpb25fdD4mJiB0cmFuc2FjdGlv bikKIHsKICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8T1NPYmplY3RQdHI8b3NfdHJhbnNhY3Rp b25fdD4+IGdsb2JhbFRyYW5zYWN0aW9uOworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxPU09i amVjdFB0cjxkaXNwYXRjaF9zb3VyY2VfdD4+IGdsb2JhbFNvdXJjZTsKIAogICAgIC8vIEJlY2F1 c2Ugd2UgZG9uJ3QgdXNlIFJ1bm5pbmdCb2FyZCBvbiBtYWNPUywgd2UgbGVhayBhbiBPUyB0cmFu c2FjdGlvbiB0byBjb250cm9sIHRoZSBsaWZldGltZSBvZiBvdXIgWFBDCiAgICAgLy8gc2Vydmlj ZXMgb3Vyc2VsdmVzLiBIb3dldmVyLCBvbmUgb2YgdGhlIHNpZGUgZWZmZWN0cyBvZiBsZWFraW5n IHRoaXMgdHJhbnNhY3Rpb24gaXMgdGhhdCB0aGUgZGVmYXVsdCBTSUdURVJNCkBAIC0xNjcsMTEg KzE2OCwxMSBAQCB2b2lkIHNldE9TVHJhbnNhY3Rpb24oT1NPYmplY3RQdHI8b3NfdHJhbnNhY3Rp b25fdD4mJiB0cmFuc2FjdGlvbikKICAgICAvLyBjb250cm9sIG91ciBsaWZldGltZSB2aWEgcHJv Y2VzcyBhc3NlcnRpb25zIGluc3RlYWQgb2YgbGVha2luZyB0aGlzIE9TIHRyYW5zYWN0aW9uLgog ICAgIHN0YXRpYyBkaXNwYXRjaF9vbmNlX3QgZmxhZzsKICAgICBkaXNwYXRjaF9vbmNlKCZmbGFn LCBeewotICAgICAgICBhdXRvIHNpZ1Rlcm1Tb3VyY2UgPSBkaXNwYXRjaF9zb3VyY2VfY3JlYXRl KERJU1BBVENIX1NPVVJDRV9UWVBFX1NJR05BTCwgU0lHVEVSTSwgMCwgZGlzcGF0Y2hfZ2V0X21h aW5fcXVldWUoKSk7Ci0gICAgICAgIGRpc3BhdGNoX3NvdXJjZV9zZXRfZXZlbnRfaGFuZGxlcihz aWdUZXJtU291cmNlLCBeeworICAgICAgICBnbG9iYWxTb3VyY2UuZ2V0KCkgPSBhZG9wdE9TT2Jq ZWN0KGRpc3BhdGNoX3NvdXJjZV9jcmVhdGUoRElTUEFUQ0hfU09VUkNFX1RZUEVfU0lHTkFMLCBT SUdURVJNLCAwLCBkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpKSk7CisgICAgICAgIGRpc3BhdGNo X3NvdXJjZV9zZXRfZXZlbnRfaGFuZGxlcihnbG9iYWxTb3VyY2UuZ2V0KCkuZ2V0KCksIF57CiAg ICAgICAgICAgICBleGl0KDApOwogICAgICAgICB9KTsKLSAgICAgICAgZGlzcGF0Y2hfcmVzdW1l KHNpZ1Rlcm1Tb3VyY2UpOworICAgICAgICBkaXNwYXRjaF9yZXN1bWUoZ2xvYmFsU291cmNlLmdl dCgpLmdldCgpKTsKICAgICB9KTsKIAogICAgIGdsb2JhbFRyYW5zYWN0aW9uLmdldCgpID0gV1RG TW92ZSh0cmFuc2FjdGlvbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvYm1hbGxvYy9ibWFsbG9jL1Nj YXZlbmdlci5jcHAgYi9Tb3VyY2UvYm1hbGxvYy9ibWFsbG9jL1NjYXZlbmdlci5jcHAKaW5kZXgg ODZkYmI4NjRlYTc3Li4xZDUzNGIyYjdhZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9ibWFsbG9jL2Jt YWxsb2MvU2NhdmVuZ2VyLmNwcAorKysgYi9Tb3VyY2UvYm1hbGxvYy9ibWFsbG9jL1NjYXZlbmdl ci5jcHAKQEAgLTgwLDYgKzgwLDEyIEBAIFNjYXZlbmdlcjo6U2NhdmVuZ2VyKGNvbnN0IExvY2tI b2xkZXImKQogCiAjaWYgQk9TKERBUldJTikKICAgICBhdXRvIHF1ZXVlID0gZGlzcGF0Y2hfcXVl dWVfY3JlYXRlKCJXZWJLaXQgTWFsbG9jIE1lbW9yeSBQcmVzc3VyZSBIYW5kbGVyIiwgRElTUEFU Q0hfUVVFVUVfU0VSSUFMKTsKKyNpZiBCUExBVEZPUk0oV0FUQ0hPUykKKyAgICAvLyBGSVhNRTog VGhpcyBpcyBjb25jZXJuaW5nLgorICAgIHN0YXRpY19hc3NlcnQoIV9faGFzX2ZlYXR1cmUob2Jq Y19hcmMpKTsKKyNlbHNlCisgICAgc3RhdGljX2Fzc2VydChfX2hhc19mZWF0dXJlKG9iamNfYXJj KSk7CisjZW5kaWYKICAgICBtX3ByZXNzdXJlSGFuZGxlckRpc3BhdGNoU291cmNlID0gZGlzcGF0 Y2hfc291cmNlX2NyZWF0ZShESVNQQVRDSF9TT1VSQ0VfVFlQRV9NRU1PUllQUkVTU1VSRSwgMCwg RElTUEFUQ0hfTUVNT1JZUFJFU1NVUkVfQ1JJVElDQUwsIHF1ZXVlKTsKICAgICBkaXNwYXRjaF9z b3VyY2Vfc2V0X2V2ZW50X2hhbmRsZXIobV9wcmVzc3VyZUhhbmRsZXJEaXNwYXRjaFNvdXJjZSwg XnsKICAgICAgICAgc2NhdmVuZ2UoKTsK 460418 2022-06-22 10:17:26 -0700 2022-06-22 11:35:53 -0700 Patch bug-241836-20220622101725.patch text/plain 7890 achristensen RnJvbSBjODZjOWQ1MTYyZjE5M2Q0YTA0ZWM2ZjA4NzQ1YTQyN2RiM2I5YWYyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4IENocmlzdGVuc2VuIDxhY2hyaXN0ZW5zZW5AYXBwbGUu Y29tPgpEYXRlOiBXZWQsIDIyIEp1biAyMDIyIDEwOjEwOjM0IC0wNzAwClN1YmplY3Q6IFtQQVRD SF0gTWFrZSBzdXJlIHJldHVybiB2YWx1ZSBvZiBkaXNwYXRjaF9zb3VyY2VfY3JlYXRlIGlzIG1l bW9yeQogbWFuYWdlZCBjb3JyZWN0bHkgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTI0MTgzNgogcmRhcjovLzk1NjI1OTkwCgpSZXZpZXdlZCBieSBDaHJpcyBEdW1lei4K CiogU291cmNlL1dURi93dGYvY29jb2EvTWVtb3J5UHJlc3N1cmVIYW5kbGVyQ29jb2EubW06CihX VEY6Om1lbW9yeVByZXNzdXJlRXZlbnRTb3VyY2UpOgooV1RGOjp0aW1lckV2ZW50U291cmNlKToK KFdURjo6TWVtb3J5UHJlc3N1cmVIYW5kbGVyOjppbnN0YWxsKToKKFdURjo6TWVtb3J5UHJlc3N1 cmVIYW5kbGVyOjp1bmluc3RhbGwpOgooV1RGOjpNZW1vcnlQcmVzc3VyZUhhbmRsZXI6OmhvbGRP ZmYpOgoqIFNvdXJjZS9XVEYvd3RmL3RocmVhZHMvU2lnbmFscy5jcHA6CihXVEY6OnN0YXJ0TWFj aEV4Y2VwdGlvbkhhbmRsZXJUaHJlYWQpOgoqIFNvdXJjZS9XZWJLaXQvU2hhcmVkL0VudHJ5UG9p bnRVdGlsaXRpZXMvQ29jb2EvWFBDU2VydmljZS9YUENTZXJ2aWNlRW50cnlQb2ludC5tbToKKFdl YktpdDo6c2V0T1NUcmFuc2FjdGlvbik6Ci0tLQogLi4uL3d0Zi9jb2NvYS9NZW1vcnlQcmVzc3Vy ZUhhbmRsZXJDb2NvYS5tbSAgIHwgNTQgKysrKysrKysrKystLS0tLS0tLQogLi4uL0NvY29hL1hQ Q1NlcnZpY2UvWFBDU2VydmljZUVudHJ5UG9pbnQubW0gIHwgIDcgKy0tCiAyIGZpbGVzIGNoYW5n ZWQsIDM2IGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XVEYvd3RmL2NvY29hL01lbW9yeVByZXNzdXJlSGFuZGxlckNvY29hLm1tIGIvU291cmNlL1dU Ri93dGYvY29jb2EvTWVtb3J5UHJlc3N1cmVIYW5kbGVyQ29jb2EubW0KaW5kZXggMzljZjdjODZm Njg1Li5jN2Q1MGRmNzhlZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL2NvY29hL01lbW9y eVByZXNzdXJlSGFuZGxlckNvY29hLm1tCisrKyBiL1NvdXJjZS9XVEYvd3RmL2NvY29hL01lbW9y eVByZXNzdXJlSGFuZGxlckNvY29hLm1tCkBAIC00OSw4ICs0OSwxOCBAQCB2b2lkIE1lbW9yeVBy ZXNzdXJlSGFuZGxlcjo6cGxhdGZvcm1SZWxlYXNlTWVtb3J5KENyaXRpY2FsIGNyaXRpY2FsKQog ICAgIH0KIH0KIAotc3RhdGljIGRpc3BhdGNoX3NvdXJjZV90IG1lbW9yeVByZXNzdXJlRXZlbnRT b3VyY2UgPSBudWxscHRyOwotc3RhdGljIGRpc3BhdGNoX3NvdXJjZV90IHRpbWVyRXZlbnRTb3Vy Y2UgPSBudWxscHRyOworc3RhdGljIE9TT2JqZWN0UHRyPGRpc3BhdGNoX3NvdXJjZV90PiYgbWVt b3J5UHJlc3N1cmVFdmVudFNvdXJjZSgpCit7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPE9T T2JqZWN0UHRyPGRpc3BhdGNoX3NvdXJjZV90Pj4gc291cmNlOworICAgIHJldHVybiBzb3VyY2Uu Z2V0KCk7Cit9CisKK3N0YXRpYyBPU09iamVjdFB0cjxkaXNwYXRjaF9zb3VyY2VfdD4mIHRpbWVy RXZlbnRTb3VyY2UoKQoreworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxPU09iamVjdFB0cjxk aXNwYXRjaF9zb3VyY2VfdD4+IHNvdXJjZTsKKyAgICByZXR1cm4gc291cmNlLmdldCgpOworfQor CiBzdGF0aWMgaW50IG5vdGlmeVRva2Vuc1szXTsKIAogLy8gRGlzYWJsZSBtZW1vcnkgZXZlbnQg cmVjZXB0aW9uIGZvciBhIG1pbmltdW0gb2Ygc19taW5pbXVtSG9sZE9mZlRpbWUKQEAgLTY2LDE1 ICs3NiwxNSBAQCBzdGF0aWMgY29uc3RleHByIHVuc2lnbmVkIHNfaG9sZE9mZk11bHRpcGxpZXIg PSAyMDsKIAogdm9pZCBNZW1vcnlQcmVzc3VyZUhhbmRsZXI6Omluc3RhbGwoKQogewotICAgIGlm IChtX2luc3RhbGxlZCB8fCB0aW1lckV2ZW50U291cmNlKQorICAgIGlmIChtX2luc3RhbGxlZCB8 fCB0aW1lckV2ZW50U291cmNlKCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIGRpc3BhdGNoX2Fz eW5jKG1fZGlzcGF0Y2hRdWV1ZS5nZXQoKSwgXnsKICAgICAgICAgYXV0byBtZW1vcnlTdGF0dXNG bGFncyA9IERJU1BBVENIX01FTU9SWVBSRVNTVVJFX05PUk1BTCB8IERJU1BBVENIX01FTU9SWVBS RVNTVVJFX1dBUk4gfCBESVNQQVRDSF9NRU1PUllQUkVTU1VSRV9DUklUSUNBTCB8IERJU1BBVENI X01FTU9SWVBSRVNTVVJFX1BST0NfTElNSVRfV0FSTiB8IERJU1BBVENIX01FTU9SWVBSRVNTVVJF X1BST0NfTElNSVRfQ1JJVElDQUw7Ci0gICAgICAgIG1lbW9yeVByZXNzdXJlRXZlbnRTb3VyY2Ug PSBkaXNwYXRjaF9zb3VyY2VfY3JlYXRlKERJU1BBVENIX1NPVVJDRV9UWVBFX01FTU9SWVBSRVNT VVJFLCAwLCBtZW1vcnlTdGF0dXNGbGFncywgbV9kaXNwYXRjaFF1ZXVlLmdldCgpKTsKKyAgICAg ICAgbWVtb3J5UHJlc3N1cmVFdmVudFNvdXJjZSgpID0gYWRvcHRPU09iamVjdChkaXNwYXRjaF9z b3VyY2VfY3JlYXRlKERJU1BBVENIX1NPVVJDRV9UWVBFX01FTU9SWVBSRVNTVVJFLCAwLCBtZW1v cnlTdGF0dXNGbGFncywgbV9kaXNwYXRjaFF1ZXVlLmdldCgpKSk7CiAKLSAgICAgICAgZGlzcGF0 Y2hfc291cmNlX3NldF9ldmVudF9oYW5kbGVyKG1lbW9yeVByZXNzdXJlRXZlbnRTb3VyY2UsIF57 Ci0gICAgICAgICAgICBhdXRvIHN0YXR1cyA9IGRpc3BhdGNoX3NvdXJjZV9nZXRfZGF0YShtZW1v cnlQcmVzc3VyZUV2ZW50U291cmNlKTsKKyAgICAgICAgZGlzcGF0Y2hfc291cmNlX3NldF9ldmVu dF9oYW5kbGVyKG1lbW9yeVByZXNzdXJlRXZlbnRTb3VyY2UoKS5nZXQoKSwgXnsKKyAgICAgICAg ICAgIGF1dG8gc3RhdHVzID0gZGlzcGF0Y2hfc291cmNlX2dldF9kYXRhKG1lbW9yeVByZXNzdXJl RXZlbnRTb3VyY2UoKS5nZXQoKSk7CiAgICAgICAgICAgICBzd2l0Y2ggKHN0YXR1cykgewogICAg ICAgICAgICAgLy8gVk0gcHJlc3N1cmUgZXZlbnRzLgogICAgICAgICAgICAgY2FzZSBESVNQQVRD SF9NRU1PUllQUkVTU1VSRV9OT1JNQUw6CkBAIC0xMDEsNyArMTExLDcgQEAgdm9pZCBNZW1vcnlQ cmVzc3VyZUhhbmRsZXI6Omluc3RhbGwoKQogICAgICAgICAgICAgaWYgKG1fc2hvdWxkTG9nTWVt b3J5TWVtb3J5UHJlc3N1cmVFdmVudHMpCiAgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0coTWVt b3J5UHJlc3N1cmUsICJSZWNlaXZlZCBtZW1vcnkgcHJlc3N1cmUgZXZlbnQgJWx1IHZtIHByZXNz dXJlICVkIiwgc3RhdHVzLCBpc1VuZGVyTWVtb3J5UHJlc3N1cmUoKSk7CiAgICAgICAgIH0pOwot ICAgICAgICBkaXNwYXRjaF9yZXN1bWUobWVtb3J5UHJlc3N1cmVFdmVudFNvdXJjZSk7CisgICAg ICAgIGRpc3BhdGNoX3Jlc3VtZShtZW1vcnlQcmVzc3VyZUV2ZW50U291cmNlKCkuZ2V0KCkpOwog ICAgIH0pOwogCiAgICAgLy8gQWxsb3cgc2ltdWxhdGlvbiBvZiBtZW1vcnkgcHJlc3N1cmUgd2l0 aCAibm90aWZ5dXRpbCAtcCBvcmcuV2ViS2l0Lmxvd01lbW9yeSIKQEAgLTE0MCwxNCArMTUwLDE0 IEBAIHZvaWQgTWVtb3J5UHJlc3N1cmVIYW5kbGVyOjp1bmluc3RhbGwoKQogICAgICAgICByZXR1 cm47CiAKICAgICBkaXNwYXRjaF9hc3luYyhtX2Rpc3BhdGNoUXVldWUuZ2V0KCksIF57Ci0gICAg ICAgIGlmIChtZW1vcnlQcmVzc3VyZUV2ZW50U291cmNlKSB7Ci0gICAgICAgICAgICBkaXNwYXRj aF9zb3VyY2VfY2FuY2VsKG1lbW9yeVByZXNzdXJlRXZlbnRTb3VyY2UpOwotICAgICAgICAgICAg bWVtb3J5UHJlc3N1cmVFdmVudFNvdXJjZSA9IG51bGxwdHI7CisgICAgICAgIGlmIChtZW1vcnlQ cmVzc3VyZUV2ZW50U291cmNlKCkpIHsKKyAgICAgICAgICAgIGRpc3BhdGNoX3NvdXJjZV9jYW5j ZWwobWVtb3J5UHJlc3N1cmVFdmVudFNvdXJjZSgpLmdldCgpKTsKKyAgICAgICAgICAgIG1lbW9y eVByZXNzdXJlRXZlbnRTb3VyY2UoKSA9IG51bGxwdHI7CiAgICAgICAgIH0KIAotICAgICAgICBp ZiAodGltZXJFdmVudFNvdXJjZSkgewotICAgICAgICAgICAgZGlzcGF0Y2hfc291cmNlX2NhbmNl bCh0aW1lckV2ZW50U291cmNlKTsKLSAgICAgICAgICAgIHRpbWVyRXZlbnRTb3VyY2UgPSBudWxs cHRyOworICAgICAgICBpZiAodGltZXJFdmVudFNvdXJjZSgpKSB7CisgICAgICAgICAgICBkaXNw YXRjaF9zb3VyY2VfY2FuY2VsKHRpbWVyRXZlbnRTb3VyY2UoKS5nZXQoKSk7CisgICAgICAgICAg ICB0aW1lckV2ZW50U291cmNlKCkgPSBudWxscHRyOwogICAgICAgICB9CiAgICAgfSk7CiAKQEAg LTE2MCwyMCArMTcwLDIwIEBAIHZvaWQgTWVtb3J5UHJlc3N1cmVIYW5kbGVyOjp1bmluc3RhbGwo KQogdm9pZCBNZW1vcnlQcmVzc3VyZUhhbmRsZXI6OmhvbGRPZmYoU2Vjb25kcyBzZWNvbmRzKQog ewogICAgIGRpc3BhdGNoX2FzeW5jKG1fZGlzcGF0Y2hRdWV1ZS5nZXQoKSwgXnsKLSAgICAgICAg dGltZXJFdmVudFNvdXJjZSA9IGRpc3BhdGNoX3NvdXJjZV9jcmVhdGUoRElTUEFUQ0hfU09VUkNF X1RZUEVfVElNRVIsIDAsIDAsIG1fZGlzcGF0Y2hRdWV1ZS5nZXQoKSk7Ci0gICAgICAgIGlmICh0 aW1lckV2ZW50U291cmNlKSB7Ci0gICAgICAgICAgICBkaXNwYXRjaF9zZXRfY29udGV4dCh0aW1l ckV2ZW50U291cmNlLCB0aGlzKTsKKyAgICAgICAgdGltZXJFdmVudFNvdXJjZSgpID0gYWRvcHRP U09iamVjdChkaXNwYXRjaF9zb3VyY2VfY3JlYXRlKERJU1BBVENIX1NPVVJDRV9UWVBFX1RJTUVS LCAwLCAwLCBtX2Rpc3BhdGNoUXVldWUuZ2V0KCkpKTsKKyAgICAgICAgaWYgKHRpbWVyRXZlbnRT b3VyY2UoKSkgeworICAgICAgICAgICAgZGlzcGF0Y2hfc2V0X2NvbnRleHQodGltZXJFdmVudFNv dXJjZSgpLmdldCgpLCB0aGlzKTsKICAgICAgICAgICAgIC8vIEZJWE1FOiBUaGUgZmluYWwgYXJn dW1lbnQgYHNfbWluaW11bUhvbGRPZmZUaW1lLnNlY29uZHMoKWAgc2VlbXMgd3JvbmcuCiAgICAg ICAgICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgzMjc3 Ci0gICAgICAgICAgICBkaXNwYXRjaF9zb3VyY2Vfc2V0X3RpbWVyKHRpbWVyRXZlbnRTb3VyY2Us IGRpc3BhdGNoX3RpbWUoRElTUEFUQ0hfVElNRV9OT1csIHNlY29uZHMuc2Vjb25kcygpICogTlNF Q19QRVJfU0VDKSwgRElTUEFUQ0hfVElNRV9GT1JFVkVSLCBzX21pbmltdW1Ib2xkT2ZmVGltZS5z ZWNvbmRzKCkpOwotICAgICAgICAgICAgZGlzcGF0Y2hfc291cmNlX3NldF9ldmVudF9oYW5kbGVy KHRpbWVyRXZlbnRTb3VyY2UsIF57Ci0gICAgICAgICAgICAgICAgaWYgKHRpbWVyRXZlbnRTb3Vy Y2UpIHsKLSAgICAgICAgICAgICAgICAgICAgZGlzcGF0Y2hfc291cmNlX2NhbmNlbCh0aW1lckV2 ZW50U291cmNlKTsKLSAgICAgICAgICAgICAgICAgICAgdGltZXJFdmVudFNvdXJjZSA9IG51bGxw dHI7CisgICAgICAgICAgICBkaXNwYXRjaF9zb3VyY2Vfc2V0X3RpbWVyKHRpbWVyRXZlbnRTb3Vy Y2UoKS5nZXQoKSwgZGlzcGF0Y2hfdGltZShESVNQQVRDSF9USU1FX05PVywgc2Vjb25kcy5zZWNv bmRzKCkgKiBOU0VDX1BFUl9TRUMpLCBESVNQQVRDSF9USU1FX0ZPUkVWRVIsIHNfbWluaW11bUhv bGRPZmZUaW1lLnNlY29uZHMoKSk7CisgICAgICAgICAgICBkaXNwYXRjaF9zb3VyY2Vfc2V0X2V2 ZW50X2hhbmRsZXIodGltZXJFdmVudFNvdXJjZSgpLmdldCgpLCBeeworICAgICAgICAgICAgICAg IGlmICh0aW1lckV2ZW50U291cmNlKCkuZ2V0KCkpIHsKKyAgICAgICAgICAgICAgICAgICAgZGlz cGF0Y2hfc291cmNlX2NhbmNlbCh0aW1lckV2ZW50U291cmNlKCkuZ2V0KCkpOworICAgICAgICAg ICAgICAgICAgICB0aW1lckV2ZW50U291cmNlKCkgPSBudWxscHRyOwogICAgICAgICAgICAgICAg IH0KICAgICAgICAgICAgICAgICBNZW1vcnlQcmVzc3VyZUhhbmRsZXI6OnNpbmdsZXRvbigpLmlu c3RhbGwoKTsKICAgICAgICAgICAgIH0pOwotICAgICAgICAgICAgZGlzcGF0Y2hfcmVzdW1lKHRp bWVyRXZlbnRTb3VyY2UpOworICAgICAgICAgICAgZGlzcGF0Y2hfcmVzdW1lKHRpbWVyRXZlbnRT b3VyY2UoKS5nZXQoKSk7CiAgICAgICAgIH0KICAgICB9KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvU2hhcmVkL0VudHJ5UG9pbnRVdGlsaXRpZXMvQ29jb2EvWFBDU2VydmljZS9YUENT ZXJ2aWNlRW50cnlQb2ludC5tbSBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0VudHJ5UG9pbnRVdGls aXRpZXMvQ29jb2EvWFBDU2VydmljZS9YUENTZXJ2aWNlRW50cnlQb2ludC5tbQppbmRleCBiYzA1 OTJhNDQyOTUuLjNmZTljOWMwMzBkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQv RW50cnlQb2ludFV0aWxpdGllcy9Db2NvYS9YUENTZXJ2aWNlL1hQQ1NlcnZpY2VFbnRyeVBvaW50 Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0VudHJ5UG9pbnRVdGlsaXRpZXMvQ29jb2Ev WFBDU2VydmljZS9YUENTZXJ2aWNlRW50cnlQb2ludC5tbQpAQCAtMTU4LDYgKzE1OCw3IEBAIGJv b2wgWFBDU2VydmljZUluaXRpYWxpemVyRGVsZWdhdGU6OmlzQ2xpZW50U2FuZGJveGVkKCkKIHZv aWQgc2V0T1NUcmFuc2FjdGlvbihPU09iamVjdFB0cjxvc190cmFuc2FjdGlvbl90PiYmIHRyYW5z YWN0aW9uKQogewogICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxPU09iamVjdFB0cjxvc190cmFu c2FjdGlvbl90Pj4gZ2xvYmFsVHJhbnNhY3Rpb247CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVk PE9TT2JqZWN0UHRyPGRpc3BhdGNoX3NvdXJjZV90Pj4gZ2xvYmFsU291cmNlOwogCiAgICAgLy8g QmVjYXVzZSB3ZSBkb24ndCB1c2UgUnVubmluZ0JvYXJkIG9uIG1hY09TLCB3ZSBsZWFrIGFuIE9T IHRyYW5zYWN0aW9uIHRvIGNvbnRyb2wgdGhlIGxpZmV0aW1lIG9mIG91ciBYUEMKICAgICAvLyBz ZXJ2aWNlcyBvdXJzZWx2ZXMuIEhvd2V2ZXIsIG9uZSBvZiB0aGUgc2lkZSBlZmZlY3RzIG9mIGxl YWtpbmcgdGhpcyB0cmFuc2FjdGlvbiBpcyB0aGF0IHRoZSBkZWZhdWx0IFNJR1RFUk0KQEAgLTE2 NywxMSArMTY4LDExIEBAIHZvaWQgc2V0T1NUcmFuc2FjdGlvbihPU09iamVjdFB0cjxvc190cmFu c2FjdGlvbl90PiYmIHRyYW5zYWN0aW9uKQogICAgIC8vIGNvbnRyb2wgb3VyIGxpZmV0aW1lIHZp YSBwcm9jZXNzIGFzc2VydGlvbnMgaW5zdGVhZCBvZiBsZWFraW5nIHRoaXMgT1MgdHJhbnNhY3Rp b24uCiAgICAgc3RhdGljIGRpc3BhdGNoX29uY2VfdCBmbGFnOwogICAgIGRpc3BhdGNoX29uY2Uo JmZsYWcsIF57Ci0gICAgICAgIGF1dG8gc2lnVGVybVNvdXJjZSA9IGRpc3BhdGNoX3NvdXJjZV9j cmVhdGUoRElTUEFUQ0hfU09VUkNFX1RZUEVfU0lHTkFMLCBTSUdURVJNLCAwLCBkaXNwYXRjaF9n ZXRfbWFpbl9xdWV1ZSgpKTsKLSAgICAgICAgZGlzcGF0Y2hfc291cmNlX3NldF9ldmVudF9oYW5k bGVyKHNpZ1Rlcm1Tb3VyY2UsIF57CisgICAgICAgIGdsb2JhbFNvdXJjZS5nZXQoKSA9IGFkb3B0 T1NPYmplY3QoZGlzcGF0Y2hfc291cmNlX2NyZWF0ZShESVNQQVRDSF9TT1VSQ0VfVFlQRV9TSUdO QUwsIFNJR1RFUk0sIDAsIGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCkpKTsKKyAgICAgICAgZGlz cGF0Y2hfc291cmNlX3NldF9ldmVudF9oYW5kbGVyKGdsb2JhbFNvdXJjZS5nZXQoKS5nZXQoKSwg XnsKICAgICAgICAgICAgIGV4aXQoMCk7CiAgICAgICAgIH0pOwotICAgICAgICBkaXNwYXRjaF9y ZXN1bWUoc2lnVGVybVNvdXJjZSk7CisgICAgICAgIGRpc3BhdGNoX3Jlc3VtZShnbG9iYWxTb3Vy Y2UuZ2V0KCkuZ2V0KCkpOwogICAgIH0pOwogCiAgICAgZ2xvYmFsVHJhbnNhY3Rpb24uZ2V0KCkg PSBXVEZNb3ZlKHRyYW5zYWN0aW9uKTsK