213126 2020-06-12 07:50:33 -0700 Simplify MediaRecorderPrivateWriterCocoa threading logic 2020-06-15 02:20:24 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf eric.carlson ews-watchlist glenn jer.noble philipj sergio webkit-bug-importer youennf oldest_to_newest 1661943 0 youennf 2020-06-12 07:50:33 -0700 Simplify MediaRecorderPrivateWriterCocoa threading logic 1661948 1 401729 youennf 2020-06-12 08:18:17 -0700 Created attachment 401729 Patch 1662019 2 401729 eric.carlson 2020-06-12 10:29:27 -0700 Comment on attachment 401729 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=401729&action=review > Source/WebCore/ChangeLog:12 > + In that case, when stopping recording, the samples will be pushed and we will start the writer.e s/writer.e/writer/ 1662574 3 401886 youennf 2020-06-15 01:28:08 -0700 Created attachment 401886 Patch for landing 1662592 4 ews-feeder 2020-06-15 02:19:35 -0700 Committed r263026: <https://trac.webkit.org/changeset/263026> All reviewed patches have been landed. Closing bug and clearing flags on attachment 401886. 1662594 5 webkit-bug-importer 2020-06-15 02:20:24 -0700 <rdar://problem/64355374> 401729 2020-06-12 08:18:17 -0700 2020-06-15 01:28:04 -0700 Patch bug-213126-20200612171815.patch text/plain 13836 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyOTM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDI4NGMxNGE3NzAxMWI0 ODA3YjYyMmQ5OWYzYjAxZDEzNGM4OWJjYS4uY2ZiZDkwOGNkYmQxNmViMmVjMjk3YWU2YTI3ZTQ2 NjJkZTk1OTQ0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIwLTA2LTEyICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBTaW1wbGlmeSBNZWRpYVJl Y29yZGVyUHJpdmF0ZVdyaXRlckNvY29hIHRocmVhZGluZyBsb2dpYworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzMTI2CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWx3YXlzIGhvcCB0byB0aGUgbWFpbiB0 aHJlYWQgd2hlbiByZWNlaXZpbmcgY29tcHJlc3NlZCBzYW1wbGVzLgorICAgICAgICBUaGlzIG1h a2VzIHRoZSB0aHJlYWRpbmcgbW9kZWwgc2ltcGxlciBhbmQgcHVzaGluZyBlbnF1ZXVlZCBzYW1w bGVzIGluIHRoZSB3cml0ZXIgaXMgbm90IHZlcnkgcGVyZm9ybWFuY2Ugc2Vuc2l0aXZlLgorCisg ICAgICAgIEFkZCBoYW5kbGluZyBvZiB0aGUgc3BlY2lhbCBjYXNlIG9mIHZpZGVvIHNhbXBsZXMg YmVpbmcgcHVzaGVkIGJ1dCBubyBjb21wcmVzc2VkIHNhbXBsZSBpcyB5ZXQgcHJvZHVjZWQuCisg ICAgICAgIEluIHRoYXQgY2FzZSwgd2hlbiBzdG9wcGluZyByZWNvcmRpbmcsIHRoZSBzYW1wbGVz IHdpbGwgYmUgcHVzaGVkIGFuZCB3ZSB3aWxsIHN0YXJ0IHRoZSB3cml0ZXIuZQorCisgICAgICAg IE1pbm9yIHJlZmFjdG9yaW5nIHRvIHJlbW92ZSBzb21lIHVubmVjZXNzYXJ5IGNoZWNrcyBhbmQg bWFrZSBzdXJlIHNvbWUgb2YgdGhlIG1lbWJlciBmaWVsZHMgZ2V0cyBpbml0aWFsaXplZCBpbiB0 aGVpciBkZWNsYXJhdGlvbi4KKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKwor ICAgICAgICAqIHBsYXRmb3JtL21lZGlhcmVjb3JkZXIvY29jb2EvQXVkaW9TYW1wbGVCdWZmZXJD b21wcmVzc29yLmg6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFyZWNvcmRlci9jb2NvYS9BdWRp b1NhbXBsZUJ1ZmZlckNvbXByZXNzb3IubW06CisgICAgICAgIChXZWJDb3JlOjpBdWRpb1NhbXBs ZUJ1ZmZlckNvbXByZXNzb3I6On5BdWRpb1NhbXBsZUJ1ZmZlckNvbXByZXNzb3IpOgorICAgICAg ICAqIHBsYXRmb3JtL21lZGlhcmVjb3JkZXIvY29jb2EvTWVkaWFSZWNvcmRlclByaXZhdGVXcml0 ZXJDb2NvYS5oOgorICAgICAgICAqIHBsYXRmb3JtL21lZGlhcmVjb3JkZXIvY29jb2EvTWVkaWFS ZWNvcmRlclByaXZhdGVXcml0ZXJDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUmVj b3JkZXJQcml2YXRlV3JpdGVyOjpjb21wcmVzc2VkVmlkZW9PdXRwdXRCdWZmZXJDYWxsYmFjayk6 CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVJlY29yZGVyUHJpdmF0ZVdyaXRlcjo6Y29tcHJlc3Nl ZEF1ZGlvT3V0cHV0QnVmZmVyQ2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFSZWNv cmRlclByaXZhdGVXcml0ZXI6OnByb2Nlc3NOZXdDb21wcmVzc2VkVmlkZW9TYW1wbGVCdWZmZXJz KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUmVjb3JkZXJQcml2YXRlV3JpdGVyOjpwcm9jZXNz TmV3Q29tcHJlc3NlZEF1ZGlvU2FtcGxlQnVmZmVycyk6CisgICAgICAgIChXZWJDb3JlOjpNZWRp YVJlY29yZGVyUHJpdmF0ZVdyaXRlcjo6c3RvcFJlY29yZGluZyk6CisgICAgICAgICogcGxhdGZv cm0vbWVkaWFyZWNvcmRlci9jb2NvYS9WaWRlb1NhbXBsZUJ1ZmZlckNvbXByZXNzb3IuaDoKKyAg ICAgICAgKiBwbGF0Zm9ybS9tZWRpYXJlY29yZGVyL2NvY29hL1ZpZGVvU2FtcGxlQnVmZmVyQ29t cHJlc3Nvci5tbToKKyAgICAgICAgKFdlYkNvcmU6OlZpZGVvU2FtcGxlQnVmZmVyQ29tcHJlc3Nv cjo6flZpZGVvU2FtcGxlQnVmZmVyQ29tcHJlc3Nvcik6CisKIDIwMjAtMDYtMTIgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBhIHF1aXJrIHRvIGFsbG93 IHN0YXJ0aW5nIEF1ZGlvQ29udGV4dCBpZiBkb2N1bWVudCB3YXMgaW50ZXJhY3RlZApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFyZWNvcmRlci9jb2NvYS9BdWRpb1Nh bXBsZUJ1ZmZlckNvbXByZXNzb3IuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhcmVj b3JkZXIvY29jb2EvQXVkaW9TYW1wbGVCdWZmZXJDb21wcmVzc29yLmgKaW5kZXggMTQ3YmY4MWUx ZDQ1NmM3MGMyZDk0NGY3MDQ1YThlMTZlMDU5YmNmOS4uMDM1Y2NhMzJjNTUwYWEyNTc1NjI1ZTQ5 OTIxNDU3OWEzZGIxZDczNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVk aWFyZWNvcmRlci9jb2NvYS9BdWRpb1NhbXBsZUJ1ZmZlckNvbXByZXNzb3IuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXJlY29yZGVyL2NvY29hL0F1ZGlvU2FtcGxlQnVmZmVy Q29tcHJlc3Nvci5oCkBAIC01OSwxMCArNTksMTEgQEAgcHJpdmF0ZToKICAgICB2b2lkIHByb2Nl c3NTYW1wbGVCdWZmZXJzVW50aWxMb3dXYXRlclRpbWUoQ01UaW1lKTsKICAgICBPU1N0YXR1cyBw cm92aWRlU291cmNlRGF0YU51bU91dHB1dFBhY2tldHMoVUludDMyKiwgQXVkaW9CdWZmZXJMaXN0 KiwgQXVkaW9TdHJlYW1QYWNrZXREZXNjcmlwdGlvbioqKTsKIAotICAgIFJldGFpblB0cjxDTUJ1 ZmZlclF1ZXVlUmVmPiBtX291dHB1dEJ1ZmZlclF1ZXVlOwotICAgIFJldGFpblB0cjxDTUJ1ZmZl clF1ZXVlUmVmPiBtX2lucHV0QnVmZmVyUXVldWU7CiAgICAgZGlzcGF0Y2hfcXVldWVfdCBtX3Nl cmlhbERpc3BhdGNoUXVldWU7CiAgICAgQ01UaW1lIG1fbG93V2F0ZXJUaW1lOworCisgICAgUmV0 YWluUHRyPENNQnVmZmVyUXVldWVSZWY+IG1fb3V0cHV0QnVmZmVyUXVldWU7CisgICAgUmV0YWlu UHRyPENNQnVmZmVyUXVldWVSZWY+IG1faW5wdXRCdWZmZXJRdWV1ZTsKICAgICBib29sIG1faXNF bmNvZGluZyB7IGZhbHNlIH07CiAKICAgICBSZXRhaW5QdHI8QXVkaW9Db252ZXJ0ZXJSZWY+IG1f Y29udmVydGVyOwpAQCAtNzAsNyArNzEsNyBAQCBwcml2YXRlOgogICAgIEF1ZGlvU3RyZWFtQmFz aWNEZXNjcmlwdGlvbiBtX2Rlc3RpbmF0aW9uRm9ybWF0OwogICAgIFJldGFpblB0cjxDTUZvcm1h dERlc2NyaXB0aW9uUmVmPiBtX2Rlc3RpbmF0aW9uRm9ybWF0RGVzY3JpcHRpb247CiAgICAgUmV0 YWluUHRyPE5TTnVtYmVyPiBtX2dkckNvdW50TnVtOwotICAgIFVJbnQzMiBtX21heE91dHB1dFBh Y2tldFNpemU7CisgICAgVUludDMyIG1fbWF4T3V0cHV0UGFja2V0U2l6ZSB7IDAgfTsKICAgICBW ZWN0b3I8QXVkaW9TdHJlYW1QYWNrZXREZXNjcmlwdGlvbj4gbV9kZXN0aW5hdGlvblBhY2tldERl c2NyaXB0aW9uczsKIAogICAgIENNVGltZSBtX2N1cnJlbnROYXRpdmVQcmVzZW50YXRpb25UaW1l U3RhbXA7CkBAIC04MSw5ICs4Miw5IEBAIHByaXZhdGU6CiAgICAgVmVjdG9yPGNoYXI+IG1fZGVz dGluYXRpb25CdWZmZXI7CiAKICAgICBSZXRhaW5QdHI8Q01CbG9ja0J1ZmZlclJlZj4gbV9zYW1w bGVCbG9ja0J1ZmZlcjsKLSAgICBzaXplX3QgbV9zYW1wbGVCbG9ja0J1ZmZlclNpemU7Ci0gICAg c2l6ZV90IG1fY3VycmVudE9mZnNldEluU2FtcGxlQmxvY2tCdWZmZXI7Ci0gICAgQXVkaW9Gb3Jt YXRJRCBtX291dHB1dENvZGVjVHlwZTsKKyAgICBzaXplX3QgbV9zYW1wbGVCbG9ja0J1ZmZlclNp emUgeyAwIH07CisgICAgc2l6ZV90IG1fY3VycmVudE9mZnNldEluU2FtcGxlQmxvY2tCdWZmZXIg eyAwIH07CisgICAgQXVkaW9Gb3JtYXRJRCBtX291dHB1dENvZGVjVHlwZSB7IGtBdWRpb0Zvcm1h dE1QRUc0QUFDIH07CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9tZWRpYXJlY29yZGVyL2NvY29hL0F1ZGlvU2FtcGxlQnVmZmVyQ29tcHJlc3Nvci5tbSBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhcmVjb3JkZXIvY29jb2EvQXVkaW9TYW1wbGVCdWZm ZXJDb21wcmVzc29yLm1tCmluZGV4IDlkOTYzODQwZGMzZTViYWQ1Yzk2MDczNGYzMjY4OWYzOTUy NTQxZGQuLmM5YmZmNjQxZDJjMjZmZWFhZmExZGNjN2JjM2FjMjE2OWRmNmU1YTUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhcmVjb3JkZXIvY29jb2EvQXVkaW9TYW1w bGVCdWZmZXJDb21wcmVzc29yLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlh cmVjb3JkZXIvY29jb2EvQXVkaW9TYW1wbGVCdWZmZXJDb21wcmVzc29yLm1tCkBAIC01MiwxNCAr NTIsMTIgQEAgc3RkOjp1bmlxdWVfcHRyPEF1ZGlvU2FtcGxlQnVmZmVyQ29tcHJlc3Nvcj4gQXVk aW9TYW1wbGVCdWZmZXJDb21wcmVzc29yOjpjcmVhdGUKIEF1ZGlvU2FtcGxlQnVmZmVyQ29tcHJl c3Nvcjo6QXVkaW9TYW1wbGVCdWZmZXJDb21wcmVzc29yKCkKICAgICA6IG1fc2VyaWFsRGlzcGF0 Y2hRdWV1ZSB7IGRpc3BhdGNoX3F1ZXVlX2NyZWF0ZSgiY29tLmFwcGxlLkF1ZGlvU2FtcGxlQnVm ZmVyQ29tcHJlc3NvciIsIERJU1BBVENIX1FVRVVFX1NFUklBTCkgfQogICAgICwgbV9sb3dXYXRl clRpbWUgeyBDTVRpbWVNYWtlV2l0aFNlY29uZHMoTE9XX1dBVEVSX1RJTUVfSU5fU0VDT05EUywg MTAwMCkgfQotICAgICwgbV9vdXRwdXRDb2RlY1R5cGUgeyBrQXVkaW9Gb3JtYXRNUEVHNEFBQyB9 CiB7CiB9CiAKIEF1ZGlvU2FtcGxlQnVmZmVyQ29tcHJlc3Nvcjo6fkF1ZGlvU2FtcGxlQnVmZmVy Q29tcHJlc3NvcigpCiB7Ci0gICAgaWYgKG1fc2VyaWFsRGlzcGF0Y2hRdWV1ZSkKLSAgICAgICAg ZGlzcGF0Y2hfcmVsZWFzZShtX3NlcmlhbERpc3BhdGNoUXVldWUpOworICAgIGRpc3BhdGNoX3Jl bGVhc2UobV9zZXJpYWxEaXNwYXRjaFF1ZXVlKTsKIH0KIAogYm9vbCBBdWRpb1NhbXBsZUJ1ZmZl ckNvbXByZXNzb3I6OmluaXRpYWxpemUoQ01CdWZmZXJRdWV1ZVRyaWdnZXJDYWxsYmFjayBjYWxs YmFjaywgdm9pZCogY2FsbGJhY2tPYmplY3QpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9tZWRpYXJlY29yZGVyL2NvY29hL01lZGlhUmVjb3JkZXJQcml2YXRlV3JpdGVyQ29j b2EuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhcmVjb3JkZXIvY29jb2EvTWVkaWFS ZWNvcmRlclByaXZhdGVXcml0ZXJDb2NvYS5oCmluZGV4IDQ4ZTkwZGNlMjFiMWNjZjc5M2IxMmFh ZDIxOGQ2MDhlMmUxM2M1ZjYuLmI3YTlkNzEyMzg3ZDcwNDBhZmE1YjhjZWE2MTFhNGRjZTQzNDY2 YTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhcmVjb3JkZXIvY29j b2EvTWVkaWFSZWNvcmRlclByaXZhdGVXcml0ZXJDb2NvYS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21lZGlhcmVjb3JkZXIvY29jb2EvTWVkaWFSZWNvcmRlclByaXZhdGVXcml0ZXJD b2NvYS5oCkBAIC05NSwxOCArOTUsMTggQEAgcHJpdmF0ZToKICAgICB2b2lkIGZsdXNoQ29tcHJl c3NlZFNhbXBsZUJ1ZmZlcnMoQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsKICAgICB2b2lk IGFwcGVuZEVuZE9mVmlkZW9TYW1wbGVEdXJhdGlvbklmTmVlZGVkKENvbXBsZXRpb25IYW5kbGVy PHZvaWQoKT4mJik7CiAKKyAgICBib29sIG1faGFzQXVkaW8geyBmYWxzZSB9OworICAgIGJvb2wg bV9oYXNWaWRlbyB7IGZhbHNlIH07CisKICAgICBib29sIG1faGFzU3RhcnRlZFdyaXRpbmcgeyBm YWxzZSB9OwogICAgIGJvb2wgbV9pc1N0b3BwZWQgeyBmYWxzZSB9OworICAgIGJvb2wgbV9pc1N0 b3BwaW5nIHsgZmFsc2UgfTsKIAogICAgIFJldGFpblB0cjxBVkFzc2V0V3JpdGVyPiBtX3dyaXRl cjsKIAotICAgIGJvb2wgbV9pc1N0b3BwaW5nIHsgZmFsc2UgfTsKICAgICBSZWZQdHI8U2hhcmVk QnVmZmVyPiBtX2RhdGE7CiAgICAgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChSZWZQdHI8U2hhcmVk QnVmZmVyPiYmKT4gbV9mZXRjaERhdGFDb21wbGV0aW9uSGFuZGxlcjsKIAotICAgIGJvb2wgbV9o YXNBdWRpbzsKLSAgICBib29sIG1faGFzVmlkZW87Ci0KICAgICBSZXRhaW5QdHI8Q01Gb3JtYXRE ZXNjcmlwdGlvblJlZj4gbV9hdWRpb0Zvcm1hdERlc2NyaXB0aW9uOwogICAgIHN0ZDo6dW5pcXVl X3B0cjxBdWRpb1NhbXBsZUJ1ZmZlckNvbXByZXNzb3I+IG1fYXVkaW9Db21wcmVzc29yOwogICAg IFJldGFpblB0cjxBVkFzc2V0V3JpdGVySW5wdXQ+IG1fYXVkaW9Bc3NldFdyaXRlcklucHV0Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFyZWNvcmRlci9jb2NvYS9N ZWRpYVJlY29yZGVyUHJpdmF0ZVdyaXRlckNvY29hLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWVkaWFyZWNvcmRlci9jb2NvYS9NZWRpYVJlY29yZGVyUHJpdmF0ZVdyaXRlckNvY29hLm1t CmluZGV4IDc0YWQ0MzhjYzVhNGRlMTE1MzYxZTVjYjg0ZmEzMmZkMjI0NGYyYWIuLjliNWJiOGNm NmE0NmEyY2QwMGYyMmFlZDY2ODY0MTExZTJiM2FkNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21lZGlhcmVjb3JkZXIvY29jb2EvTWVkaWFSZWNvcmRlclByaXZhdGVXcml0 ZXJDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXJlY29yZGVyL2Nv Y29hL01lZGlhUmVjb3JkZXJQcml2YXRlV3JpdGVyQ29jb2EubW0KQEAgLTEzNSwxNCArMTM1LDE4 IEBAIFJlZlB0cjxNZWRpYVJlY29yZGVyUHJpdmF0ZVdyaXRlcj4gTWVkaWFSZWNvcmRlclByaXZh dGVXcml0ZXI6OmNyZWF0ZShjb25zdCBNZWRpCiAKIHZvaWQgTWVkaWFSZWNvcmRlclByaXZhdGVX cml0ZXI6OmNvbXByZXNzZWRWaWRlb091dHB1dEJ1ZmZlckNhbGxiYWNrKHZvaWQgKm1lZGlhUmVj b3JkZXJQcml2YXRlV3JpdGVyLCBDTUJ1ZmZlclF1ZXVlVHJpZ2dlclRva2VuKQogewotICAgIGF1 dG8gKndyaXRlciA9IHN0YXRpY19jYXN0PE1lZGlhUmVjb3JkZXJQcml2YXRlV3JpdGVyKj4obWVk aWFSZWNvcmRlclByaXZhdGVXcml0ZXIpOwotICAgIHdyaXRlci0+cHJvY2Vzc05ld0NvbXByZXNz ZWRWaWRlb1NhbXBsZUJ1ZmZlcnMoKTsKKyAgICBjYWxsT25NYWluVGhyZWFkKFt3ZWFrV3JpdGVy ID0gbWFrZVdlYWtQdHIoc3RhdGljX2Nhc3Q8TWVkaWFSZWNvcmRlclByaXZhdGVXcml0ZXIqPiht ZWRpYVJlY29yZGVyUHJpdmF0ZVdyaXRlcikpXSB7CisgICAgICAgIGlmICh3ZWFrV3JpdGVyKQor ICAgICAgICAgICAgd2Vha1dyaXRlci0+cHJvY2Vzc05ld0NvbXByZXNzZWRWaWRlb1NhbXBsZUJ1 ZmZlcnMoKTsKKyAgICB9KTsKIH0KIAogdm9pZCBNZWRpYVJlY29yZGVyUHJpdmF0ZVdyaXRlcjo6 Y29tcHJlc3NlZEF1ZGlvT3V0cHV0QnVmZmVyQ2FsbGJhY2sodm9pZCAqbWVkaWFSZWNvcmRlclBy aXZhdGVXcml0ZXIsIENNQnVmZmVyUXVldWVUcmlnZ2VyVG9rZW4pCiB7Ci0gICAgYXV0byAqd3Jp dGVyID0gc3RhdGljX2Nhc3Q8TWVkaWFSZWNvcmRlclByaXZhdGVXcml0ZXIqPihtZWRpYVJlY29y ZGVyUHJpdmF0ZVdyaXRlcik7Ci0gICAgd3JpdGVyLT5wcm9jZXNzTmV3Q29tcHJlc3NlZEF1ZGlv U2FtcGxlQnVmZmVycygpOworICAgIGNhbGxPbk1haW5UaHJlYWQoW3dlYWtXcml0ZXIgPSBtYWtl V2Vha1B0cihzdGF0aWNfY2FzdDxNZWRpYVJlY29yZGVyUHJpdmF0ZVdyaXRlcio+KG1lZGlhUmVj b3JkZXJQcml2YXRlV3JpdGVyKSldIHsKKyAgICAgICAgaWYgKHdlYWtXcml0ZXIpCisgICAgICAg ICAgICB3ZWFrV3JpdGVyLT5wcm9jZXNzTmV3Q29tcHJlc3NlZEF1ZGlvU2FtcGxlQnVmZmVycygp OworICAgIH0pOwogfQogCiBNZWRpYVJlY29yZGVyUHJpdmF0ZVdyaXRlcjo6TWVkaWFSZWNvcmRl clByaXZhdGVXcml0ZXIoYm9vbCBoYXNBdWRpbywgYm9vbCBoYXNWaWRlbykKQEAgLTE4OCwxNiAr MTkyLDEzIEBAIHZvaWQgTWVkaWFSZWNvcmRlclByaXZhdGVXcml0ZXI6OnByb2Nlc3NOZXdDb21w cmVzc2VkVmlkZW9TYW1wbGVCdWZmZXJzKCkKICAgICBBU1NFUlQobV9oYXNWaWRlbyk7CiAgICAg aWYgKCFtX3ZpZGVvRm9ybWF0RGVzY3JpcHRpb24pIHsKICAgICAgICAgbV92aWRlb0Zvcm1hdERl c2NyaXB0aW9uID0gQ01TYW1wbGVCdWZmZXJHZXRGb3JtYXREZXNjcmlwdGlvbihtX3ZpZGVvQ29t cHJlc3Nvci0+Z2V0T3V0cHV0U2FtcGxlQnVmZmVyKCkpOwotICAgICAgICBjYWxsT25NYWluVGhy ZWFkKFt3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKHRoaXMpLCB0aGlzXSB7Ci0gICAgICAgICAgICBp ZiAoIXdlYWtUaGlzKQotICAgICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICAgICAgaWYg KG1faGFzQXVkaW8gJiYgIW1fYXVkaW9Gb3JtYXREZXNjcmlwdGlvbikKLSAgICAgICAgICAgICAg ICByZXR1cm47CisgICAgICAgIGlmIChtX2hhc0F1ZGlvICYmICFtX2F1ZGlvRm9ybWF0RGVzY3Jp cHRpb24pCisgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgICAgIHN0YXJ0QXNzZXRXcml0 ZXIoKTsKLSAgICAgICAgfSk7CisgICAgICAgIHN0YXJ0QXNzZXRXcml0ZXIoKTsKICAgICB9CisK ICAgICBpZiAoIW1faGFzU3RhcnRlZFdyaXRpbmcpCiAgICAgICAgIHJldHVybjsKICAgICBhcHBl bmRDb21wcmVzc2VkU2FtcGxlQnVmZmVycygpOwpAQCAtMjA4LDE2ICsyMDksMTIgQEAgdm9pZCBN ZWRpYVJlY29yZGVyUHJpdmF0ZVdyaXRlcjo6cHJvY2Vzc05ld0NvbXByZXNzZWRBdWRpb1NhbXBs ZUJ1ZmZlcnMoKQogICAgIEFTU0VSVChtX2hhc0F1ZGlvKTsKICAgICBpZiAoIW1fYXVkaW9Gb3Jt YXREZXNjcmlwdGlvbikgewogICAgICAgICBtX2F1ZGlvRm9ybWF0RGVzY3JpcHRpb24gPSBDTVNh bXBsZUJ1ZmZlckdldEZvcm1hdERlc2NyaXB0aW9uKG1fYXVkaW9Db21wcmVzc29yLT5nZXRPdXRw dXRTYW1wbGVCdWZmZXIoKSk7Ci0gICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW3dlYWtUaGlzID0g bWFrZVdlYWtQdHIodGhpcyksIHRoaXNdIHsKLSAgICAgICAgICAgIGlmICghd2Vha1RoaXMpCi0g ICAgICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgICAgICBpZiAobV9oYXNWaWRlbyAmJiAh bV92aWRlb0Zvcm1hdERlc2NyaXB0aW9uKQotICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgaWYgKG1faGFzVmlkZW8gJiYgIW1fdmlkZW9Gb3JtYXREZXNjcmlwdGlvbikKKyAgICAgICAg ICAgIHJldHVybjsKIAotICAgICAgICAgICAgc3RhcnRBc3NldFdyaXRlcigpOwotICAgICAgICB9 KTsKKyAgICAgICAgc3RhcnRBc3NldFdyaXRlcigpOwogICAgIH0KKwogICAgIGlmICghbV9oYXNT dGFydGVkV3JpdGluZykKICAgICAgICAgcmV0dXJuOwogICAgIGFwcGVuZENvbXByZXNzZWRTYW1w bGVCdWZmZXJzKCk7CkBAIC00MzUsMzUgKzQzMiw0MyBAQCB2b2lkIE1lZGlhUmVjb3JkZXJQcml2 YXRlV3JpdGVyOjpzdG9wUmVjb3JkaW5nKCkKICAgICBpZiAobV9hdWRpb0NvbXByZXNzb3IpCiAg ICAgICAgIG1fYXVkaW9Db21wcmVzc29yLT5maW5pc2goKTsKIAotICAgIGlmICghbV9oYXNTdGFy dGVkV3JpdGluZykKLSAgICAgICAgcmV0dXJuOwotICAgIEFTU0VSVChbbV93cml0ZXIgc3RhdHVz XSA9PSBBVkFzc2V0V3JpdGVyU3RhdHVzV3JpdGluZyk7Ci0KICAgICBtX2lzU3RvcHBpbmcgPSB0 cnVlOwotCi0gICAgZmx1c2hDb21wcmVzc2VkU2FtcGxlQnVmZmVycyhbdGhpcywgd2Vha1RoaXMg PSBtYWtlV2Vha1B0cih0aGlzKV0oKSBtdXRhYmxlIHsKLSAgICAgICAgaWYgKCF3ZWFrVGhpcykK KyAgICAvLyBXZSBob3AgdG8gdGhlIG1haW4gdGhyZWFkIHNpbmNlIGZpbmlzaGluZyB0aGUgdmlk ZW8gY29tcHJlc3NvciBtaWdodCB0cmlnZ2VyIHN0YXJ0aW5nIHRoZSB3cml0ZXIgYXN5bmNocm9u b3VzbHkuCisgICAgY2FsbE9uTWFpblRocmVhZChbdGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vha1B0 cih0aGlzKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgYXV0byB3aGVuRmluaXNoZWQgPSBbdGhpc10g eworICAgICAgICAgICAgbV9pc1N0b3BwaW5nID0gZmFsc2U7CisgICAgICAgICAgICBpZiAobV9m ZXRjaERhdGFDb21wbGV0aW9uSGFuZGxlcikgeworICAgICAgICAgICAgICAgIGF1dG8gYnVmZmVy ID0gV1RGTW92ZShtX2RhdGEpOworICAgICAgICAgICAgICAgIG1fZmV0Y2hEYXRhQ29tcGxldGlv bkhhbmRsZXIoV1RGTW92ZShidWZmZXIpKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAg bV9pc1N0b3BwZWQgPSBmYWxzZTsKKyAgICAgICAgICAgIG1faGFzU3RhcnRlZFdyaXRpbmcgPSBm YWxzZTsKKyAgICAgICAgICAgIGNsZWFyKCk7CisgICAgICAgIH07CisKKyAgICAgICAgaWYgKCFt X2hhc1N0YXJ0ZWRXcml0aW5nKSB7CisgICAgICAgICAgICB3aGVuRmluaXNoZWQoKTsKICAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgfQogCi0gICAgICAgIEFMTE9XX0RFUFJFQ0FURURfREVD TEFSQVRJT05TX0JFR0lOCi0gICAgICAgIFttX3dyaXRlciBmbHVzaF07Ci0gICAgICAgIEFMTE9X X0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAotICAgICAgICBbbV93cml0ZXIgZmluaXNoV3Jp dGluZ1dpdGhDb21wbGV0aW9uSGFuZGxlcjpbdGhpcywgd2Vha1RoaXMgPSBXVEZNb3ZlKHdlYWtU aGlzKV0oKSBtdXRhYmxlIHsKLSAgICAgICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW3RoaXMsIHdl YWtUaGlzID0gV1RGTW92ZSh3ZWFrVGhpcyldKCkgbXV0YWJsZSB7Ci0gICAgICAgICAgICAgICAg aWYgKCF3ZWFrVGhpcykKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgICAg ICAgICAgbV9pc1N0b3BwaW5nID0gZmFsc2U7Ci0gICAgICAgICAgICAgICAgaWYgKG1fZmV0Y2hE YXRhQ29tcGxldGlvbkhhbmRsZXIpIHsKLSAgICAgICAgICAgICAgICAgICAgYXV0byBidWZmZXIg PSBXVEZNb3ZlKG1fZGF0YSk7Ci0gICAgICAgICAgICAgICAgICAgIG1fZmV0Y2hEYXRhQ29tcGxl dGlvbkhhbmRsZXIoV1RGTW92ZShidWZmZXIpKTsKLSAgICAgICAgICAgICAgICB9Ci0KLSAgICAg ICAgICAgICAgICBtX2lzU3RvcHBlZCA9IGZhbHNlOwotICAgICAgICAgICAgICAgIG1faGFzU3Rh cnRlZFdyaXRpbmcgPSBmYWxzZTsKLSAgICAgICAgICAgICAgICBjbGVhcigpOwotICAgICAgICAg ICAgfSk7Ci0gICAgICAgIH1dOworICAgICAgICBBU1NFUlQoW21fd3JpdGVyIHN0YXR1c10gPT0g QVZBc3NldFdyaXRlclN0YXR1c1dyaXRpbmcpOworICAgICAgICBmbHVzaENvbXByZXNzZWRTYW1w bGVCdWZmZXJzKFt0aGlzLCB3ZWFrVGhpcyA9IFdURk1vdmUod2Vha1RoaXMpLCB3aGVuRmluaXNo ZWQgPSBXVEZNb3ZlKHdoZW5GaW5pc2hlZCldKCkgbXV0YWJsZSB7CisgICAgICAgICAgICBpZiAo IXdlYWtUaGlzKQorICAgICAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICAgICAgQUxMT1df REVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KKyAgICAgICAgICAgIFttX3dyaXRlciBmbHVz aF07CisgICAgICAgICAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKKworICAg ICAgICAgICAgW21fd3JpdGVyIGZpbmlzaFdyaXRpbmdXaXRoQ29tcGxldGlvbkhhbmRsZXI6W3dl YWtUaGlzID0gV1RGTW92ZSh3ZWFrVGhpcyksIHdoZW5GaW5pc2hlZCA9IFdURk1vdmUod2hlbkZp bmlzaGVkKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgICAgICAgICBjYWxsT25NYWluVGhyZWFkKFt3 ZWFrVGhpcyA9IFdURk1vdmUod2Vha1RoaXMpLCB3aGVuRmluaXNoZWQgPSBXVEZNb3ZlKHdoZW5G aW5pc2hlZCldKCkgbXV0YWJsZSB7CisgICAgICAgICAgICAgICAgICAgIGlmICghd2Vha1RoaXMp CisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgICAgIHdo ZW5GaW5pc2hlZCgpOworICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgfV07CisgICAg ICAgIH0pOwogICAgIH0pOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9tZWRpYXJlY29yZGVyL2NvY29hL1ZpZGVvU2FtcGxlQnVmZmVyQ29tcHJlc3Nvci5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFyZWNvcmRlci9jb2NvYS9WaWRlb1NhbXBsZUJ1ZmZl ckNvbXByZXNzb3IuaAppbmRleCA1ZTQyODkzNTIzNjBjYjE3ODAwZGQwNmU2YjViMTUzODc5NjJj NzllLi4wZWI2N2FlZjQ3Yjg1MTYzN2Q4ZmYwOTk1ZDliMzRkNDU3ZDVjZWY0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXJlY29yZGVyL2NvY29hL1ZpZGVvU2FtcGxl QnVmZmVyQ29tcHJlc3Nvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhcmVj b3JkZXIvY29jb2EvVmlkZW9TYW1wbGVCdWZmZXJDb21wcmVzc29yLmgKQEAgLTU2LDEyICs1Niwx MiBAQCBwcml2YXRlOgogICAgIHN0YXRpYyB2b2lkIHZpZGVvQ29tcHJlc3Npb25DYWxsYmFjayh2 b2lkICpyZWZDb24sIHZvaWQqLCBPU1N0YXR1cywgVlRFbmNvZGVJbmZvRmxhZ3MsIENNU2FtcGxl QnVmZmVyUmVmKTsKIAogICAgIGRpc3BhdGNoX3F1ZXVlX3QgbV9zZXJpYWxEaXNwYXRjaFF1ZXVl OworICAgIENNVmlkZW9Db2RlY1R5cGUgbV9vdXRwdXRDb2RlY1R5cGUgeyBrQ01WaWRlb0NvZGVj VHlwZV9IMjY0IH07CisKICAgICBSZXRhaW5QdHI8Q01CdWZmZXJRdWV1ZVJlZj4gbV9vdXRwdXRC dWZmZXJRdWV1ZTsKICAgICBSZXRhaW5QdHI8VlRDb21wcmVzc2lvblNlc3Npb25SZWY+IG1fdnRT ZXNzaW9uOwogCiAgICAgYm9vbCBtX2lzRW5jb2RpbmcgeyBmYWxzZSB9OwotCi0gICAgQ01WaWRl b0NvZGVjVHlwZSBtX291dHB1dENvZGVjVHlwZTsKICAgICBmbG9hdCBtX21heEtleUZyYW1lSW50 ZXJ2YWxEdXJhdGlvbiB7IDIuMCB9OwogICAgIHVuc2lnbmVkIG1fZXhwZWN0ZWRGcmFtZVJhdGUg eyAzMCB9OwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhcmVj b3JkZXIvY29jb2EvVmlkZW9TYW1wbGVCdWZmZXJDb21wcmVzc29yLm1tIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWVkaWFyZWNvcmRlci9jb2NvYS9WaWRlb1NhbXBsZUJ1ZmZlckNvbXByZXNz b3IubW0KaW5kZXggMjYxMTg0ZWE1Mzk3ODQyNWE4N2NkYTgyMzc5MzQwODk2MTI0N2Q3MC4uMTg1 YWQxMjgxMTU5Yzc3Y2RhNDIyMmU3YTkyMGRjYWNhMGNkMDg0OSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFyZWNvcmRlci9jb2NvYS9WaWRlb1NhbXBsZUJ1ZmZlckNv bXByZXNzb3IubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFyZWNvcmRlci9j b2NvYS9WaWRlb1NhbXBsZUJ1ZmZlckNvbXByZXNzb3IubW0KQEAgLTU1LDggKzU1LDcgQEAgVmlk ZW9TYW1wbGVCdWZmZXJDb21wcmVzc29yOjpWaWRlb1NhbXBsZUJ1ZmZlckNvbXByZXNzb3IoQ01W aWRlb0NvZGVjVHlwZSBvdXRwdXQKIAogVmlkZW9TYW1wbGVCdWZmZXJDb21wcmVzc29yOjp+Vmlk ZW9TYW1wbGVCdWZmZXJDb21wcmVzc29yKCkKIHsKLSAgICBpZiAobV9zZXJpYWxEaXNwYXRjaFF1 ZXVlKQotICAgICAgICBkaXNwYXRjaF9yZWxlYXNlKG1fc2VyaWFsRGlzcGF0Y2hRdWV1ZSk7Cisg ICAgZGlzcGF0Y2hfcmVsZWFzZShtX3NlcmlhbERpc3BhdGNoUXVldWUpOwogfQogCiBib29sIFZp ZGVvU2FtcGxlQnVmZmVyQ29tcHJlc3Nvcjo6aW5pdGlhbGl6ZShDTUJ1ZmZlclF1ZXVlVHJpZ2dl ckNhbGxiYWNrIGNhbGxiYWNrLCB2b2lkKiBjYWxsYmFja09iamVjdCkK 401886 2020-06-15 01:28:08 -0700 2020-06-15 02:19:35 -0700 Patch for landing bug-213126-20200615102806.patch text/plain 13839 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGNhYjUwMGUyNzA3ZjIz NzIyMTIxNmQzYjdiNWEzOGQ0Njk1MWM2Zi4uMTA0M2NkNjk3ZmRkNDAxYzI3ZGNhYTlkOGRkZTU3 MzE0OWIxYzQwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIwLTA2LTE1ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBTaW1wbGlmeSBNZWRpYVJl Y29yZGVyUHJpdmF0ZVdyaXRlckNvY29hIHRocmVhZGluZyBsb2dpYworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzMTI2CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgRXJpYyBDYXJsc29uLgorCisgICAgICAgIEFsd2F5cyBob3AgdG8gdGhlIG1haW4gdGhy ZWFkIHdoZW4gcmVjZWl2aW5nIGNvbXByZXNzZWQgc2FtcGxlcy4KKyAgICAgICAgVGhpcyBtYWtl cyB0aGUgdGhyZWFkaW5nIG1vZGVsIHNpbXBsZXIgYW5kIHB1c2hpbmcgZW5xdWV1ZWQgc2FtcGxl cyBpbiB0aGUgd3JpdGVyIGlzIG5vdCB2ZXJ5IHBlcmZvcm1hbmNlIHNlbnNpdGl2ZS4KKworICAg ICAgICBBZGQgaGFuZGxpbmcgb2YgdGhlIHNwZWNpYWwgY2FzZSBvZiB2aWRlbyBzYW1wbGVzIGJl aW5nIHB1c2hlZCBidXQgbm8gY29tcHJlc3NlZCBzYW1wbGUgaXMgeWV0IHByb2R1Y2VkLgorICAg ICAgICBJbiB0aGF0IGNhc2UsIHdoZW4gc3RvcHBpbmcgcmVjb3JkaW5nLCB0aGUgc2FtcGxlcyB3 aWxsIGJlIHB1c2hlZCBhbmQgd2Ugd2lsbCBzdGFydCB0aGUgd3JpdGVyLgorCisgICAgICAgIE1p bm9yIHJlZmFjdG9yaW5nIHRvIHJlbW92ZSBzb21lIHVubmVjZXNzYXJ5IGNoZWNrcyBhbmQgbWFr ZSBzdXJlIHNvbWUgb2YgdGhlIG1lbWJlciBmaWVsZHMgZ2V0cyBpbml0aWFsaXplZCBpbiB0aGVp ciBkZWNsYXJhdGlvbi4KKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAg ICAgICAqIHBsYXRmb3JtL21lZGlhcmVjb3JkZXIvY29jb2EvQXVkaW9TYW1wbGVCdWZmZXJDb21w cmVzc29yLmg6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFyZWNvcmRlci9jb2NvYS9BdWRpb1Nh bXBsZUJ1ZmZlckNvbXByZXNzb3IubW06CisgICAgICAgIChXZWJDb3JlOjpBdWRpb1NhbXBsZUJ1 ZmZlckNvbXByZXNzb3I6On5BdWRpb1NhbXBsZUJ1ZmZlckNvbXByZXNzb3IpOgorICAgICAgICAq IHBsYXRmb3JtL21lZGlhcmVjb3JkZXIvY29jb2EvTWVkaWFSZWNvcmRlclByaXZhdGVXcml0ZXJD b2NvYS5oOgorICAgICAgICAqIHBsYXRmb3JtL21lZGlhcmVjb3JkZXIvY29jb2EvTWVkaWFSZWNv cmRlclByaXZhdGVXcml0ZXJDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUmVjb3Jk ZXJQcml2YXRlV3JpdGVyOjpjb21wcmVzc2VkVmlkZW9PdXRwdXRCdWZmZXJDYWxsYmFjayk6Cisg ICAgICAgIChXZWJDb3JlOjpNZWRpYVJlY29yZGVyUHJpdmF0ZVdyaXRlcjo6Y29tcHJlc3NlZEF1 ZGlvT3V0cHV0QnVmZmVyQ2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFSZWNvcmRl clByaXZhdGVXcml0ZXI6OnByb2Nlc3NOZXdDb21wcmVzc2VkVmlkZW9TYW1wbGVCdWZmZXJzKToK KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUmVjb3JkZXJQcml2YXRlV3JpdGVyOjpwcm9jZXNzTmV3 Q29tcHJlc3NlZEF1ZGlvU2FtcGxlQnVmZmVycyk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVJl Y29yZGVyUHJpdmF0ZVdyaXRlcjo6c3RvcFJlY29yZGluZyk6CisgICAgICAgICogcGxhdGZvcm0v bWVkaWFyZWNvcmRlci9jb2NvYS9WaWRlb1NhbXBsZUJ1ZmZlckNvbXByZXNzb3IuaDoKKyAgICAg ICAgKiBwbGF0Zm9ybS9tZWRpYXJlY29yZGVyL2NvY29hL1ZpZGVvU2FtcGxlQnVmZmVyQ29tcHJl c3Nvci5tbToKKyAgICAgICAgKFdlYkNvcmU6OlZpZGVvU2FtcGxlQnVmZmVyQ29tcHJlc3Nvcjo6 flZpZGVvU2FtcGxlQnVmZmVyQ29tcHJlc3Nvcik6CisKIDIwMjAtMDYtMTUgIFlvdWVubiBGYWJs ZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIE1lZGlhUmVjb3JkZXIgc2hvdWxkIG5v dCBiZSBjb2xsZWN0YWJsZSB3aGVuIGZldGNoaW5nIGRhdGEgZnJvbSBpdHMgYmFja2VuZApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFyZWNvcmRlci9jb2NvYS9BdWRp b1NhbXBsZUJ1ZmZlckNvbXByZXNzb3IuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlh cmVjb3JkZXIvY29jb2EvQXVkaW9TYW1wbGVCdWZmZXJDb21wcmVzc29yLmgKaW5kZXggMTQ3YmY4 MWUxZDQ1NmM3MGMyZDk0NGY3MDQ1YThlMTZlMDU5YmNmOS4uMDM1Y2NhMzJjNTUwYWEyNTc1NjI1 ZTQ5OTIxNDU3OWEzZGIxZDczNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWVkaWFyZWNvcmRlci9jb2NvYS9BdWRpb1NhbXBsZUJ1ZmZlckNvbXByZXNzb3IuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXJlY29yZGVyL2NvY29hL0F1ZGlvU2FtcGxlQnVm ZmVyQ29tcHJlc3Nvci5oCkBAIC01OSwxMCArNTksMTEgQEAgcHJpdmF0ZToKICAgICB2b2lkIHBy b2Nlc3NTYW1wbGVCdWZmZXJzVW50aWxMb3dXYXRlclRpbWUoQ01UaW1lKTsKICAgICBPU1N0YXR1 cyBwcm92aWRlU291cmNlRGF0YU51bU91dHB1dFBhY2tldHMoVUludDMyKiwgQXVkaW9CdWZmZXJM aXN0KiwgQXVkaW9TdHJlYW1QYWNrZXREZXNjcmlwdGlvbioqKTsKIAotICAgIFJldGFpblB0cjxD TUJ1ZmZlclF1ZXVlUmVmPiBtX291dHB1dEJ1ZmZlclF1ZXVlOwotICAgIFJldGFpblB0cjxDTUJ1 ZmZlclF1ZXVlUmVmPiBtX2lucHV0QnVmZmVyUXVldWU7CiAgICAgZGlzcGF0Y2hfcXVldWVfdCBt X3NlcmlhbERpc3BhdGNoUXVldWU7CiAgICAgQ01UaW1lIG1fbG93V2F0ZXJUaW1lOworCisgICAg UmV0YWluUHRyPENNQnVmZmVyUXVldWVSZWY+IG1fb3V0cHV0QnVmZmVyUXVldWU7CisgICAgUmV0 YWluUHRyPENNQnVmZmVyUXVldWVSZWY+IG1faW5wdXRCdWZmZXJRdWV1ZTsKICAgICBib29sIG1f aXNFbmNvZGluZyB7IGZhbHNlIH07CiAKICAgICBSZXRhaW5QdHI8QXVkaW9Db252ZXJ0ZXJSZWY+ IG1fY29udmVydGVyOwpAQCAtNzAsNyArNzEsNyBAQCBwcml2YXRlOgogICAgIEF1ZGlvU3RyZWFt QmFzaWNEZXNjcmlwdGlvbiBtX2Rlc3RpbmF0aW9uRm9ybWF0OwogICAgIFJldGFpblB0cjxDTUZv cm1hdERlc2NyaXB0aW9uUmVmPiBtX2Rlc3RpbmF0aW9uRm9ybWF0RGVzY3JpcHRpb247CiAgICAg UmV0YWluUHRyPE5TTnVtYmVyPiBtX2dkckNvdW50TnVtOwotICAgIFVJbnQzMiBtX21heE91dHB1 dFBhY2tldFNpemU7CisgICAgVUludDMyIG1fbWF4T3V0cHV0UGFja2V0U2l6ZSB7IDAgfTsKICAg ICBWZWN0b3I8QXVkaW9TdHJlYW1QYWNrZXREZXNjcmlwdGlvbj4gbV9kZXN0aW5hdGlvblBhY2tl dERlc2NyaXB0aW9uczsKIAogICAgIENNVGltZSBtX2N1cnJlbnROYXRpdmVQcmVzZW50YXRpb25U aW1lU3RhbXA7CkBAIC04MSw5ICs4Miw5IEBAIHByaXZhdGU6CiAgICAgVmVjdG9yPGNoYXI+IG1f ZGVzdGluYXRpb25CdWZmZXI7CiAKICAgICBSZXRhaW5QdHI8Q01CbG9ja0J1ZmZlclJlZj4gbV9z YW1wbGVCbG9ja0J1ZmZlcjsKLSAgICBzaXplX3QgbV9zYW1wbGVCbG9ja0J1ZmZlclNpemU7Ci0g ICAgc2l6ZV90IG1fY3VycmVudE9mZnNldEluU2FtcGxlQmxvY2tCdWZmZXI7Ci0gICAgQXVkaW9G b3JtYXRJRCBtX291dHB1dENvZGVjVHlwZTsKKyAgICBzaXplX3QgbV9zYW1wbGVCbG9ja0J1ZmZl clNpemUgeyAwIH07CisgICAgc2l6ZV90IG1fY3VycmVudE9mZnNldEluU2FtcGxlQmxvY2tCdWZm ZXIgeyAwIH07CisgICAgQXVkaW9Gb3JtYXRJRCBtX291dHB1dENvZGVjVHlwZSB7IGtBdWRpb0Zv cm1hdE1QRUc0QUFDIH07CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tZWRpYXJlY29yZGVyL2NvY29hL0F1ZGlvU2FtcGxlQnVmZmVyQ29tcHJlc3Nvci5tbSBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhcmVjb3JkZXIvY29jb2EvQXVkaW9TYW1wbGVC dWZmZXJDb21wcmVzc29yLm1tCmluZGV4IDlkOTYzODQwZGMzZTViYWQ1Yzk2MDczNGYzMjY4OWYz OTUyNTQxZGQuLmM5YmZmNjQxZDJjMjZmZWFhZmExZGNjN2JjM2FjMjE2OWRmNmU1YTUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhcmVjb3JkZXIvY29jb2EvQXVkaW9T YW1wbGVCdWZmZXJDb21wcmVzc29yLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21l ZGlhcmVjb3JkZXIvY29jb2EvQXVkaW9TYW1wbGVCdWZmZXJDb21wcmVzc29yLm1tCkBAIC01Miwx NCArNTIsMTIgQEAgc3RkOjp1bmlxdWVfcHRyPEF1ZGlvU2FtcGxlQnVmZmVyQ29tcHJlc3Nvcj4g QXVkaW9TYW1wbGVCdWZmZXJDb21wcmVzc29yOjpjcmVhdGUKIEF1ZGlvU2FtcGxlQnVmZmVyQ29t cHJlc3Nvcjo6QXVkaW9TYW1wbGVCdWZmZXJDb21wcmVzc29yKCkKICAgICA6IG1fc2VyaWFsRGlz cGF0Y2hRdWV1ZSB7IGRpc3BhdGNoX3F1ZXVlX2NyZWF0ZSgiY29tLmFwcGxlLkF1ZGlvU2FtcGxl QnVmZmVyQ29tcHJlc3NvciIsIERJU1BBVENIX1FVRVVFX1NFUklBTCkgfQogICAgICwgbV9sb3dX YXRlclRpbWUgeyBDTVRpbWVNYWtlV2l0aFNlY29uZHMoTE9XX1dBVEVSX1RJTUVfSU5fU0VDT05E UywgMTAwMCkgfQotICAgICwgbV9vdXRwdXRDb2RlY1R5cGUgeyBrQXVkaW9Gb3JtYXRNUEVHNEFB QyB9CiB7CiB9CiAKIEF1ZGlvU2FtcGxlQnVmZmVyQ29tcHJlc3Nvcjo6fkF1ZGlvU2FtcGxlQnVm ZmVyQ29tcHJlc3NvcigpCiB7Ci0gICAgaWYgKG1fc2VyaWFsRGlzcGF0Y2hRdWV1ZSkKLSAgICAg ICAgZGlzcGF0Y2hfcmVsZWFzZShtX3NlcmlhbERpc3BhdGNoUXVldWUpOworICAgIGRpc3BhdGNo X3JlbGVhc2UobV9zZXJpYWxEaXNwYXRjaFF1ZXVlKTsKIH0KIAogYm9vbCBBdWRpb1NhbXBsZUJ1 ZmZlckNvbXByZXNzb3I6OmluaXRpYWxpemUoQ01CdWZmZXJRdWV1ZVRyaWdnZXJDYWxsYmFjayBj YWxsYmFjaywgdm9pZCogY2FsbGJhY2tPYmplY3QpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tZWRpYXJlY29yZGVyL2NvY29hL01lZGlhUmVjb3JkZXJQcml2YXRlV3JpdGVy Q29jb2EuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhcmVjb3JkZXIvY29jb2EvTWVk aWFSZWNvcmRlclByaXZhdGVXcml0ZXJDb2NvYS5oCmluZGV4IDQ4ZTkwZGNlMjFiMWNjZjc5M2Ix MmFhZDIxOGQ2MDhlMmUxM2M1ZjYuLmI3YTlkNzEyMzg3ZDcwNDBhZmE1YjhjZWE2MTFhNGRjZTQz NDY2YTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhcmVjb3JkZXIv Y29jb2EvTWVkaWFSZWNvcmRlclByaXZhdGVXcml0ZXJDb2NvYS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21lZGlhcmVjb3JkZXIvY29jb2EvTWVkaWFSZWNvcmRlclByaXZhdGVXcml0 ZXJDb2NvYS5oCkBAIC05NSwxOCArOTUsMTggQEAgcHJpdmF0ZToKICAgICB2b2lkIGZsdXNoQ29t cHJlc3NlZFNhbXBsZUJ1ZmZlcnMoQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsKICAgICB2 b2lkIGFwcGVuZEVuZE9mVmlkZW9TYW1wbGVEdXJhdGlvbklmTmVlZGVkKENvbXBsZXRpb25IYW5k bGVyPHZvaWQoKT4mJik7CiAKKyAgICBib29sIG1faGFzQXVkaW8geyBmYWxzZSB9OworICAgIGJv b2wgbV9oYXNWaWRlbyB7IGZhbHNlIH07CisKICAgICBib29sIG1faGFzU3RhcnRlZFdyaXRpbmcg eyBmYWxzZSB9OwogICAgIGJvb2wgbV9pc1N0b3BwZWQgeyBmYWxzZSB9OworICAgIGJvb2wgbV9p c1N0b3BwaW5nIHsgZmFsc2UgfTsKIAogICAgIFJldGFpblB0cjxBVkFzc2V0V3JpdGVyPiBtX3dy aXRlcjsKIAotICAgIGJvb2wgbV9pc1N0b3BwaW5nIHsgZmFsc2UgfTsKICAgICBSZWZQdHI8U2hh cmVkQnVmZmVyPiBtX2RhdGE7CiAgICAgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChSZWZQdHI8U2hh cmVkQnVmZmVyPiYmKT4gbV9mZXRjaERhdGFDb21wbGV0aW9uSGFuZGxlcjsKIAotICAgIGJvb2wg bV9oYXNBdWRpbzsKLSAgICBib29sIG1faGFzVmlkZW87Ci0KICAgICBSZXRhaW5QdHI8Q01Gb3Jt YXREZXNjcmlwdGlvblJlZj4gbV9hdWRpb0Zvcm1hdERlc2NyaXB0aW9uOwogICAgIHN0ZDo6dW5p cXVlX3B0cjxBdWRpb1NhbXBsZUJ1ZmZlckNvbXByZXNzb3I+IG1fYXVkaW9Db21wcmVzc29yOwog ICAgIFJldGFpblB0cjxBVkFzc2V0V3JpdGVySW5wdXQ+IG1fYXVkaW9Bc3NldFdyaXRlcklucHV0 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFyZWNvcmRlci9jb2Nv YS9NZWRpYVJlY29yZGVyUHJpdmF0ZVdyaXRlckNvY29hLm1tIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbWVkaWFyZWNvcmRlci9jb2NvYS9NZWRpYVJlY29yZGVyUHJpdmF0ZVdyaXRlckNvY29h Lm1tCmluZGV4IDc0YWQ0MzhjYzVhNGRlMTE1MzYxZTVjYjg0ZmEzMmZkMjI0NGYyYWIuLjliNWJi OGNmNmE0NmEyY2QwMGYyMmFlZDY2ODY0MTExZTJiM2FkNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21lZGlhcmVjb3JkZXIvY29jb2EvTWVkaWFSZWNvcmRlclByaXZhdGVX cml0ZXJDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXJlY29yZGVy L2NvY29hL01lZGlhUmVjb3JkZXJQcml2YXRlV3JpdGVyQ29jb2EubW0KQEAgLTEzNSwxNCArMTM1 LDE4IEBAIFJlZlB0cjxNZWRpYVJlY29yZGVyUHJpdmF0ZVdyaXRlcj4gTWVkaWFSZWNvcmRlclBy aXZhdGVXcml0ZXI6OmNyZWF0ZShjb25zdCBNZWRpCiAKIHZvaWQgTWVkaWFSZWNvcmRlclByaXZh dGVXcml0ZXI6OmNvbXByZXNzZWRWaWRlb091dHB1dEJ1ZmZlckNhbGxiYWNrKHZvaWQgKm1lZGlh UmVjb3JkZXJQcml2YXRlV3JpdGVyLCBDTUJ1ZmZlclF1ZXVlVHJpZ2dlclRva2VuKQogewotICAg IGF1dG8gKndyaXRlciA9IHN0YXRpY19jYXN0PE1lZGlhUmVjb3JkZXJQcml2YXRlV3JpdGVyKj4o bWVkaWFSZWNvcmRlclByaXZhdGVXcml0ZXIpOwotICAgIHdyaXRlci0+cHJvY2Vzc05ld0NvbXBy ZXNzZWRWaWRlb1NhbXBsZUJ1ZmZlcnMoKTsKKyAgICBjYWxsT25NYWluVGhyZWFkKFt3ZWFrV3Jp dGVyID0gbWFrZVdlYWtQdHIoc3RhdGljX2Nhc3Q8TWVkaWFSZWNvcmRlclByaXZhdGVXcml0ZXIq PihtZWRpYVJlY29yZGVyUHJpdmF0ZVdyaXRlcikpXSB7CisgICAgICAgIGlmICh3ZWFrV3JpdGVy KQorICAgICAgICAgICAgd2Vha1dyaXRlci0+cHJvY2Vzc05ld0NvbXByZXNzZWRWaWRlb1NhbXBs ZUJ1ZmZlcnMoKTsKKyAgICB9KTsKIH0KIAogdm9pZCBNZWRpYVJlY29yZGVyUHJpdmF0ZVdyaXRl cjo6Y29tcHJlc3NlZEF1ZGlvT3V0cHV0QnVmZmVyQ2FsbGJhY2sodm9pZCAqbWVkaWFSZWNvcmRl clByaXZhdGVXcml0ZXIsIENNQnVmZmVyUXVldWVUcmlnZ2VyVG9rZW4pCiB7Ci0gICAgYXV0byAq d3JpdGVyID0gc3RhdGljX2Nhc3Q8TWVkaWFSZWNvcmRlclByaXZhdGVXcml0ZXIqPihtZWRpYVJl Y29yZGVyUHJpdmF0ZVdyaXRlcik7Ci0gICAgd3JpdGVyLT5wcm9jZXNzTmV3Q29tcHJlc3NlZEF1 ZGlvU2FtcGxlQnVmZmVycygpOworICAgIGNhbGxPbk1haW5UaHJlYWQoW3dlYWtXcml0ZXIgPSBt YWtlV2Vha1B0cihzdGF0aWNfY2FzdDxNZWRpYVJlY29yZGVyUHJpdmF0ZVdyaXRlcio+KG1lZGlh UmVjb3JkZXJQcml2YXRlV3JpdGVyKSldIHsKKyAgICAgICAgaWYgKHdlYWtXcml0ZXIpCisgICAg ICAgICAgICB3ZWFrV3JpdGVyLT5wcm9jZXNzTmV3Q29tcHJlc3NlZEF1ZGlvU2FtcGxlQnVmZmVy cygpOworICAgIH0pOwogfQogCiBNZWRpYVJlY29yZGVyUHJpdmF0ZVdyaXRlcjo6TWVkaWFSZWNv cmRlclByaXZhdGVXcml0ZXIoYm9vbCBoYXNBdWRpbywgYm9vbCBoYXNWaWRlbykKQEAgLTE4OCwx NiArMTkyLDEzIEBAIHZvaWQgTWVkaWFSZWNvcmRlclByaXZhdGVXcml0ZXI6OnByb2Nlc3NOZXdD b21wcmVzc2VkVmlkZW9TYW1wbGVCdWZmZXJzKCkKICAgICBBU1NFUlQobV9oYXNWaWRlbyk7CiAg ICAgaWYgKCFtX3ZpZGVvRm9ybWF0RGVzY3JpcHRpb24pIHsKICAgICAgICAgbV92aWRlb0Zvcm1h dERlc2NyaXB0aW9uID0gQ01TYW1wbGVCdWZmZXJHZXRGb3JtYXREZXNjcmlwdGlvbihtX3ZpZGVv Q29tcHJlc3Nvci0+Z2V0T3V0cHV0U2FtcGxlQnVmZmVyKCkpOwotICAgICAgICBjYWxsT25NYWlu VGhyZWFkKFt3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKHRoaXMpLCB0aGlzXSB7Ci0gICAgICAgICAg ICBpZiAoIXdlYWtUaGlzKQotICAgICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICAgICAg aWYgKG1faGFzQXVkaW8gJiYgIW1fYXVkaW9Gb3JtYXREZXNjcmlwdGlvbikKLSAgICAgICAgICAg ICAgICByZXR1cm47CisgICAgICAgIGlmIChtX2hhc0F1ZGlvICYmICFtX2F1ZGlvRm9ybWF0RGVz Y3JpcHRpb24pCisgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgICAgIHN0YXJ0QXNzZXRX cml0ZXIoKTsKLSAgICAgICAgfSk7CisgICAgICAgIHN0YXJ0QXNzZXRXcml0ZXIoKTsKICAgICB9 CisKICAgICBpZiAoIW1faGFzU3RhcnRlZFdyaXRpbmcpCiAgICAgICAgIHJldHVybjsKICAgICBh cHBlbmRDb21wcmVzc2VkU2FtcGxlQnVmZmVycygpOwpAQCAtMjA4LDE2ICsyMDksMTIgQEAgdm9p ZCBNZWRpYVJlY29yZGVyUHJpdmF0ZVdyaXRlcjo6cHJvY2Vzc05ld0NvbXByZXNzZWRBdWRpb1Nh bXBsZUJ1ZmZlcnMoKQogICAgIEFTU0VSVChtX2hhc0F1ZGlvKTsKICAgICBpZiAoIW1fYXVkaW9G b3JtYXREZXNjcmlwdGlvbikgewogICAgICAgICBtX2F1ZGlvRm9ybWF0RGVzY3JpcHRpb24gPSBD TVNhbXBsZUJ1ZmZlckdldEZvcm1hdERlc2NyaXB0aW9uKG1fYXVkaW9Db21wcmVzc29yLT5nZXRP dXRwdXRTYW1wbGVCdWZmZXIoKSk7Ci0gICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW3dlYWtUaGlz ID0gbWFrZVdlYWtQdHIodGhpcyksIHRoaXNdIHsKLSAgICAgICAgICAgIGlmICghd2Vha1RoaXMp Ci0gICAgICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgICAgICBpZiAobV9oYXNWaWRlbyAm JiAhbV92aWRlb0Zvcm1hdERlc2NyaXB0aW9uKQotICAgICAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgaWYgKG1faGFzVmlkZW8gJiYgIW1fdmlkZW9Gb3JtYXREZXNjcmlwdGlvbikKKyAgICAg ICAgICAgIHJldHVybjsKIAotICAgICAgICAgICAgc3RhcnRBc3NldFdyaXRlcigpOwotICAgICAg ICB9KTsKKyAgICAgICAgc3RhcnRBc3NldFdyaXRlcigpOwogICAgIH0KKwogICAgIGlmICghbV9o YXNTdGFydGVkV3JpdGluZykKICAgICAgICAgcmV0dXJuOwogICAgIGFwcGVuZENvbXByZXNzZWRT YW1wbGVCdWZmZXJzKCk7CkBAIC00MzUsMzUgKzQzMiw0MyBAQCB2b2lkIE1lZGlhUmVjb3JkZXJQ cml2YXRlV3JpdGVyOjpzdG9wUmVjb3JkaW5nKCkKICAgICBpZiAobV9hdWRpb0NvbXByZXNzb3Ip CiAgICAgICAgIG1fYXVkaW9Db21wcmVzc29yLT5maW5pc2goKTsKIAotICAgIGlmICghbV9oYXNT dGFydGVkV3JpdGluZykKLSAgICAgICAgcmV0dXJuOwotICAgIEFTU0VSVChbbV93cml0ZXIgc3Rh dHVzXSA9PSBBVkFzc2V0V3JpdGVyU3RhdHVzV3JpdGluZyk7Ci0KICAgICBtX2lzU3RvcHBpbmcg PSB0cnVlOwotCi0gICAgZmx1c2hDb21wcmVzc2VkU2FtcGxlQnVmZmVycyhbdGhpcywgd2Vha1Ro aXMgPSBtYWtlV2Vha1B0cih0aGlzKV0oKSBtdXRhYmxlIHsKLSAgICAgICAgaWYgKCF3ZWFrVGhp cykKKyAgICAvLyBXZSBob3AgdG8gdGhlIG1haW4gdGhyZWFkIHNpbmNlIGZpbmlzaGluZyB0aGUg dmlkZW8gY29tcHJlc3NvciBtaWdodCB0cmlnZ2VyIHN0YXJ0aW5nIHRoZSB3cml0ZXIgYXN5bmNo cm9ub3VzbHkuCisgICAgY2FsbE9uTWFpblRocmVhZChbdGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vh a1B0cih0aGlzKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgYXV0byB3aGVuRmluaXNoZWQgPSBbdGhp c10geworICAgICAgICAgICAgbV9pc1N0b3BwaW5nID0gZmFsc2U7CisgICAgICAgICAgICBpZiAo bV9mZXRjaERhdGFDb21wbGV0aW9uSGFuZGxlcikgeworICAgICAgICAgICAgICAgIGF1dG8gYnVm ZmVyID0gV1RGTW92ZShtX2RhdGEpOworICAgICAgICAgICAgICAgIG1fZmV0Y2hEYXRhQ29tcGxl dGlvbkhhbmRsZXIoV1RGTW92ZShidWZmZXIpKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAg ICAgbV9pc1N0b3BwZWQgPSBmYWxzZTsKKyAgICAgICAgICAgIG1faGFzU3RhcnRlZFdyaXRpbmcg PSBmYWxzZTsKKyAgICAgICAgICAgIGNsZWFyKCk7CisgICAgICAgIH07CisKKyAgICAgICAgaWYg KCFtX2hhc1N0YXJ0ZWRXcml0aW5nKSB7CisgICAgICAgICAgICB3aGVuRmluaXNoZWQoKTsKICAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQogCi0gICAgICAgIEFMTE9XX0RFUFJFQ0FURURf REVDTEFSQVRJT05TX0JFR0lOCi0gICAgICAgIFttX3dyaXRlciBmbHVzaF07Ci0gICAgICAgIEFM TE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAotICAgICAgICBbbV93cml0ZXIgZmluaXNo V3JpdGluZ1dpdGhDb21wbGV0aW9uSGFuZGxlcjpbdGhpcywgd2Vha1RoaXMgPSBXVEZNb3ZlKHdl YWtUaGlzKV0oKSBtdXRhYmxlIHsKLSAgICAgICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW3RoaXMs IHdlYWtUaGlzID0gV1RGTW92ZSh3ZWFrVGhpcyldKCkgbXV0YWJsZSB7Ci0gICAgICAgICAgICAg ICAgaWYgKCF3ZWFrVGhpcykKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAg ICAgICAgICAgbV9pc1N0b3BwaW5nID0gZmFsc2U7Ci0gICAgICAgICAgICAgICAgaWYgKG1fZmV0 Y2hEYXRhQ29tcGxldGlvbkhhbmRsZXIpIHsKLSAgICAgICAgICAgICAgICAgICAgYXV0byBidWZm ZXIgPSBXVEZNb3ZlKG1fZGF0YSk7Ci0gICAgICAgICAgICAgICAgICAgIG1fZmV0Y2hEYXRhQ29t cGxldGlvbkhhbmRsZXIoV1RGTW92ZShidWZmZXIpKTsKLSAgICAgICAgICAgICAgICB9Ci0KLSAg ICAgICAgICAgICAgICBtX2lzU3RvcHBlZCA9IGZhbHNlOwotICAgICAgICAgICAgICAgIG1faGFz U3RhcnRlZFdyaXRpbmcgPSBmYWxzZTsKLSAgICAgICAgICAgICAgICBjbGVhcigpOwotICAgICAg ICAgICAgfSk7Ci0gICAgICAgIH1dOworICAgICAgICBBU1NFUlQoW21fd3JpdGVyIHN0YXR1c10g PT0gQVZBc3NldFdyaXRlclN0YXR1c1dyaXRpbmcpOworICAgICAgICBmbHVzaENvbXByZXNzZWRT YW1wbGVCdWZmZXJzKFt0aGlzLCB3ZWFrVGhpcyA9IFdURk1vdmUod2Vha1RoaXMpLCB3aGVuRmlu aXNoZWQgPSBXVEZNb3ZlKHdoZW5GaW5pc2hlZCldKCkgbXV0YWJsZSB7CisgICAgICAgICAgICBp ZiAoIXdlYWtUaGlzKQorICAgICAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICAgICAgQUxM T1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KKyAgICAgICAgICAgIFttX3dyaXRlciBm bHVzaF07CisgICAgICAgICAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKKwor ICAgICAgICAgICAgW21fd3JpdGVyIGZpbmlzaFdyaXRpbmdXaXRoQ29tcGxldGlvbkhhbmRsZXI6 W3dlYWtUaGlzID0gV1RGTW92ZSh3ZWFrVGhpcyksIHdoZW5GaW5pc2hlZCA9IFdURk1vdmUod2hl bkZpbmlzaGVkKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgICAgICAgICBjYWxsT25NYWluVGhyZWFk KFt3ZWFrVGhpcyA9IFdURk1vdmUod2Vha1RoaXMpLCB3aGVuRmluaXNoZWQgPSBXVEZNb3ZlKHdo ZW5GaW5pc2hlZCldKCkgbXV0YWJsZSB7CisgICAgICAgICAgICAgICAgICAgIGlmICghd2Vha1Ro aXMpCisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgICAg IHdoZW5GaW5pc2hlZCgpOworICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgfV07Cisg ICAgICAgIH0pOwogICAgIH0pOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tZWRpYXJlY29yZGVyL2NvY29hL1ZpZGVvU2FtcGxlQnVmZmVyQ29tcHJlc3Nvci5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFyZWNvcmRlci9jb2NvYS9WaWRlb1NhbXBsZUJ1 ZmZlckNvbXByZXNzb3IuaAppbmRleCA1ZTQyODkzNTIzNjBjYjE3ODAwZGQwNmU2YjViMTUzODc5 NjJjNzllLi4wZWI2N2FlZjQ3Yjg1MTYzN2Q4ZmYwOTk1ZDliMzRkNDU3ZDVjZWY0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXJlY29yZGVyL2NvY29hL1ZpZGVvU2Ft cGxlQnVmZmVyQ29tcHJlc3Nvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlh cmVjb3JkZXIvY29jb2EvVmlkZW9TYW1wbGVCdWZmZXJDb21wcmVzc29yLmgKQEAgLTU2LDEyICs1 NiwxMiBAQCBwcml2YXRlOgogICAgIHN0YXRpYyB2b2lkIHZpZGVvQ29tcHJlc3Npb25DYWxsYmFj ayh2b2lkICpyZWZDb24sIHZvaWQqLCBPU1N0YXR1cywgVlRFbmNvZGVJbmZvRmxhZ3MsIENNU2Ft cGxlQnVmZmVyUmVmKTsKIAogICAgIGRpc3BhdGNoX3F1ZXVlX3QgbV9zZXJpYWxEaXNwYXRjaFF1 ZXVlOworICAgIENNVmlkZW9Db2RlY1R5cGUgbV9vdXRwdXRDb2RlY1R5cGUgeyBrQ01WaWRlb0Nv ZGVjVHlwZV9IMjY0IH07CisKICAgICBSZXRhaW5QdHI8Q01CdWZmZXJRdWV1ZVJlZj4gbV9vdXRw dXRCdWZmZXJRdWV1ZTsKICAgICBSZXRhaW5QdHI8VlRDb21wcmVzc2lvblNlc3Npb25SZWY+IG1f dnRTZXNzaW9uOwogCiAgICAgYm9vbCBtX2lzRW5jb2RpbmcgeyBmYWxzZSB9OwotCi0gICAgQ01W aWRlb0NvZGVjVHlwZSBtX291dHB1dENvZGVjVHlwZTsKICAgICBmbG9hdCBtX21heEtleUZyYW1l SW50ZXJ2YWxEdXJhdGlvbiB7IDIuMCB9OwogICAgIHVuc2lnbmVkIG1fZXhwZWN0ZWRGcmFtZVJh dGUgeyAzMCB9OwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlh cmVjb3JkZXIvY29jb2EvVmlkZW9TYW1wbGVCdWZmZXJDb21wcmVzc29yLm1tIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbWVkaWFyZWNvcmRlci9jb2NvYS9WaWRlb1NhbXBsZUJ1ZmZlckNvbXBy ZXNzb3IubW0KaW5kZXggMjYxMTg0ZWE1Mzk3ODQyNWE4N2NkYTgyMzc5MzQwODk2MTI0N2Q3MC4u MTg1YWQxMjgxMTU5Yzc3Y2RhNDIyMmU3YTkyMGRjYWNhMGNkMDg0OSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFyZWNvcmRlci9jb2NvYS9WaWRlb1NhbXBsZUJ1ZmZl ckNvbXByZXNzb3IubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFyZWNvcmRl ci9jb2NvYS9WaWRlb1NhbXBsZUJ1ZmZlckNvbXByZXNzb3IubW0KQEAgLTU1LDggKzU1LDcgQEAg VmlkZW9TYW1wbGVCdWZmZXJDb21wcmVzc29yOjpWaWRlb1NhbXBsZUJ1ZmZlckNvbXByZXNzb3Io Q01WaWRlb0NvZGVjVHlwZSBvdXRwdXQKIAogVmlkZW9TYW1wbGVCdWZmZXJDb21wcmVzc29yOjp+ VmlkZW9TYW1wbGVCdWZmZXJDb21wcmVzc29yKCkKIHsKLSAgICBpZiAobV9zZXJpYWxEaXNwYXRj aFF1ZXVlKQotICAgICAgICBkaXNwYXRjaF9yZWxlYXNlKG1fc2VyaWFsRGlzcGF0Y2hRdWV1ZSk7 CisgICAgZGlzcGF0Y2hfcmVsZWFzZShtX3NlcmlhbERpc3BhdGNoUXVldWUpOwogfQogCiBib29s IFZpZGVvU2FtcGxlQnVmZmVyQ29tcHJlc3Nvcjo6aW5pdGlhbGl6ZShDTUJ1ZmZlclF1ZXVlVHJp Z2dlckNhbGxiYWNrIGNhbGxiYWNrLCB2b2lkKiBjYWxsYmFja09iamVjdCkK