237468 2022-03-04 04:26:44 -0800 WebRTC decoded frames are not correctly rotated in case GPU Process DOM rendering flag is set to true 2022-03-09 07:26:56 -0800 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf eric.carlson ews-watchlist glenn hta jer.noble jonlee philipj sergio simon.fraser tommyw webkit-bug-importer youennf oldest_to_newest 1848250 0 youennf 2022-03-04 04:26:44 -0800 WebRTC decoded frames are not correctly rotated in case GPU Process DOM rendering flag is set to true 1848252 1 webkit-bug-importer 2022-03-04 04:27:16 -0800 <rdar://problem/89807876> 1848253 2 youennf 2022-03-04 04:28:01 -0800 This happens with ToT WebKit currently. I am not sure what is changing for MediaStreamTrack video renderer in case DOM rendering is turned on. 1849269 3 454123 youennf 2022-03-08 08:10:47 -0800 Created attachment 454123 Patch 1849274 4 454124 youennf 2022-03-08 08:24:48 -0800 Created attachment 454124 Patch 1849278 5 454124 eric.carlson 2022-03-08 08:38:15 -0800 Comment on attachment 454124 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=454124&action=review > Source/WebCore/ChangeLog:9 > + We were creating remove video frames at webrtc decoder level but at that level, we do not know yet the rotation and timestamps of the frame. s/remove/remote/ 1849550 6 454196 youennf 2022-03-08 23:34:12 -0800 Created attachment 454196 Patch for landing 1849682 7 ews-feeder 2022-03-09 07:26:51 -0800 Committed r291049 (248223@main): <https://commits.webkit.org/248223@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 454196. 454123 2022-03-08 08:10:47 -0800 2022-03-08 08:24:43 -0800 Patch bug-237468-20220308171045.patch text/plain 10952 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwOTgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWE1Nzc3MWE2MGVjZDM1 NTQ5ZTExNDU1Zjc5M2M4YmI5Y2U1NmZhMC4uYzdjNWMyMGJlNTEwZmM0YmMyOTgwYjMzNWU0YTdm NWRiMGMzMWJhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIyLTAzLTA4ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJSVEMgZGVjb2RlZCBm cmFtZXMgYXJlIG5vdCBjb3JyZWN0bHkgcm90YXRlZCBpbiBjYXNlIEdQVSBQcm9jZXNzIERPTSBy ZW5kZXJpbmcgZmxhZyBpcyBzZXQgdG8gdHJ1ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NDY4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84OTgw Nzg3Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBX ZSB3ZXJlIGNyZWF0aW5nIHJlbW92ZSB2aWRlbyBmcmFtZXMgYXQgd2VicnRjIGRlY29kZXIgbGV2 ZWwgYnV0IGF0IHRoYXQgbGV2ZWwsIHdlIGRvIG5vdCBrbm93IHlldCB0aGUgcm90YXRpb24gYW5k IHRpbWVzdGFtcHMgb2YgdGhlIGZyYW1lLgorICAgICAgICBXZSBuZWVkIHRvIHNldCB0aG9zZSB2 YWx1ZXMgd2hlbiB0aGUgZnJhbWUgaXMgZXhwb3NlZCB0byBSZWFsdGltZUluY29taW5nVmlkZW9T b3VyY2UuCisgICAgICAgIFByZXZpb3VzIHRlc3RzIGRpZCBub3QgY2F0Y2ggdGhlIHJlZ3Jlc3Np b24gYXMgd2Ugd2VyZSBjb3JyZWN0bHkgY29tcHV0aW5nIHRoZSBzaXplIG9mIHRoZSB2aWRlbyB1 c2luZyB0aGUgd2VicnRjIHJvdGF0aW9uIGFuZCBub3QgdGhlIHJvdGF0aW9uIGZyb20gdGhlIGZy YW1lLgorICAgICAgICBXZSBzaG91bGQgcHJvYmFibHkgbWlncmF0ZSB0byBSZW1vdGVWaWRlb0Zy YW1lUHJveHkgYXMgYSBidWZmZXIgd3JhcHBlciBzbyB0aGF0IHdlIGNhbiBlYXNpbHkgY3JlYXRl IHJlbW90ZSB2aWRlbyBmcmFtZXMgZnJvbSBhIFJlbW90ZVZpZGVvRnJhbWVQcm94eSBidWZmZXIu CisgICAgICAgIEluIHRoZSBtZWFudGltZSwgd2UgdXNlIGNvbnN0X2Nhc3QgaW4gVmlkZW9GcmFt ZTo6aW5pdGlhbGl6ZUNoYXJhY3RlcmlzdGljcy4KKworICAgICAgICBDb3ZlcmVkIGJ5IHVwZGF0 ZWQgdGVzdC4KKworICAgICAgICAqIHBsYXRmb3JtL1ZpZGVvRnJhbWUuY3BwOgorICAgICAgICAq IHBsYXRmb3JtL1ZpZGVvRnJhbWUuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9t YWMvUmVhbHRpbWVJbmNvbWluZ1ZpZGVvU291cmNlQ29jb2EubW06CisgICAgICAgICogdGVzdGlu Zy9JbnRlcm5hbHMuY3BwOgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmg6CisgICAgICAg ICogdGVzdGluZy9JbnRlcm5hbHMuaWRsOgorCiAyMDIyLTAzLTA1ICBZb3Vlbm4gRmFibGV0ICA8 eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBEbyBjYXB0dXJlIHZpZGVvIGZyYW1lIGRvd25z YW1wbGluZyBpbiBHUFVQcm9jZXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9WaWRlb0ZyYW1lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1ZpZGVvRnJhbWUuY3Bw CmluZGV4IGE1NDljMWE1YzQ4ZWIyM2Q2NGJhM2ZkMzUzODQwOGJkMTU1MjM0ZjAuLmYxMzg4NWE1 Y2E1MGE4YTM3YjA1YjllZDVhZTE2NjhlODAxY2YwMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL1ZpZGVvRnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L1ZpZGVvRnJhbWUuY3BwCkBAIC0xMzEsNiArMTMxLDEzIEBAIHZvaWQgVmlkZW9GcmFtZTo6ZHVt cChQcmludFN0cmVhbSYpIGNvbnN0CiB7CiB9CiAKK3ZvaWQgVmlkZW9GcmFtZTo6aW5pdGlhbGl6 ZUNoYXJhY3RlcmlzdGljcyhNZWRpYVRpbWUgcHJlc2VudGF0aW9uVGltZSwgYm9vbCBpc01pcnJv cmVkLCBWaWRlb1JvdGF0aW9uIHJvdGF0aW9uKQoreworICAgIGNvbnN0X2Nhc3Q8TWVkaWFUaW1l Jj4obV9wcmVzZW50YXRpb25UaW1lKSA9IHByZXNlbnRhdGlvblRpbWU7CisgICAgY29uc3RfY2Fz dDxib29sJj4obV9pc01pcnJvcmVkKSA9IGlzTWlycm9yZWQ7CisgICAgY29uc3RfY2FzdDxWaWRl b1JvdGF0aW9uJj4obV9yb3RhdGlvbikgPSByb3RhdGlvbjsKK30KKwogfQogCiAjZW5kaWYKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1ZpZGVvRnJhbWUuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1ZpZGVvRnJhbWUuaAppbmRleCA2NDExZGY3ZDY0MGNjZGVkMWQxZTNl MTFmZDFhNDI4YTI5MWIzMWVkLi45YTRlYWZjNDg0MTEwZjQxZjFlOWRiZjM4ZGQ3Yjg4Y2Y3NGM3 M2FiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9WaWRlb0ZyYW1lLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVmlkZW9GcmFtZS5oCkBAIC01Nyw2ICs1Nyw4IEBA IHB1YmxpYzoKICAgICB2aXJ0dWFsIFJlZlB0cjxXZWJDb3JlOjpWaWRlb0ZyYW1lQ1Y+IGFzVmlk ZW9GcmFtZUNWKCkgPSAwOwogI2VuZGlmCiAKKyAgICB2b2lkIGluaXRpYWxpemVDaGFyYWN0ZXJp c3RpY3MoTWVkaWFUaW1lIHByZXNlbnRhdGlvblRpbWUsIGJvb2wgaXNNaXJyb3JlZCwgVmlkZW9S b3RhdGlvbik7CisKIHByb3RlY3RlZDoKICAgICBXRUJDT1JFX0VYUE9SVCBWaWRlb0ZyYW1lKE1l ZGlhVGltZSBwcmVzZW50YXRpb25UaW1lLCBib29sIGlzTWlycm9yZWQsIFZpZGVvUm90YXRpb24p OwogICAgIGNvbnN0IE1lZGlhVGltZSBtX3ByZXNlbnRhdGlvblRpbWU7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVhbHRpbWVJbmNvbWluZ1Zp ZGVvU291cmNlQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9t YWMvUmVhbHRpbWVJbmNvbWluZ1ZpZGVvU291cmNlQ29jb2EubW0KaW5kZXggZjEwY2ZlMWYwMjli ZjY2NGNjODIzMmQ2MTdhZmIxNjA0YmM5NzRiMC4uYWM1Nzc2MDY2ZmExNDY3YTNkNzAzYTFhMGIw MmM2Nzg3MTBmMTJhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFz dHJlYW0vbWFjL1JlYWx0aW1lSW5jb21pbmdWaWRlb1NvdXJjZUNvY29hLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9SZWFsdGltZUluY29taW5nVmlkZW9T b3VyY2VDb2NvYS5tbQpAQCAtMTMwLDcgKzEzMCw5IEBAIFJlZlB0cjxNZWRpYVNhbXBsZT4gUmVh bHRpbWVJbmNvbWluZ1ZpZGVvU291cmNlQ29jb2E6OnRvVmlkZW9GcmFtZShjb25zdCB3ZWJydGM6 CiAKICAgICBpZiAoYXV0byogcHJvdmlkZXIgPSB2aWRlb0ZyYW1lQnVmZmVyUHJvdmlkZXIoZnJh bWUpKSB7CiAgICAgICAgIC8vIFRoZSBvbmx5IHN1cHBvcnRlZCBwcm92aWRlciBpcyBWaWRlb0Zy YW1lLgotICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8VmlkZW9GcmFtZSo+KHByb3ZpZGVyKTsK KyAgICAgICAgYXV0byogdmlkZW9GcmFtZSA9IHN0YXRpY19jYXN0PFZpZGVvRnJhbWUqPihwcm92 aWRlcik7CisgICAgICAgIHZpZGVvRnJhbWUtPmluaXRpYWxpemVDaGFyYWN0ZXJpc3RpY3MoTWVk aWFUaW1lIHsgZnJhbWUudGltZXN0YW1wX3VzKCksIDEwMDAwMDAgfSwgZmFsc2UsIHJvdGF0aW9u KTsKKyAgICAgICAgcmV0dXJuIHZpZGVvRnJhbWU7CiAgICAgfQogCiAgICAgLy8gSW4gY2FzZSBv ZiBpbiBtZW1vcnkgc2FtcGxlcywgd2UgaGF2ZSBub24gaW50ZXJsZWF2ZWQgWVVWIGRhdGEgd2hp bGUgQ1ZQaXhlbEJ1ZmZlcnMgcHJlZmVyIGludGVybGVhdmVkIFlVViBkYXRhLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwIGIvU291cmNlL1dlYkNvcmUv dGVzdGluZy9JbnRlcm5hbHMuY3BwCmluZGV4IDg4MzUxMjBkNzBjY2QxN2UzMjk3OTE1Yjg5ZDFk MmFkNzZhY2M2NzQuLmE2MjZlZjk3ZWNjOGVkYTcxZWYzNzgzN2I4MWFmNTAwNjhmNTU2NTIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKQEAgLTU1MTAsNiArNTUxMCw3IEBAIHZv aWQgSW50ZXJuYWxzOjpvYnNlcnZlTWVkaWFTdHJlYW1UcmFjayhNZWRpYVN0cmVhbVRyYWNrJiB0 cmFjaykKIHsKICAgICBzdG9wT2JzZXJ2aW5nUmVhbHRpbWVNZWRpYVNvdXJjZSgpOwogCisgICAg bV90cmFja1ZpZGVvUm90YXRpb24gPSAtMTsKICAgICBtX3RyYWNrU291cmNlID0gJnRyYWNrLnNv dXJjZSgpOwogICAgIG1fdHJhY2tTb3VyY2UtPmFkZE9ic2VydmVyKCp0aGlzKTsKICAgICBzd2l0 Y2ggKG1fdHJhY2tTb3VyY2UtPnR5cGUoKSkgewpAQCAtNTUzMiwxMiArNTUzMywxOCBAQCB2b2lk IEludGVybmFsczo6Z3JhYk5leHRNZWRpYVN0cmVhbVRyYWNrRnJhbWUoVHJhY2tGcmFtZVByb21p c2UmJiBwcm9taXNlKQogICAgIG1fbmV4dFRyYWNrRnJhbWVQcm9taXNlID0gbWFrZVVuaXF1ZTxU cmFja0ZyYW1lUHJvbWlzZT4oV1RGTW92ZShwcm9taXNlKSk7CiB9CiAKK3ZvaWQgSW50ZXJuYWxz OjptZWRpYVN0cmVhbVRyYWNrVmlkZW9GcmFtZVJvdGF0aW9uKERPTVByb21pc2VEZWZlcnJlZDxJ RExTaG9ydD4mJiBwcm9taXNlKQoreworICAgIHByb21pc2UucmVzb2x2ZShtX3RyYWNrVmlkZW9S b3RhdGlvbik7Cit9CisKIHZvaWQgSW50ZXJuYWxzOjp2aWRlb1NhbXBsZUF2YWlsYWJsZShNZWRp YVNhbXBsZSYgc2FtcGxlLCBWaWRlb0ZyYW1lVGltZU1ldGFkYXRhKQogewogICAgIGNhbGxPbk1h aW5UaHJlYWQoW3RoaXMsIHdlYWtUaGlzID0gV2Vha1B0ciB7ICp0aGlzIH0sIHNhbXBsZSA9IFJl ZiB7IHNhbXBsZSB9XSB7CiAgICAgICAgIGlmICghd2Vha1RoaXMpCiAgICAgICAgICAgICByZXR1 cm47CiAgICAgICAgIG1fdHJhY2tWaWRlb1NhbXBsZUNvdW50Kys7CisgICAgICAgIG1fdHJhY2tW aWRlb1JvdGF0aW9uID0gc3RhdGljX2Nhc3Q8aW50PihzYW1wbGUtPnZpZGVvUm90YXRpb24oKSk7 CiAgICAgICAgIGlmICghbV9uZXh0VHJhY2tGcmFtZVByb21pc2UpCiAgICAgICAgICAgICByZXR1 cm47CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmggYi9T b3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCmluZGV4IGNjMWI0NmIxY2FhNzBiYjhm OGE1ZjdjMDczMjgxYmY3Y2U0YzJmN2EuLjZkNTNiN2ZjODkzYmZjZDQ0NDkyZDhhYTBhMTI1ODYz NTJkNzVmODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgK KysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaApAQCAtODczLDYgKzg3Myw3 IEBAIHB1YmxpYzoKICAgICB2b2lkIG9ic2VydmVNZWRpYVN0cmVhbVRyYWNrKE1lZGlhU3RyZWFt VHJhY2smKTsKICAgICB1c2luZyBUcmFja0ZyYW1lUHJvbWlzZSA9IERPTVByb21pc2VEZWZlcnJl ZDxJRExJbnRlcmZhY2U8SW1hZ2VEYXRhPj47CiAgICAgdm9pZCBncmFiTmV4dE1lZGlhU3RyZWFt VHJhY2tGcmFtZShUcmFja0ZyYW1lUHJvbWlzZSYmKTsKKyAgICB2b2lkIG1lZGlhU3RyZWFtVHJh Y2tWaWRlb0ZyYW1lUm90YXRpb24oRE9NUHJvbWlzZURlZmVycmVkPElETFNob3J0PiYmKTsKICAg ICB2b2lkIGRlbGF5TWVkaWFTdHJlYW1UcmFja1NhbXBsZXMoTWVkaWFTdHJlYW1UcmFjayYsIGZs b2F0KTsKICAgICB2b2lkIHNldE1lZGlhU3RyZWFtVHJhY2tNdXRlZChNZWRpYVN0cmVhbVRyYWNr JiwgYm9vbCk7CiAgICAgdm9pZCByZW1vdmVNZWRpYVN0cmVhbVRyYWNrKE1lZGlhU3RyZWFtJiwg TWVkaWFTdHJlYW1UcmFjayYpOwpAQCAtMTMwMSw2ICsxMzAyLDcgQEAgcHJpdmF0ZToKICAgICB1 bnNpZ25lZCBsb25nIG1fdHJhY2tBdWRpb1NhbXBsZUNvdW50IHsgMCB9OwogICAgIFJlZlB0cjxS ZWFsdGltZU1lZGlhU291cmNlPiBtX3RyYWNrU291cmNlOwogICAgIHN0ZDo6dW5pcXVlX3B0cjxU cmFja0ZyYW1lUHJvbWlzZT4gbV9uZXh0VHJhY2tGcmFtZVByb21pc2U7CisgICAgaW50IG1fdHJh Y2tWaWRlb1JvdGF0aW9uIHsgMCB9OwogI2VuZGlmCiAjaWYgRU5BQkxFKE1FRElBX1NFU1NJT04p CiAgICAgc3RkOjp1bmlxdWVfcHRyPEFydHdvcmtJbWFnZUxvYWRlcj4gbV9hcnR3b3JrTG9hZGVy OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRsIGIvU291 cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRsCmluZGV4IDQyOGYzYjMyYWI5NjIxZDE0 YmI2NGM0ZDdkYmY1NGRkNmEzMjc0MDUuLjdkMWExY2ZkNzQ1ZjA4MjViNTQwODEwNTNkNjNlZTY3 MWUwOTEzMzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmlk bAorKysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwKQEAgLTkxOCw2ICs5 MTgsNyBAQCB0eXBlZGVmIChGZXRjaFJlcXVlc3Qgb3IgRmV0Y2hSZXNwb25zZSkgRmV0Y2hPYmpl Y3Q7CiAgICAgW0NvbmRpdGlvbmFsPU1FRElBX1NUUkVBTV0gdW5kZWZpbmVkIHNldENhbWVyYU1l ZGlhU3RyZWFtVHJhY2tPcmllbnRhdGlvbihNZWRpYVN0cmVhbVRyYWNrIHRyYWNrLCBzaG9ydCBv cmllbnRhdGlvbik7CiAgICAgW0NvbmRpdGlvbmFsPU1FRElBX1NUUkVBTV0gdW5kZWZpbmVkIG9i c2VydmVNZWRpYVN0cmVhbVRyYWNrKE1lZGlhU3RyZWFtVHJhY2sgdHJhY2spOwogICAgIFtDb25k aXRpb25hbD1NRURJQV9TVFJFQU1dIFByb21pc2U8SW1hZ2VEYXRhPiBncmFiTmV4dE1lZGlhU3Ry ZWFtVHJhY2tGcmFtZSgpOworICAgIFtDb25kaXRpb25hbD1NRURJQV9TVFJFQU1dIFByb21pc2U8 c2hvcnQ+IG1lZGlhU3RyZWFtVHJhY2tWaWRlb0ZyYW1lUm90YXRpb24oKTsKICAgICBbQ29uZGl0 aW9uYWw9TUVESUFfU1RSRUFNXSByZWFkb25seSBhdHRyaWJ1dGUgdW5zaWduZWQgbG9uZyB0cmFj a0F1ZGlvU2FtcGxlQ291bnQ7CiAgICAgW0NvbmRpdGlvbmFsPU1FRElBX1NUUkVBTV0gcmVhZG9u bHkgYXR0cmlidXRlIHVuc2lnbmVkIGxvbmcgdHJhY2tWaWRlb1NhbXBsZUNvdW50OwogICAgIFtD b25kaXRpb25hbD1NRURJQV9TVFJFQU1dIHVuZGVmaW5lZCBkZWxheU1lZGlhU3RyZWFtVHJhY2tT YW1wbGVzKE1lZGlhU3RyZWFtVHJhY2sgdHJhY2ssIGZsb2F0IGRlbGF5KTsKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAwMjhl NTU5OWIxZjA1ZDU2N2MxYzJjMjVhYjYwMTQ3Njc4YzM2ZWQ2Li4wNTlhNjU2MTg4MjE3Y2U0ZmZi YzBhNTM3ZTk4NzA2ODdlMzk1MGY0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK KysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjItMDMtMDgg IFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIFdlYlJUQyBkZWNv ZGVkIGZyYW1lcyBhcmUgbm90IGNvcnJlY3RseSByb3RhdGVkIGluIGNhc2UgR1BVIFByb2Nlc3Mg RE9NIHJlbmRlcmluZyBmbGFnIGlzIHNldCB0byB0cnVlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzc0NjgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt Lzg5ODA3ODc2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogd2VicnRjL3ZpZGVvLXJvdGF0aW9uLmh0bWw6CisgICAgICAgIE9ic2VydmUgYWN0dWFs IHZpZGVvIGZyYW1lIHJvdGF0aW9uIHZhbHVlLgorCiAyMDIyLTAzLTA4ICBZb3Vlbm4gRmFibGV0 ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBTY29wZSBjYXB0dXJlIHNvdXJjZXMgYnkg cGFnZSBpZGVudGlmaWVycwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLXJv dGF0aW9uLmh0bWwgYi9MYXlvdXRUZXN0cy93ZWJydGMvdmlkZW8tcm90YXRpb24uaHRtbAppbmRl eCBiYzJkNTc0MmM0N2U2NWI0YmE3YjJkODFjZmUyMmIyYjJkMGJlZGZjLi4xNWU5MjViOTZiMjdl MzNiZWQ3NGYxMzAxYzlmY2QzYTBkNjkyNmNiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy93ZWJy dGMvdmlkZW8tcm90YXRpb24uaHRtbAorKysgYi9MYXlvdXRUZXN0cy93ZWJydGMvdmlkZW8tcm90 YXRpb24uaHRtbApAQCAtNTAsNiArNTAsMjcgQEAgZnVuY3Rpb24gY2hlY2tWaWRlb0JsYWNrKGV4 cGVjdGVkLCB2aWRlbywgY2FudmFzSWQpCiAgICAgfSk7CiB9CiAKK2FzeW5jIGZ1bmN0aW9uIHdh aXRGb3JUcmFja1JvdGF0aW9uKHRyYWNrLCBhbmdsZSwgY291bnRlcikKK3sKKyAgICBpZiAoIXdp bmRvdy5pbnRlcm5hbHMpCisgICAgICAgIHJldHVybjsKKworICAgIGlmICghY291bnRlcikgewor ICAgICAgICBpbnRlcm5hbHMub2JzZXJ2ZU1lZGlhU3RyZWFtVHJhY2sodHJhY2spOworICAgICAg ICBjb3VudGVyID0gMTsKKyAgICB9CisKKyAgICBhd2FpdCBuZXcgUHJvbWlzZShyZXNvbHZlID0+ IHNldFRpbWVvdXQocmVzb2x2ZSwgNTApKTsKKyAgICBjb25zdCB2YWx1ZSA9IGF3YWl0IGludGVy bmFscy5tZWRpYVN0cmVhbVRyYWNrVmlkZW9GcmFtZVJvdGF0aW9uKCkKKyAgICBpZiAoYW5nbGUg PT09IHZhbHVlKQorICAgICAgICByZXR1cm47ICAgIAorCisgICAgaWYgKCsrY291bnRlciA+IDUw KQorICAgICAgICByZXR1cm4gUHJvbWlzZS5yZWplY3QoIndhaXRGb3JUcmFja1JvdGF0aW9uIHRp bWVkIG91dCB3aXRoIHZhbHVlICIgKyB2YWx1ZSArICIgd2hpbGUgZXhwZWN0aW5nICIgKyBhbmds ZSk7CisKKyAgICByZXR1cm4gd2FpdEZvclRyYWNrUm90YXRpb24odHJhY2ssIGFuZ2xlLCBjb3Vu dGVyKTsKK30KKwogdmFyIHRyYWNrOwogcHJvbWlzZV90ZXN0KCh0ZXN0KSA9PiB7CiAgICAgaWYg KHdpbmRvdy50ZXN0UnVubmVyKQpAQCAtNjIsOCArODMsNiBAQCBwcm9taXNlX3Rlc3QoKHRlc3Qp ID0+IHsKIAogICAgICAgICAgICAgY3JlYXRlQ29ubmVjdGlvbnMoKGZpcnN0Q29ubmVjdGlvbikg PT4gewogICAgICAgICAgICAgICAgIGZpcnN0Q29ubmVjdGlvbi5hZGRUcmFjayh0cmFjaywgbG9j YWxTdHJlYW0pOwotICAgICAgICAgICAgICAgIGlmICh3aW5kb3cuaW50ZXJuYWxzKQotICAgICAg ICAgICAgICAgICAgICBpbnRlcm5hbHMuYXBwbHlSb3RhdGlvbkZvck91dGdvaW5nVmlkZW9Tb3Vy Y2VzKGZpcnN0Q29ubmVjdGlvbik7CiAgICAgICAgICAgICB9LCAoc2Vjb25kQ29ubmVjdGlvbikg PT4gewogICAgICAgICAgICAgICAgIHNlY29uZENvbm5lY3Rpb24ub250cmFjayA9ICh0cmFja0V2 ZW50KSA9PiB7CiAgICAgICAgICAgICAgICAgICAgIHJlc29sdmUodHJhY2tFdmVudC5zdHJlYW1z WzBdKTsKQEAgLTk1LDI2ICsxMTQsMzAgQEAgcHJvbWlzZV90ZXN0KGFzeW5jICh0ZXN0KSA9PiB7 CiAgICAgYXdhaXQgd2FpdEZvclZpZGVvU2l6ZShsb2NhbFZpZGVvLCAyNDAsIDMyMCk7CiB9LCAi VHJhY2sgaXMgZW5hYmxlZCBhbmQgcm90YXRlZCwgbG9jYWwgdmlkZW8gc2hvdWxkIG5vdCBiZSBi bGFjayBhbmQgc2hvdWxkIGNoYW5nZSBzaXplIik7CiAKLXByb21pc2VfdGVzdCgodGVzdCkgPT4g eworcHJvbWlzZV90ZXN0KGFzeW5jICh0ZXN0KSA9PiB7CiAgICAgaWYgKHdpbmRvdy5pbnRlcm5h bHMpCiAgICAgICAgIHdpbmRvdy5pbnRlcm5hbHMuc2V0Q2FtZXJhTWVkaWFTdHJlYW1UcmFja09y aWVudGF0aW9uKHRyYWNrLCA5MCk7CiAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQogICAgICAg ICB0ZXN0UnVubmVyLnNldE1vY2tDYW1lcmFPcmllbnRhdGlvbig5MCk7CiAKLSAgICByZXR1cm4g Y2hlY2tWaWRlb0JsYWNrKGZhbHNlLCByZW1vdGVWaWRlbywgImNhbnZhczIiKS50aGVuKCgpID0+ IHsKKyAgICBhd2FpdCBjaGVja1ZpZGVvQmxhY2soZmFsc2UsIHJlbW90ZVZpZGVvLCAiY2FudmFz MiIpLnRoZW4oKCkgPT4gewogICAgICAgICByZXR1cm4gd2FpdEZvclZpZGVvU2l6ZShyZW1vdGVW aWRlbywgMjQwLCAzMjApOwogICAgIH0pOworCisgICAgYXdhaXQgd2FpdEZvclRyYWNrUm90YXRp b24ocmVtb3RlVmlkZW8uc3JjT2JqZWN0LmdldFZpZGVvVHJhY2tzKClbMF0sIDkwKTsKIH0sICJU cmFjayBpcyBlbmFibGVkIGFuZCByb3RhdGVkLCByZW1vdGUgdmlkZW8gc2hvdWxkIG5vdCBiZSBi bGFjayBhbmQgc2hvdWxkIGNoYW5nZSBzaXplIik7CiAKLXByb21pc2VfdGVzdCgodGVzdCkgPT4g eworcHJvbWlzZV90ZXN0KGFzeW5jICh0ZXN0KSA9PiB7CiAgICAgaWYgKHdpbmRvdy5pbnRlcm5h bHMpCiAgICAgICAgIHdpbmRvdy5pbnRlcm5hbHMuc2V0Q2FtZXJhTWVkaWFTdHJlYW1UcmFja09y aWVudGF0aW9uKHRyYWNrLCAxODApOwogICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKICAgICAg ICAgdGVzdFJ1bm5lci5zZXRNb2NrQ2FtZXJhT3JpZW50YXRpb24oMTgwKTsKIAotICAgIHJldHVy biBjaGVja1ZpZGVvQmxhY2soZmFsc2UsIHJlbW90ZVZpZGVvLCAiY2FudmFzMyIpLnRoZW4oKCkg PT4geworICAgIGF3YWl0IGNoZWNrVmlkZW9CbGFjayhmYWxzZSwgcmVtb3RlVmlkZW8sICJjYW52 YXMzIikudGhlbigoKSA9PiB7CiAgICAgICAgIHJldHVybiB3YWl0Rm9yVmlkZW9TaXplKHJlbW90 ZVZpZGVvLCAzMjAsIDI0MCk7CiAgICAgfSk7CisKKyAgICBhd2FpdCB3YWl0Rm9yVHJhY2tSb3Rh dGlvbihyZW1vdGVWaWRlby5zcmNPYmplY3QuZ2V0VmlkZW9UcmFja3MoKVswXSwgMTgwKTsKIH0s ICJUcmFjayBpcyBlbmFibGVkIGFuZCByb3RhdGVkIGFnYWluLCB2aWRlbyBzaG91bGQgbm90IGJl IGJsYWNrIGFuZCBzaG91bGQgY2hhbmdlIHNpemUiKTsKICAgICAgICAgPC9zY3JpcHQ+CiAgICAg PC9ib2R5Pgo= 454124 2022-03-08 08:24:48 -0800 2022-03-08 23:34:07 -0800 Patch bug-237468-20220308172446.patch text/plain 11032 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwOTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGRiMmIwZGY4MTI1NTk1 OTBhZmQwNDZlYTFkNzg2YThkNjllMjNlMi4uZjA5MWU1NmJmZDdiYWI1NjZiYjExNDU0ZmVhODc5 YmI3NmZmOTkwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIyLTAzLTA4ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJSVEMgZGVjb2RlZCBm cmFtZXMgYXJlIG5vdCBjb3JyZWN0bHkgcm90YXRlZCBpbiBjYXNlIEdQVSBQcm9jZXNzIERPTSBy ZW5kZXJpbmcgZmxhZyBpcyBzZXQgdG8gdHJ1ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NDY4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84OTgw Nzg3Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBX ZSB3ZXJlIGNyZWF0aW5nIHJlbW92ZSB2aWRlbyBmcmFtZXMgYXQgd2VicnRjIGRlY29kZXIgbGV2 ZWwgYnV0IGF0IHRoYXQgbGV2ZWwsIHdlIGRvIG5vdCBrbm93IHlldCB0aGUgcm90YXRpb24gYW5k IHRpbWVzdGFtcHMgb2YgdGhlIGZyYW1lLgorICAgICAgICBXZSBuZWVkIHRvIHNldCB0aG9zZSB2 YWx1ZXMgd2hlbiB0aGUgZnJhbWUgaXMgZXhwb3NlZCB0byBSZWFsdGltZUluY29taW5nVmlkZW9T b3VyY2UuCisgICAgICAgIFByZXZpb3VzIHRlc3RzIGRpZCBub3QgY2F0Y2ggdGhlIHJlZ3Jlc3Np b24gYXMgd2Ugd2VyZSBjb3JyZWN0bHkgY29tcHV0aW5nIHRoZSBzaXplIG9mIHRoZSB2aWRlbyB1 c2luZyB0aGUgd2VicnRjIHJvdGF0aW9uIGFuZCBub3QgdGhlIHJvdGF0aW9uIGZyb20gdGhlIGZy YW1lLgorICAgICAgICBXZSBzaG91bGQgcHJvYmFibHkgbWlncmF0ZSB0byBSZW1vdGVWaWRlb0Zy YW1lUHJveHkgYXMgYSBidWZmZXIgd3JhcHBlciBzbyB0aGF0IHdlIGNhbiBlYXNpbHkgY3JlYXRl IHJlbW90ZSB2aWRlbyBmcmFtZXMgZnJvbSBhIFJlbW90ZVZpZGVvRnJhbWVQcm94eSBidWZmZXIu CisgICAgICAgIEluIHRoZSBtZWFudGltZSwgd2UgdXNlIGNvbnN0X2Nhc3QgaW4gVmlkZW9GcmFt ZTo6aW5pdGlhbGl6ZUNoYXJhY3RlcmlzdGljcy4KKworICAgICAgICBDb3ZlcmVkIGJ5IHVwZGF0 ZWQgdGVzdC4KKworICAgICAgICAqIHBsYXRmb3JtL1ZpZGVvRnJhbWUuY3BwOgorICAgICAgICAq IHBsYXRmb3JtL1ZpZGVvRnJhbWUuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9t YWMvUmVhbHRpbWVJbmNvbWluZ1ZpZGVvU291cmNlQ29jb2EubW06CisgICAgICAgICogdGVzdGlu Zy9JbnRlcm5hbHMuY3BwOgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmg6CisgICAgICAg ICogdGVzdGluZy9JbnRlcm5hbHMuaWRsOgorCiAyMDIyLTAzLTA4ICBNaWNoYWVsIENhdGFuemFy byAgPG1jYXRhbnphcm9AZ25vbWUub3JnPgogCiAgICAgICAgIFtHVEtdIFN5bmMgZ3RrLW92ZXJs YXktc2Nyb2xsaW5nIHNldHRpbmcgdG8gd2ViIHByb2Nlc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1ZpZGVvRnJhbWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v VmlkZW9GcmFtZS5jcHAKaW5kZXggYTU0OWMxYTVjNDhlYjIzZDY0YmEzZmQzNTM4NDA4YmQxNTUy MzRmMC4uZjEzODg1YTVjYTUwYThhMzdiMDViOWVkNWFlMTY2OGU4MDFjZjAxNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVmlkZW9GcmFtZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vVmlkZW9GcmFtZS5jcHAKQEAgLTEzMSw2ICsxMzEsMTMgQEAgdm9pZCBW aWRlb0ZyYW1lOjpkdW1wKFByaW50U3RyZWFtJikgY29uc3QKIHsKIH0KIAordm9pZCBWaWRlb0Zy YW1lOjppbml0aWFsaXplQ2hhcmFjdGVyaXN0aWNzKE1lZGlhVGltZSBwcmVzZW50YXRpb25UaW1l LCBib29sIGlzTWlycm9yZWQsIFZpZGVvUm90YXRpb24gcm90YXRpb24pCit7CisgICAgY29uc3Rf Y2FzdDxNZWRpYVRpbWUmPihtX3ByZXNlbnRhdGlvblRpbWUpID0gcHJlc2VudGF0aW9uVGltZTsK KyAgICBjb25zdF9jYXN0PGJvb2wmPihtX2lzTWlycm9yZWQpID0gaXNNaXJyb3JlZDsKKyAgICBj b25zdF9jYXN0PFZpZGVvUm90YXRpb24mPihtX3JvdGF0aW9uKSA9IHJvdGF0aW9uOworfQorCiB9 CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVmlkZW9GcmFt ZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVmlkZW9GcmFtZS5oCmluZGV4IDY0MTFkZjdk NjQwY2NkZWQxZDFlM2UxMWZkMWE0MjhhMjkxYjMxZWQuLjlhNGVhZmM0ODQxMTBmNDFmMWU5ZGJm MzhkZDdiODhjZjc0YzczYWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Zp ZGVvRnJhbWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9WaWRlb0ZyYW1lLmgKQEAg LTU3LDYgKzU3LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgUmVmUHRyPFdlYkNvcmU6OlZpZGVv RnJhbWVDVj4gYXNWaWRlb0ZyYW1lQ1YoKSA9IDA7CiAjZW5kaWYKIAorICAgIHZvaWQgaW5pdGlh bGl6ZUNoYXJhY3RlcmlzdGljcyhNZWRpYVRpbWUgcHJlc2VudGF0aW9uVGltZSwgYm9vbCBpc01p cnJvcmVkLCBWaWRlb1JvdGF0aW9uKTsKKwogcHJvdGVjdGVkOgogICAgIFdFQkNPUkVfRVhQT1JU IFZpZGVvRnJhbWUoTWVkaWFUaW1lIHByZXNlbnRhdGlvblRpbWUsIGJvb2wgaXNNaXJyb3JlZCwg VmlkZW9Sb3RhdGlvbik7CiAgICAgY29uc3QgTWVkaWFUaW1lIG1fcHJlc2VudGF0aW9uVGltZTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9SZWFs dGltZUluY29taW5nVmlkZW9Tb3VyY2VDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21lZGlhc3RyZWFtL21hYy9SZWFsdGltZUluY29taW5nVmlkZW9Tb3VyY2VDb2NvYS5tbQppbmRl eCBmMTBjZmUxZjAyOWJmNjY0Y2M4MjMyZDYxN2FmYjE2MDRiYzk3NGIwLi5hYzU3NzYwNjZmYTE0 NjdhM2Q3MDNhMWEwYjAyYzY3ODcxMGYxMmEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVhbHRpbWVJbmNvbWluZ1ZpZGVvU291cmNlQ29jb2Eu bW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL1JlYWx0aW1l SW5jb21pbmdWaWRlb1NvdXJjZUNvY29hLm1tCkBAIC0xMzAsNyArMTMwLDkgQEAgUmVmUHRyPE1l ZGlhU2FtcGxlPiBSZWFsdGltZUluY29taW5nVmlkZW9Tb3VyY2VDb2NvYTo6dG9WaWRlb0ZyYW1l KGNvbnN0IHdlYnJ0YzoKIAogICAgIGlmIChhdXRvKiBwcm92aWRlciA9IHZpZGVvRnJhbWVCdWZm ZXJQcm92aWRlcihmcmFtZSkpIHsKICAgICAgICAgLy8gVGhlIG9ubHkgc3VwcG9ydGVkIHByb3Zp ZGVyIGlzIFZpZGVvRnJhbWUuCi0gICAgICAgIHJldHVybiBzdGF0aWNfY2FzdDxWaWRlb0ZyYW1l Kj4ocHJvdmlkZXIpOworICAgICAgICBhdXRvKiB2aWRlb0ZyYW1lID0gc3RhdGljX2Nhc3Q8Vmlk ZW9GcmFtZSo+KHByb3ZpZGVyKTsKKyAgICAgICAgdmlkZW9GcmFtZS0+aW5pdGlhbGl6ZUNoYXJh Y3RlcmlzdGljcyhNZWRpYVRpbWUgeyBmcmFtZS50aW1lc3RhbXBfdXMoKSwgMTAwMDAwMCB9LCBm YWxzZSwgcm90YXRpb24pOworICAgICAgICByZXR1cm4gdmlkZW9GcmFtZTsKICAgICB9CiAKICAg ICAvLyBJbiBjYXNlIG9mIGluIG1lbW9yeSBzYW1wbGVzLCB3ZSBoYXZlIG5vbiBpbnRlcmxlYXZl ZCBZVVYgZGF0YSB3aGlsZSBDVlBpeGVsQnVmZmVycyBwcmVmZXIgaW50ZXJsZWF2ZWQgWVVWIGRh dGEuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAgYi9T b3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKaW5kZXggM2UxMmVjOGY2MGQxMTUz ZTc1MmUxYjZjYzNhMzIyOGRmYWFhNjQ3Ny4uMWEwYThiMWIzMmQzZjdhZDA2ZWE1ODlhMDA3MGFi ZWQzMzM4NzE4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcApAQCAtNTUxMCw2 ICs1NTEwLDcgQEAgdm9pZCBJbnRlcm5hbHM6Om9ic2VydmVNZWRpYVN0cmVhbVRyYWNrKE1lZGlh U3RyZWFtVHJhY2smIHRyYWNrKQogewogICAgIHN0b3BPYnNlcnZpbmdSZWFsdGltZU1lZGlhU291 cmNlKCk7CiAKKyAgICBtX3RyYWNrVmlkZW9Sb3RhdGlvbiA9IC0xOwogICAgIG1fdHJhY2tTb3Vy Y2UgPSAmdHJhY2suc291cmNlKCk7CiAgICAgbV90cmFja1NvdXJjZS0+YWRkT2JzZXJ2ZXIoKnRo aXMpOwogICAgIHN3aXRjaCAobV90cmFja1NvdXJjZS0+dHlwZSgpKSB7CkBAIC01NTMyLDEyICs1 NTMzLDE4IEBAIHZvaWQgSW50ZXJuYWxzOjpncmFiTmV4dE1lZGlhU3RyZWFtVHJhY2tGcmFtZShU cmFja0ZyYW1lUHJvbWlzZSYmIHByb21pc2UpCiAgICAgbV9uZXh0VHJhY2tGcmFtZVByb21pc2Ug PSBtYWtlVW5pcXVlPFRyYWNrRnJhbWVQcm9taXNlPihXVEZNb3ZlKHByb21pc2UpKTsKIH0KIAor dm9pZCBJbnRlcm5hbHM6Om1lZGlhU3RyZWFtVHJhY2tWaWRlb0ZyYW1lUm90YXRpb24oRE9NUHJv bWlzZURlZmVycmVkPElETFNob3J0PiYmIHByb21pc2UpCit7CisgICAgcHJvbWlzZS5yZXNvbHZl KG1fdHJhY2tWaWRlb1JvdGF0aW9uKTsKK30KKwogdm9pZCBJbnRlcm5hbHM6OnZpZGVvU2FtcGxl QXZhaWxhYmxlKE1lZGlhU2FtcGxlJiBzYW1wbGUsIFZpZGVvU2FtcGxlTWV0YWRhdGEpCiB7CiAg ICAgY2FsbE9uTWFpblRocmVhZChbdGhpcywgd2Vha1RoaXMgPSBXZWFrUHRyIHsgKnRoaXMgfSwg c2FtcGxlID0gUmVmIHsgc2FtcGxlIH1dIHsKICAgICAgICAgaWYgKCF3ZWFrVGhpcykKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgbV90cmFja1ZpZGVvU2FtcGxlQ291bnQrKzsKKyAgICAg ICAgbV90cmFja1ZpZGVvUm90YXRpb24gPSBzdGF0aWNfY2FzdDxpbnQ+KHNhbXBsZS0+dmlkZW9S b3RhdGlvbigpKTsKICAgICAgICAgaWYgKCFtX25leHRUcmFja0ZyYW1lUHJvbWlzZSkKICAgICAg ICAgICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRl cm5hbHMuaCBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgKaW5kZXggY2U5OThj MzQ3ZTQ1YzJkZjMwOWI1OTBiZjJjYWFhNWU3NTYwZDg2ZC4uNDQ0M2U1MDNkZGZiMTQ2OGI4Nzcz MjFhMDFkMmFkODY2YjNlODE1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9J bnRlcm5hbHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCkBAIC04 NzMsNiArODczLDcgQEAgcHVibGljOgogICAgIHZvaWQgb2JzZXJ2ZU1lZGlhU3RyZWFtVHJhY2so TWVkaWFTdHJlYW1UcmFjayYpOwogICAgIHVzaW5nIFRyYWNrRnJhbWVQcm9taXNlID0gRE9NUHJv bWlzZURlZmVycmVkPElETEludGVyZmFjZTxJbWFnZURhdGE+PjsKICAgICB2b2lkIGdyYWJOZXh0 TWVkaWFTdHJlYW1UcmFja0ZyYW1lKFRyYWNrRnJhbWVQcm9taXNlJiYpOworICAgIHZvaWQgbWVk aWFTdHJlYW1UcmFja1ZpZGVvRnJhbWVSb3RhdGlvbihET01Qcm9taXNlRGVmZXJyZWQ8SURMU2hv cnQ+JiYpOwogICAgIHZvaWQgZGVsYXlNZWRpYVN0cmVhbVRyYWNrU2FtcGxlcyhNZWRpYVN0cmVh bVRyYWNrJiwgZmxvYXQpOwogICAgIHZvaWQgc2V0TWVkaWFTdHJlYW1UcmFja011dGVkKE1lZGlh U3RyZWFtVHJhY2smLCBib29sKTsKICAgICB2b2lkIHJlbW92ZU1lZGlhU3RyZWFtVHJhY2soTWVk aWFTdHJlYW0mLCBNZWRpYVN0cmVhbVRyYWNrJik7CkBAIC0xMzAxLDYgKzEzMDIsNyBAQCBwcml2 YXRlOgogICAgIHVuc2lnbmVkIGxvbmcgbV90cmFja0F1ZGlvU2FtcGxlQ291bnQgeyAwIH07CiAg ICAgUmVmUHRyPFJlYWx0aW1lTWVkaWFTb3VyY2U+IG1fdHJhY2tTb3VyY2U7CiAgICAgc3RkOjp1 bmlxdWVfcHRyPFRyYWNrRnJhbWVQcm9taXNlPiBtX25leHRUcmFja0ZyYW1lUHJvbWlzZTsKKyAg ICBpbnQgbV90cmFja1ZpZGVvUm90YXRpb24geyAwIH07CiAjZW5kaWYKICNpZiBFTkFCTEUoTUVE SUFfU0VTU0lPTikKICAgICBzdGQ6OnVuaXF1ZV9wdHI8QXJ0d29ya0ltYWdlTG9hZGVyPiBtX2Fy dHdvcmtMb2FkZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFs cy5pZGwgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwKaW5kZXggNDI4ZjNi MzJhYjk2MjFkMTRiYjY0YzRkN2RiZjU0ZGQ2YTMyNzQwNS4uN2QxYTFjZmQ3NDVmMDgyNWI1NDA4 MTA1M2Q2M2VlNjcxZTA5MTMzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9J bnRlcm5hbHMuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmlkbApA QCAtOTE4LDYgKzkxOCw3IEBAIHR5cGVkZWYgKEZldGNoUmVxdWVzdCBvciBGZXRjaFJlc3BvbnNl KSBGZXRjaE9iamVjdDsKICAgICBbQ29uZGl0aW9uYWw9TUVESUFfU1RSRUFNXSB1bmRlZmluZWQg c2V0Q2FtZXJhTWVkaWFTdHJlYW1UcmFja09yaWVudGF0aW9uKE1lZGlhU3RyZWFtVHJhY2sgdHJh Y2ssIHNob3J0IG9yaWVudGF0aW9uKTsKICAgICBbQ29uZGl0aW9uYWw9TUVESUFfU1RSRUFNXSB1 bmRlZmluZWQgb2JzZXJ2ZU1lZGlhU3RyZWFtVHJhY2soTWVkaWFTdHJlYW1UcmFjayB0cmFjayk7 CiAgICAgW0NvbmRpdGlvbmFsPU1FRElBX1NUUkVBTV0gUHJvbWlzZTxJbWFnZURhdGE+IGdyYWJO ZXh0TWVkaWFTdHJlYW1UcmFja0ZyYW1lKCk7CisgICAgW0NvbmRpdGlvbmFsPU1FRElBX1NUUkVB TV0gUHJvbWlzZTxzaG9ydD4gbWVkaWFTdHJlYW1UcmFja1ZpZGVvRnJhbWVSb3RhdGlvbigpOwog ICAgIFtDb25kaXRpb25hbD1NRURJQV9TVFJFQU1dIHJlYWRvbmx5IGF0dHJpYnV0ZSB1bnNpZ25l ZCBsb25nIHRyYWNrQXVkaW9TYW1wbGVDb3VudDsKICAgICBbQ29uZGl0aW9uYWw9TUVESUFfU1RS RUFNXSByZWFkb25seSBhdHRyaWJ1dGUgdW5zaWduZWQgbG9uZyB0cmFja1ZpZGVvU2FtcGxlQ291 bnQ7CiAgICAgW0NvbmRpdGlvbmFsPU1FRElBX1NUUkVBTV0gdW5kZWZpbmVkIGRlbGF5TWVkaWFT dHJlYW1UcmFja1NhbXBsZXMoTWVkaWFTdHJlYW1UcmFjayB0cmFjaywgZmxvYXQgZGVsYXkpOwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CmluZGV4IDFmMDk2MjgzZDA5OTYyZGNhZjgyNTVlNGQ4ZjliNWFlNjc0OWZmNzMuLmQ4MWY0NTYz ZWQxNWQyZTY4MGZkYWY2OGU4NmY4ZTIzYWJhYjJjMGEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAor MjAyMi0wMy0wOCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAgICAgICAg V2ViUlRDIGRlY29kZWQgZnJhbWVzIGFyZSBub3QgY29ycmVjdGx5IHJvdGF0ZWQgaW4gY2FzZSBH UFUgUHJvY2VzcyBET00gcmVuZGVyaW5nIGZsYWcgaXMgc2V0IHRvIHRydWUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNzQ2OAorICAgICAgICA8cmRh cjovL3Byb2JsZW0vODk4MDc4NzY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiB3ZWJydGMvdmlkZW8tcm90YXRpb24uaHRtbDoKKyAgICAgICAgT2Jz ZXJ2ZSBhY3R1YWwgdmlkZW8gZnJhbWUgcm90YXRpb24gdmFsdWUuCisKIDIwMjItMDMtMDggIEog UGFzY29lICA8al9wYXNjb2VAYXBwbGUuY29tPgogCiAgICAgICAgIFsgaU9TIF0gMlggaHR0cC93 cHQvd2ViYXV0aG4vcHVibGljLWtleS1jcmVkZW50aWFsLWNyZWF0ZS1mYWlsdXJlLWxvY2FsIChs YXlvdXQtdGVzdHMpIGFyZSBjb25zdGFudCB0ZXh0IGZhaWx1cmVzCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy93ZWJydGMvdmlkZW8tcm90YXRpb24uaHRtbCBiL0xheW91dFRlc3RzL3dlYnJ0Yy92 aWRlby1yb3RhdGlvbi5odG1sCmluZGV4IGJjMmQ1NzQyYzQ3ZTY1YjRiYTdiMmQ4MWNmZTIyYjJi MmQwYmVkZmMuLjE1ZTkyNWI5NmIyN2UzM2JlZDc0ZjEzMDFjOWZjZDNhMGQ2OTI2Y2IgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL3dlYnJ0Yy92aWRlby1yb3RhdGlvbi5odG1sCisrKyBiL0xheW91 dFRlc3RzL3dlYnJ0Yy92aWRlby1yb3RhdGlvbi5odG1sCkBAIC01MCw2ICs1MCwyNyBAQCBmdW5j dGlvbiBjaGVja1ZpZGVvQmxhY2soZXhwZWN0ZWQsIHZpZGVvLCBjYW52YXNJZCkKICAgICB9KTsK IH0KIAorYXN5bmMgZnVuY3Rpb24gd2FpdEZvclRyYWNrUm90YXRpb24odHJhY2ssIGFuZ2xlLCBj b3VudGVyKQoreworICAgIGlmICghd2luZG93LmludGVybmFscykKKyAgICAgICAgcmV0dXJuOwor CisgICAgaWYgKCFjb3VudGVyKSB7CisgICAgICAgIGludGVybmFscy5vYnNlcnZlTWVkaWFTdHJl YW1UcmFjayh0cmFjayk7CisgICAgICAgIGNvdW50ZXIgPSAxOworICAgIH0KKworICAgIGF3YWl0 IG5ldyBQcm9taXNlKHJlc29sdmUgPT4gc2V0VGltZW91dChyZXNvbHZlLCA1MCkpOworICAgIGNv bnN0IHZhbHVlID0gYXdhaXQgaW50ZXJuYWxzLm1lZGlhU3RyZWFtVHJhY2tWaWRlb0ZyYW1lUm90 YXRpb24oKQorICAgIGlmIChhbmdsZSA9PT0gdmFsdWUpCisgICAgICAgIHJldHVybjsgICAgCisK KyAgICBpZiAoKytjb3VudGVyID4gNTApCisgICAgICAgIHJldHVybiBQcm9taXNlLnJlamVjdCgi d2FpdEZvclRyYWNrUm90YXRpb24gdGltZWQgb3V0IHdpdGggdmFsdWUgIiArIHZhbHVlICsgIiB3 aGlsZSBleHBlY3RpbmcgIiArIGFuZ2xlKTsKKworICAgIHJldHVybiB3YWl0Rm9yVHJhY2tSb3Rh dGlvbih0cmFjaywgYW5nbGUsIGNvdW50ZXIpOworfQorCiB2YXIgdHJhY2s7CiBwcm9taXNlX3Rl c3QoKHRlc3QpID0+IHsKICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCkBAIC02Miw4ICs4Myw2 IEBAIHByb21pc2VfdGVzdCgodGVzdCkgPT4gewogCiAgICAgICAgICAgICBjcmVhdGVDb25uZWN0 aW9ucygoZmlyc3RDb25uZWN0aW9uKSA9PiB7CiAgICAgICAgICAgICAgICAgZmlyc3RDb25uZWN0 aW9uLmFkZFRyYWNrKHRyYWNrLCBsb2NhbFN0cmVhbSk7Ci0gICAgICAgICAgICAgICAgaWYgKHdp bmRvdy5pbnRlcm5hbHMpCi0gICAgICAgICAgICAgICAgICAgIGludGVybmFscy5hcHBseVJvdGF0 aW9uRm9yT3V0Z29pbmdWaWRlb1NvdXJjZXMoZmlyc3RDb25uZWN0aW9uKTsKICAgICAgICAgICAg IH0sIChzZWNvbmRDb25uZWN0aW9uKSA9PiB7CiAgICAgICAgICAgICAgICAgc2Vjb25kQ29ubmVj dGlvbi5vbnRyYWNrID0gKHRyYWNrRXZlbnQpID0+IHsKICAgICAgICAgICAgICAgICAgICAgcmVz b2x2ZSh0cmFja0V2ZW50LnN0cmVhbXNbMF0pOwpAQCAtOTUsMjYgKzExNCwzMCBAQCBwcm9taXNl X3Rlc3QoYXN5bmMgKHRlc3QpID0+IHsKICAgICBhd2FpdCB3YWl0Rm9yVmlkZW9TaXplKGxvY2Fs VmlkZW8sIDI0MCwgMzIwKTsKIH0sICJUcmFjayBpcyBlbmFibGVkIGFuZCByb3RhdGVkLCBsb2Nh bCB2aWRlbyBzaG91bGQgbm90IGJlIGJsYWNrIGFuZCBzaG91bGQgY2hhbmdlIHNpemUiKTsKIAot cHJvbWlzZV90ZXN0KCh0ZXN0KSA9PiB7Citwcm9taXNlX3Rlc3QoYXN5bmMgKHRlc3QpID0+IHsK ICAgICBpZiAod2luZG93LmludGVybmFscykKICAgICAgICAgd2luZG93LmludGVybmFscy5zZXRD YW1lcmFNZWRpYVN0cmVhbVRyYWNrT3JpZW50YXRpb24odHJhY2ssIDkwKTsKICAgICBpZiAod2lu ZG93LnRlc3RSdW5uZXIpCiAgICAgICAgIHRlc3RSdW5uZXIuc2V0TW9ja0NhbWVyYU9yaWVudGF0 aW9uKDkwKTsKIAotICAgIHJldHVybiBjaGVja1ZpZGVvQmxhY2soZmFsc2UsIHJlbW90ZVZpZGVv LCAiY2FudmFzMiIpLnRoZW4oKCkgPT4geworICAgIGF3YWl0IGNoZWNrVmlkZW9CbGFjayhmYWxz ZSwgcmVtb3RlVmlkZW8sICJjYW52YXMyIikudGhlbigoKSA9PiB7CiAgICAgICAgIHJldHVybiB3 YWl0Rm9yVmlkZW9TaXplKHJlbW90ZVZpZGVvLCAyNDAsIDMyMCk7CiAgICAgfSk7CisKKyAgICBh d2FpdCB3YWl0Rm9yVHJhY2tSb3RhdGlvbihyZW1vdGVWaWRlby5zcmNPYmplY3QuZ2V0VmlkZW9U cmFja3MoKVswXSwgOTApOwogfSwgIlRyYWNrIGlzIGVuYWJsZWQgYW5kIHJvdGF0ZWQsIHJlbW90 ZSB2aWRlbyBzaG91bGQgbm90IGJlIGJsYWNrIGFuZCBzaG91bGQgY2hhbmdlIHNpemUiKTsKIAot cHJvbWlzZV90ZXN0KCh0ZXN0KSA9PiB7Citwcm9taXNlX3Rlc3QoYXN5bmMgKHRlc3QpID0+IHsK ICAgICBpZiAod2luZG93LmludGVybmFscykKICAgICAgICAgd2luZG93LmludGVybmFscy5zZXRD YW1lcmFNZWRpYVN0cmVhbVRyYWNrT3JpZW50YXRpb24odHJhY2ssIDE4MCk7CiAgICAgaWYgKHdp bmRvdy50ZXN0UnVubmVyKQogICAgICAgICB0ZXN0UnVubmVyLnNldE1vY2tDYW1lcmFPcmllbnRh dGlvbigxODApOwogCi0gICAgcmV0dXJuIGNoZWNrVmlkZW9CbGFjayhmYWxzZSwgcmVtb3RlVmlk ZW8sICJjYW52YXMzIikudGhlbigoKSA9PiB7CisgICAgYXdhaXQgY2hlY2tWaWRlb0JsYWNrKGZh bHNlLCByZW1vdGVWaWRlbywgImNhbnZhczMiKS50aGVuKCgpID0+IHsKICAgICAgICAgcmV0dXJu IHdhaXRGb3JWaWRlb1NpemUocmVtb3RlVmlkZW8sIDMyMCwgMjQwKTsKICAgICB9KTsKKworICAg IGF3YWl0IHdhaXRGb3JUcmFja1JvdGF0aW9uKHJlbW90ZVZpZGVvLnNyY09iamVjdC5nZXRWaWRl b1RyYWNrcygpWzBdLCAxODApOwogfSwgIlRyYWNrIGlzIGVuYWJsZWQgYW5kIHJvdGF0ZWQgYWdh aW4sIHZpZGVvIHNob3VsZCBub3QgYmUgYmxhY2sgYW5kIHNob3VsZCBjaGFuZ2Ugc2l6ZSIpOwog ICAgICAgICA8L3NjcmlwdD4KICAgICA8L2JvZHk+Cg== 454196 2022-03-08 23:34:12 -0800 2022-03-09 07:26:54 -0800 Patch for landing bug-237468-20220309083411.patch text/plain 11028 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwOTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGRiMmIwZGY4MTI1NTk1 OTBhZmQwNDZlYTFkNzg2YThkNjllMjNlMi4uMjY3YzY0YmI2MzY1YzNmZTNkYTcxYmZhYjcyYTYy YWQ2YzI2MWEwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIyLTAzLTA4ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJSVEMgZGVjb2RlZCBm cmFtZXMgYXJlIG5vdCBjb3JyZWN0bHkgcm90YXRlZCBpbiBjYXNlIEdQVSBQcm9jZXNzIERPTSBy ZW5kZXJpbmcgZmxhZyBpcyBzZXQgdG8gdHJ1ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NDY4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84OTgw Nzg3Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAgICAgICAgV2Ug d2VyZSBjcmVhdGluZyByZW1vdGUgdmlkZW8gZnJhbWVzIGF0IHdlYnJ0YyBkZWNvZGVyIGxldmVs IGJ1dCBhdCB0aGF0IGxldmVsLCB3ZSBkbyBub3Qga25vdyB5ZXQgdGhlIHJvdGF0aW9uIGFuZCB0 aW1lc3RhbXBzIG9mIHRoZSBmcmFtZS4KKyAgICAgICAgV2UgbmVlZCB0byBzZXQgdGhvc2UgdmFs dWVzIHdoZW4gdGhlIGZyYW1lIGlzIGV4cG9zZWQgdG8gUmVhbHRpbWVJbmNvbWluZ1ZpZGVvU291 cmNlLgorICAgICAgICBQcmV2aW91cyB0ZXN0cyBkaWQgbm90IGNhdGNoIHRoZSByZWdyZXNzaW9u IGFzIHdlIHdlcmUgY29ycmVjdGx5IGNvbXB1dGluZyB0aGUgc2l6ZSBvZiB0aGUgdmlkZW8gdXNp bmcgdGhlIHdlYnJ0YyByb3RhdGlvbiBhbmQgbm90IHRoZSByb3RhdGlvbiBmcm9tIHRoZSBmcmFt ZS4KKyAgICAgICAgV2Ugc2hvdWxkIHByb2JhYmx5IG1pZ3JhdGUgdG8gUmVtb3RlVmlkZW9GcmFt ZVByb3h5IGFzIGEgYnVmZmVyIHdyYXBwZXIgc28gdGhhdCB3ZSBjYW4gZWFzaWx5IGNyZWF0ZSBy ZW1vdGUgdmlkZW8gZnJhbWVzIGZyb20gYSBSZW1vdGVWaWRlb0ZyYW1lUHJveHkgYnVmZmVyLgor ICAgICAgICBJbiB0aGUgbWVhbnRpbWUsIHdlIHVzZSBjb25zdF9jYXN0IGluIFZpZGVvRnJhbWU6 OmluaXRpYWxpemVDaGFyYWN0ZXJpc3RpY3MuCisKKyAgICAgICAgQ292ZXJlZCBieSB1cGRhdGVk IHRlc3QuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9WaWRlb0ZyYW1lLmNwcDoKKyAgICAgICAgKiBw bGF0Zm9ybS9WaWRlb0ZyYW1lLmg6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFj L1JlYWx0aW1lSW5jb21pbmdWaWRlb1NvdXJjZUNvY29hLm1tOgorICAgICAgICAqIHRlc3Rpbmcv SW50ZXJuYWxzLmNwcDoKKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5oOgorICAgICAgICAq IHRlc3RpbmcvSW50ZXJuYWxzLmlkbDoKKwogMjAyMi0wMy0wOCAgTWljaGFlbCBDYXRhbnphcm8g IDxtY2F0YW56YXJvQGdub21lLm9yZz4KIAogICAgICAgICBbR1RLXSBTeW5jIGd0ay1vdmVybGF5 LXNjcm9sbGluZyBzZXR0aW5nIHRvIHdlYiBwcm9jZXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9WaWRlb0ZyYW1lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Zp ZGVvRnJhbWUuY3BwCmluZGV4IGE1NDljMWE1YzQ4ZWIyM2Q2NGJhM2ZkMzUzODQwOGJkMTU1MjM0 ZjAuLmYxMzg4NWE1Y2E1MGE4YTM3YjA1YjllZDVhZTE2NjhlODAxY2YwMTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1ZpZGVvRnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL1ZpZGVvRnJhbWUuY3BwCkBAIC0xMzEsNiArMTMxLDEzIEBAIHZvaWQgVmlk ZW9GcmFtZTo6ZHVtcChQcmludFN0cmVhbSYpIGNvbnN0CiB7CiB9CiAKK3ZvaWQgVmlkZW9GcmFt ZTo6aW5pdGlhbGl6ZUNoYXJhY3RlcmlzdGljcyhNZWRpYVRpbWUgcHJlc2VudGF0aW9uVGltZSwg Ym9vbCBpc01pcnJvcmVkLCBWaWRlb1JvdGF0aW9uIHJvdGF0aW9uKQoreworICAgIGNvbnN0X2Nh c3Q8TWVkaWFUaW1lJj4obV9wcmVzZW50YXRpb25UaW1lKSA9IHByZXNlbnRhdGlvblRpbWU7Cisg ICAgY29uc3RfY2FzdDxib29sJj4obV9pc01pcnJvcmVkKSA9IGlzTWlycm9yZWQ7CisgICAgY29u c3RfY2FzdDxWaWRlb1JvdGF0aW9uJj4obV9yb3RhdGlvbikgPSByb3RhdGlvbjsKK30KKwogfQog CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1ZpZGVvRnJhbWUu aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1ZpZGVvRnJhbWUuaAppbmRleCA2NDExZGY3ZDY0 MGNjZGVkMWQxZTNlMTFmZDFhNDI4YTI5MWIzMWVkLi45YTRlYWZjNDg0MTEwZjQxZjFlOWRiZjM4 ZGQ3Yjg4Y2Y3NGM3M2FiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9WaWRl b0ZyYW1lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVmlkZW9GcmFtZS5oCkBAIC01 Nyw2ICs1Nyw4IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIFJlZlB0cjxXZWJDb3JlOjpWaWRlb0Zy YW1lQ1Y+IGFzVmlkZW9GcmFtZUNWKCkgPSAwOwogI2VuZGlmCiAKKyAgICB2b2lkIGluaXRpYWxp emVDaGFyYWN0ZXJpc3RpY3MoTWVkaWFUaW1lIHByZXNlbnRhdGlvblRpbWUsIGJvb2wgaXNNaXJy b3JlZCwgVmlkZW9Sb3RhdGlvbik7CisKIHByb3RlY3RlZDoKICAgICBXRUJDT1JFX0VYUE9SVCBW aWRlb0ZyYW1lKE1lZGlhVGltZSBwcmVzZW50YXRpb25UaW1lLCBib29sIGlzTWlycm9yZWQsIFZp ZGVvUm90YXRpb24pOwogICAgIGNvbnN0IE1lZGlhVGltZSBtX3ByZXNlbnRhdGlvblRpbWU7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVhbHRp bWVJbmNvbWluZ1ZpZGVvU291cmNlQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t ZWRpYXN0cmVhbS9tYWMvUmVhbHRpbWVJbmNvbWluZ1ZpZGVvU291cmNlQ29jb2EubW0KaW5kZXgg ZjEwY2ZlMWYwMjliZjY2NGNjODIzMmQ2MTdhZmIxNjA0YmM5NzRiMC4uYWM1Nzc2MDY2ZmExNDY3 YTNkNzAzYTFhMGIwMmM2Nzg3MTBmMTJhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbWVkaWFzdHJlYW0vbWFjL1JlYWx0aW1lSW5jb21pbmdWaWRlb1NvdXJjZUNvY29hLm1t CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9SZWFsdGltZUlu Y29taW5nVmlkZW9Tb3VyY2VDb2NvYS5tbQpAQCAtMTMwLDcgKzEzMCw5IEBAIFJlZlB0cjxNZWRp YVNhbXBsZT4gUmVhbHRpbWVJbmNvbWluZ1ZpZGVvU291cmNlQ29jb2E6OnRvVmlkZW9GcmFtZShj b25zdCB3ZWJydGM6CiAKICAgICBpZiAoYXV0byogcHJvdmlkZXIgPSB2aWRlb0ZyYW1lQnVmZmVy UHJvdmlkZXIoZnJhbWUpKSB7CiAgICAgICAgIC8vIFRoZSBvbmx5IHN1cHBvcnRlZCBwcm92aWRl ciBpcyBWaWRlb0ZyYW1lLgotICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8VmlkZW9GcmFtZSo+ KHByb3ZpZGVyKTsKKyAgICAgICAgYXV0byogdmlkZW9GcmFtZSA9IHN0YXRpY19jYXN0PFZpZGVv RnJhbWUqPihwcm92aWRlcik7CisgICAgICAgIHZpZGVvRnJhbWUtPmluaXRpYWxpemVDaGFyYWN0 ZXJpc3RpY3MoTWVkaWFUaW1lIHsgZnJhbWUudGltZXN0YW1wX3VzKCksIDEwMDAwMDAgfSwgZmFs c2UsIHJvdGF0aW9uKTsKKyAgICAgICAgcmV0dXJuIHZpZGVvRnJhbWU7CiAgICAgfQogCiAgICAg Ly8gSW4gY2FzZSBvZiBpbiBtZW1vcnkgc2FtcGxlcywgd2UgaGF2ZSBub24gaW50ZXJsZWF2ZWQg WVVWIGRhdGEgd2hpbGUgQ1ZQaXhlbEJ1ZmZlcnMgcHJlZmVyIGludGVybGVhdmVkIFlVViBkYXRh LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwIGIvU291 cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCmluZGV4IDNlMTJlYzhmNjBkMTE1M2U3 NTJlMWI2Y2MzYTMyMjhkZmFhYTY0NzcuLjFhMGE4YjFiMzJkM2Y3YWQwNmVhNTg5YTAwNzBhYmVk MzMzODcxODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKQEAgLTU1MTAsNiAr NTUxMCw3IEBAIHZvaWQgSW50ZXJuYWxzOjpvYnNlcnZlTWVkaWFTdHJlYW1UcmFjayhNZWRpYVN0 cmVhbVRyYWNrJiB0cmFjaykKIHsKICAgICBzdG9wT2JzZXJ2aW5nUmVhbHRpbWVNZWRpYVNvdXJj ZSgpOwogCisgICAgbV90cmFja1ZpZGVvUm90YXRpb24gPSAtMTsKICAgICBtX3RyYWNrU291cmNl ID0gJnRyYWNrLnNvdXJjZSgpOwogICAgIG1fdHJhY2tTb3VyY2UtPmFkZE9ic2VydmVyKCp0aGlz KTsKICAgICBzd2l0Y2ggKG1fdHJhY2tTb3VyY2UtPnR5cGUoKSkgewpAQCAtNTUzMiwxMiArNTUz MywxOCBAQCB2b2lkIEludGVybmFsczo6Z3JhYk5leHRNZWRpYVN0cmVhbVRyYWNrRnJhbWUoVHJh Y2tGcmFtZVByb21pc2UmJiBwcm9taXNlKQogICAgIG1fbmV4dFRyYWNrRnJhbWVQcm9taXNlID0g bWFrZVVuaXF1ZTxUcmFja0ZyYW1lUHJvbWlzZT4oV1RGTW92ZShwcm9taXNlKSk7CiB9CiAKK3Zv aWQgSW50ZXJuYWxzOjptZWRpYVN0cmVhbVRyYWNrVmlkZW9GcmFtZVJvdGF0aW9uKERPTVByb21p c2VEZWZlcnJlZDxJRExTaG9ydD4mJiBwcm9taXNlKQoreworICAgIHByb21pc2UucmVzb2x2ZSht X3RyYWNrVmlkZW9Sb3RhdGlvbik7Cit9CisKIHZvaWQgSW50ZXJuYWxzOjp2aWRlb1NhbXBsZUF2 YWlsYWJsZShNZWRpYVNhbXBsZSYgc2FtcGxlLCBWaWRlb1NhbXBsZU1ldGFkYXRhKQogewogICAg IGNhbGxPbk1haW5UaHJlYWQoW3RoaXMsIHdlYWtUaGlzID0gV2Vha1B0ciB7ICp0aGlzIH0sIHNh bXBsZSA9IFJlZiB7IHNhbXBsZSB9XSB7CiAgICAgICAgIGlmICghd2Vha1RoaXMpCiAgICAgICAg ICAgICByZXR1cm47CiAgICAgICAgIG1fdHJhY2tWaWRlb1NhbXBsZUNvdW50Kys7CisgICAgICAg IG1fdHJhY2tWaWRlb1JvdGF0aW9uID0gc3RhdGljX2Nhc3Q8aW50PihzYW1wbGUtPnZpZGVvUm90 YXRpb24oKSk7CiAgICAgICAgIGlmICghbV9uZXh0VHJhY2tGcmFtZVByb21pc2UpCiAgICAgICAg ICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJu YWxzLmggYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCmluZGV4IGNlOTk4YzM0 N2U0NWMyZGYzMDliNTkwYmYyY2FhYTVlNzU2MGQ4NmQuLjQ0NDNlNTAzZGRmYjE0NjhiODc3MzIx YTAxZDJhZDg2NmIzZTgxNTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50 ZXJuYWxzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaApAQCAtODcz LDYgKzg3Myw3IEBAIHB1YmxpYzoKICAgICB2b2lkIG9ic2VydmVNZWRpYVN0cmVhbVRyYWNrKE1l ZGlhU3RyZWFtVHJhY2smKTsKICAgICB1c2luZyBUcmFja0ZyYW1lUHJvbWlzZSA9IERPTVByb21p c2VEZWZlcnJlZDxJRExJbnRlcmZhY2U8SW1hZ2VEYXRhPj47CiAgICAgdm9pZCBncmFiTmV4dE1l ZGlhU3RyZWFtVHJhY2tGcmFtZShUcmFja0ZyYW1lUHJvbWlzZSYmKTsKKyAgICB2b2lkIG1lZGlh U3RyZWFtVHJhY2tWaWRlb0ZyYW1lUm90YXRpb24oRE9NUHJvbWlzZURlZmVycmVkPElETFNob3J0 PiYmKTsKICAgICB2b2lkIGRlbGF5TWVkaWFTdHJlYW1UcmFja1NhbXBsZXMoTWVkaWFTdHJlYW1U cmFjayYsIGZsb2F0KTsKICAgICB2b2lkIHNldE1lZGlhU3RyZWFtVHJhY2tNdXRlZChNZWRpYVN0 cmVhbVRyYWNrJiwgYm9vbCk7CiAgICAgdm9pZCByZW1vdmVNZWRpYVN0cmVhbVRyYWNrKE1lZGlh U3RyZWFtJiwgTWVkaWFTdHJlYW1UcmFjayYpOwpAQCAtMTMwMSw2ICsxMzAyLDcgQEAgcHJpdmF0 ZToKICAgICB1bnNpZ25lZCBsb25nIG1fdHJhY2tBdWRpb1NhbXBsZUNvdW50IHsgMCB9OwogICAg IFJlZlB0cjxSZWFsdGltZU1lZGlhU291cmNlPiBtX3RyYWNrU291cmNlOwogICAgIHN0ZDo6dW5p cXVlX3B0cjxUcmFja0ZyYW1lUHJvbWlzZT4gbV9uZXh0VHJhY2tGcmFtZVByb21pc2U7CisgICAg aW50IG1fdHJhY2tWaWRlb1JvdGF0aW9uIHsgMCB9OwogI2VuZGlmCiAjaWYgRU5BQkxFKE1FRElB X1NFU1NJT04pCiAgICAgc3RkOjp1bmlxdWVfcHRyPEFydHdvcmtJbWFnZUxvYWRlcj4gbV9hcnR3 b3JrTG9hZGVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMu aWRsIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRsCmluZGV4IDQyOGYzYjMy YWI5NjIxZDE0YmI2NGM0ZDdkYmY1NGRkNmEzMjc0MDUuLjdkMWExY2ZkNzQ1ZjA4MjViNTQwODEw NTNkNjNlZTY3MWUwOTEzMzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50 ZXJuYWxzLmlkbAorKysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwKQEAg LTkxOCw2ICs5MTgsNyBAQCB0eXBlZGVmIChGZXRjaFJlcXVlc3Qgb3IgRmV0Y2hSZXNwb25zZSkg RmV0Y2hPYmplY3Q7CiAgICAgW0NvbmRpdGlvbmFsPU1FRElBX1NUUkVBTV0gdW5kZWZpbmVkIHNl dENhbWVyYU1lZGlhU3RyZWFtVHJhY2tPcmllbnRhdGlvbihNZWRpYVN0cmVhbVRyYWNrIHRyYWNr LCBzaG9ydCBvcmllbnRhdGlvbik7CiAgICAgW0NvbmRpdGlvbmFsPU1FRElBX1NUUkVBTV0gdW5k ZWZpbmVkIG9ic2VydmVNZWRpYVN0cmVhbVRyYWNrKE1lZGlhU3RyZWFtVHJhY2sgdHJhY2spOwog ICAgIFtDb25kaXRpb25hbD1NRURJQV9TVFJFQU1dIFByb21pc2U8SW1hZ2VEYXRhPiBncmFiTmV4 dE1lZGlhU3RyZWFtVHJhY2tGcmFtZSgpOworICAgIFtDb25kaXRpb25hbD1NRURJQV9TVFJFQU1d IFByb21pc2U8c2hvcnQ+IG1lZGlhU3RyZWFtVHJhY2tWaWRlb0ZyYW1lUm90YXRpb24oKTsKICAg ICBbQ29uZGl0aW9uYWw9TUVESUFfU1RSRUFNXSByZWFkb25seSBhdHRyaWJ1dGUgdW5zaWduZWQg bG9uZyB0cmFja0F1ZGlvU2FtcGxlQ291bnQ7CiAgICAgW0NvbmRpdGlvbmFsPU1FRElBX1NUUkVB TV0gcmVhZG9ubHkgYXR0cmlidXRlIHVuc2lnbmVkIGxvbmcgdHJhY2tWaWRlb1NhbXBsZUNvdW50 OwogICAgIFtDb25kaXRpb25hbD1NRURJQV9TVFJFQU1dIHVuZGVmaW5lZCBkZWxheU1lZGlhU3Ry ZWFtVHJhY2tTYW1wbGVzKE1lZGlhU3RyZWFtVHJhY2sgdHJhY2ssIGZsb2F0IGRlbGF5KTsKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpp bmRleCAxZjA5NjI4M2QwOTk2MmRjYWY4MjU1ZTRkOGY5YjVhZTY3NDlmZjczLi41YzY3MTk4NzE3 NmUxN2UyODk2NTQ1ZDIwMDAwOTllZWViYzI2MTU1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIw MjItMDMtMDggIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIFdl YlJUQyBkZWNvZGVkIGZyYW1lcyBhcmUgbm90IGNvcnJlY3RseSByb3RhdGVkIGluIGNhc2UgR1BV IFByb2Nlc3MgRE9NIHJlbmRlcmluZyBmbGFnIGlzIHNldCB0byB0cnVlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzc0NjgKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzg5ODA3ODc2PgorCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4K KworICAgICAgICAqIHdlYnJ0Yy92aWRlby1yb3RhdGlvbi5odG1sOgorICAgICAgICBPYnNlcnZl IGFjdHVhbCB2aWRlbyBmcmFtZSByb3RhdGlvbiB2YWx1ZS4KKwogMjAyMi0wMy0wOCAgSiBQYXNj b2UgIDxqX3Bhc2NvZUBhcHBsZS5jb20+CiAKICAgICAgICAgWyBpT1MgXSAyWCBodHRwL3dwdC93 ZWJhdXRobi9wdWJsaWMta2V5LWNyZWRlbnRpYWwtY3JlYXRlLWZhaWx1cmUtbG9jYWwgKGxheW91 dC10ZXN0cykgYXJlIGNvbnN0YW50IHRleHQgZmFpbHVyZXMKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL3dlYnJ0Yy92aWRlby1yb3RhdGlvbi5odG1sIGIvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVv LXJvdGF0aW9uLmh0bWwKaW5kZXggYmMyZDU3NDJjNDdlNjViNGJhN2IyZDgxY2ZlMjJiMmIyZDBi ZWRmYy4uMTVlOTI1Yjk2YjI3ZTMzYmVkNzRmMTMwMWM5ZmNkM2EwZDY5MjZjYiAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLXJvdGF0aW9uLmh0bWwKKysrIGIvTGF5b3V0VGVz dHMvd2VicnRjL3ZpZGVvLXJvdGF0aW9uLmh0bWwKQEAgLTUwLDYgKzUwLDI3IEBAIGZ1bmN0aW9u IGNoZWNrVmlkZW9CbGFjayhleHBlY3RlZCwgdmlkZW8sIGNhbnZhc0lkKQogICAgIH0pOwogfQog Cithc3luYyBmdW5jdGlvbiB3YWl0Rm9yVHJhY2tSb3RhdGlvbih0cmFjaywgYW5nbGUsIGNvdW50 ZXIpCit7CisgICAgaWYgKCF3aW5kb3cuaW50ZXJuYWxzKQorICAgICAgICByZXR1cm47CisKKyAg ICBpZiAoIWNvdW50ZXIpIHsKKyAgICAgICAgaW50ZXJuYWxzLm9ic2VydmVNZWRpYVN0cmVhbVRy YWNrKHRyYWNrKTsKKyAgICAgICAgY291bnRlciA9IDE7CisgICAgfQorCisgICAgYXdhaXQgbmV3 IFByb21pc2UocmVzb2x2ZSA9PiBzZXRUaW1lb3V0KHJlc29sdmUsIDUwKSk7CisgICAgY29uc3Qg dmFsdWUgPSBhd2FpdCBpbnRlcm5hbHMubWVkaWFTdHJlYW1UcmFja1ZpZGVvRnJhbWVSb3RhdGlv bigpCisgICAgaWYgKGFuZ2xlID09PSB2YWx1ZSkKKyAgICAgICAgcmV0dXJuOyAgICAKKworICAg IGlmICgrK2NvdW50ZXIgPiA1MCkKKyAgICAgICAgcmV0dXJuIFByb21pc2UucmVqZWN0KCJ3YWl0 Rm9yVHJhY2tSb3RhdGlvbiB0aW1lZCBvdXQgd2l0aCB2YWx1ZSAiICsgdmFsdWUgKyAiIHdoaWxl IGV4cGVjdGluZyAiICsgYW5nbGUpOworCisgICAgcmV0dXJuIHdhaXRGb3JUcmFja1JvdGF0aW9u KHRyYWNrLCBhbmdsZSwgY291bnRlcik7Cit9CisKIHZhciB0cmFjazsKIHByb21pc2VfdGVzdCgo dGVzdCkgPT4gewogICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKQEAgLTYyLDggKzgzLDYgQEAg cHJvbWlzZV90ZXN0KCh0ZXN0KSA9PiB7CiAKICAgICAgICAgICAgIGNyZWF0ZUNvbm5lY3Rpb25z KChmaXJzdENvbm5lY3Rpb24pID0+IHsKICAgICAgICAgICAgICAgICBmaXJzdENvbm5lY3Rpb24u YWRkVHJhY2sodHJhY2ssIGxvY2FsU3RyZWFtKTsKLSAgICAgICAgICAgICAgICBpZiAod2luZG93 LmludGVybmFscykKLSAgICAgICAgICAgICAgICAgICAgaW50ZXJuYWxzLmFwcGx5Um90YXRpb25G b3JPdXRnb2luZ1ZpZGVvU291cmNlcyhmaXJzdENvbm5lY3Rpb24pOwogICAgICAgICAgICAgfSwg KHNlY29uZENvbm5lY3Rpb24pID0+IHsKICAgICAgICAgICAgICAgICBzZWNvbmRDb25uZWN0aW9u Lm9udHJhY2sgPSAodHJhY2tFdmVudCkgPT4gewogICAgICAgICAgICAgICAgICAgICByZXNvbHZl KHRyYWNrRXZlbnQuc3RyZWFtc1swXSk7CkBAIC05NSwyNiArMTE0LDMwIEBAIHByb21pc2VfdGVz dChhc3luYyAodGVzdCkgPT4gewogICAgIGF3YWl0IHdhaXRGb3JWaWRlb1NpemUobG9jYWxWaWRl bywgMjQwLCAzMjApOwogfSwgIlRyYWNrIGlzIGVuYWJsZWQgYW5kIHJvdGF0ZWQsIGxvY2FsIHZp ZGVvIHNob3VsZCBub3QgYmUgYmxhY2sgYW5kIHNob3VsZCBjaGFuZ2Ugc2l6ZSIpOwogCi1wcm9t aXNlX3Rlc3QoKHRlc3QpID0+IHsKK3Byb21pc2VfdGVzdChhc3luYyAodGVzdCkgPT4gewogICAg IGlmICh3aW5kb3cuaW50ZXJuYWxzKQogICAgICAgICB3aW5kb3cuaW50ZXJuYWxzLnNldENhbWVy YU1lZGlhU3RyZWFtVHJhY2tPcmllbnRhdGlvbih0cmFjaywgOTApOwogICAgIGlmICh3aW5kb3cu dGVzdFJ1bm5lcikKICAgICAgICAgdGVzdFJ1bm5lci5zZXRNb2NrQ2FtZXJhT3JpZW50YXRpb24o OTApOwogCi0gICAgcmV0dXJuIGNoZWNrVmlkZW9CbGFjayhmYWxzZSwgcmVtb3RlVmlkZW8sICJj YW52YXMyIikudGhlbigoKSA9PiB7CisgICAgYXdhaXQgY2hlY2tWaWRlb0JsYWNrKGZhbHNlLCBy ZW1vdGVWaWRlbywgImNhbnZhczIiKS50aGVuKCgpID0+IHsKICAgICAgICAgcmV0dXJuIHdhaXRG b3JWaWRlb1NpemUocmVtb3RlVmlkZW8sIDI0MCwgMzIwKTsKICAgICB9KTsKKworICAgIGF3YWl0 IHdhaXRGb3JUcmFja1JvdGF0aW9uKHJlbW90ZVZpZGVvLnNyY09iamVjdC5nZXRWaWRlb1RyYWNr cygpWzBdLCA5MCk7CiB9LCAiVHJhY2sgaXMgZW5hYmxlZCBhbmQgcm90YXRlZCwgcmVtb3RlIHZp ZGVvIHNob3VsZCBub3QgYmUgYmxhY2sgYW5kIHNob3VsZCBjaGFuZ2Ugc2l6ZSIpOwogCi1wcm9t aXNlX3Rlc3QoKHRlc3QpID0+IHsKK3Byb21pc2VfdGVzdChhc3luYyAodGVzdCkgPT4gewogICAg IGlmICh3aW5kb3cuaW50ZXJuYWxzKQogICAgICAgICB3aW5kb3cuaW50ZXJuYWxzLnNldENhbWVy YU1lZGlhU3RyZWFtVHJhY2tPcmllbnRhdGlvbih0cmFjaywgMTgwKTsKICAgICBpZiAod2luZG93 LnRlc3RSdW5uZXIpCiAgICAgICAgIHRlc3RSdW5uZXIuc2V0TW9ja0NhbWVyYU9yaWVudGF0aW9u KDE4MCk7CiAKLSAgICByZXR1cm4gY2hlY2tWaWRlb0JsYWNrKGZhbHNlLCByZW1vdGVWaWRlbywg ImNhbnZhczMiKS50aGVuKCgpID0+IHsKKyAgICBhd2FpdCBjaGVja1ZpZGVvQmxhY2soZmFsc2Us IHJlbW90ZVZpZGVvLCAiY2FudmFzMyIpLnRoZW4oKCkgPT4gewogICAgICAgICByZXR1cm4gd2Fp dEZvclZpZGVvU2l6ZShyZW1vdGVWaWRlbywgMzIwLCAyNDApOwogICAgIH0pOworCisgICAgYXdh aXQgd2FpdEZvclRyYWNrUm90YXRpb24ocmVtb3RlVmlkZW8uc3JjT2JqZWN0LmdldFZpZGVvVHJh Y2tzKClbMF0sIDE4MCk7CiB9LCAiVHJhY2sgaXMgZW5hYmxlZCBhbmQgcm90YXRlZCBhZ2Fpbiwg dmlkZW8gc2hvdWxkIG5vdCBiZSBibGFjayBhbmQgc2hvdWxkIGNoYW5nZSBzaXplIik7CiAgICAg ICAgIDwvc2NyaXB0PgogICAgIDwvYm9keT4K