75579 2012-01-04 15:01:56 -0800 [chromium] Remove AllowCrossThreadAccess in WorkerFileSystemCallbacksBridge. 2012-01-04 19:10:56 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 74666 1 levin levin dimich dslomov levin+threading webkit.review.bot oldest_to_newest 529792 0 levin 2012-01-04 15:01:56 -0800 See summary. 529809 1 121169 levin 2012-01-04 15:12:39 -0800 Created attachment 121169 Patch 529868 2 121169 dimich 2012-01-04 16:20:58 -0800 Comment on attachment 121169 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=121169&action=review Nice comments! > Source/WebKit/chromium/ChangeLog:8 > + This code seems like it is ok about lifetime issues but this change is 'ok' seems to be not needed. 529951 3 levin 2012-01-04 19:10:56 -0800 Committed as http://trac.webkit.org/changeset/104112 121169 2012-01-04 15:12:39 -0800 2012-01-04 16:20:58 -0800 Patch bug-75579-20120104151238.patch text/plain 31011 levin U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0MDYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDljZGRmYWNjOWVlOTY3MWVlMjk0ZmQ2NzNjMDUyYWFmOTIyNDEzZjcuLmQ4ZTAwN2NiOWQ3MWJh OWJjNDg4MWE1Yjg3ZjhjMmQ4YmI4ZGZlYTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDUgKzEsNTYgQEAKIDIwMTItMDEtMDQgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0u b3JnPgogCisgICAgICAgIFtjaHJvbWl1bV0gUmVtb3ZlIEFsbG93Q3Jvc3NUaHJlYWRBY2Nlc3Mg aW4gV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1NTc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjb2RlIHNlZW1zIGxpa2UgaXQgaXMgb2sg YWJvdXQgbGlmZXRpbWUgaXNzdWVzIGJ1dCB0aGlzIGNoYW5nZSBpcworICAgICAgICBhYm91dCBn ZXR0aW5nIHJpZCBvZiBBbGxvd0Nyb3NzVGhyZWFkQWNjZXNzIGFuZCBnZXR0aW5nIHJpZCBvZiBh IGxlYWtSZWYuCisgICAgICAgIFRoaXMgYWxsb3dzIHRoZSBjb2RlIHRvIGZvbGxvdyBhIG1vcmUg Y29tbW9uIHBhdHRlcm4gYW5kIGJlIG1vcmUgZWFzaWx5CisgICAgICAgIHZlcmlmaWVkIGFzIGJl aW5nIGNvcnJlY3QuCisKKyAgICAgICAgKiBzcmMvV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0Jy aWRnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok1haW5UaHJlYWRGaWxlU3lzdGVtQ2FsbGJhY2tz OjpjcmVhdGVMZWFrZWRQdHIpOgorICAgICAgICAoV2ViS2l0OjpNYWluVGhyZWFkRmlsZVN5c3Rl bUNhbGxiYWNrczo6TWFpblRocmVhZEZpbGVTeXN0ZW1DYWxsYmFja3MpOgorICAgICAgICAoV2Vi S2l0OjpXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpwb3N0T3BlbkZpbGVTeXN0ZW1U b01haW5UaHJlYWQpOgorICAgICAgICAoV2ViS2l0OjpXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tz QnJpZGdlOjpwb3N0TW92ZVRvTWFpblRocmVhZCk6CisgICAgICAgIChXZWJLaXQ6OldvcmtlckZp bGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U6OnBvc3RDb3B5VG9NYWluVGhyZWFkKToKKyAgICAgICAg KFdlYktpdDo6V29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6cG9zdFJlbW92ZVRvTWFp blRocmVhZCk6CisgICAgICAgIChXZWJLaXQ6OldvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlk Z2U6OnBvc3RSZW1vdmVSZWN1cnNpdmVseVRvTWFpblRocmVhZCk6CisgICAgICAgIChXZWJLaXQ6 OldvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U6OnBvc3RSZWFkTWV0YWRhdGFUb01haW5U aHJlYWQpOgorICAgICAgICAoV2ViS2l0OjpXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdl Ojpwb3N0Q3JlYXRlRmlsZVRvTWFpblRocmVhZCk6CisgICAgICAgIChXZWJLaXQ6OldvcmtlckZp bGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U6OnBvc3RDcmVhdGVEaXJlY3RvcnlUb01haW5UaHJlYWQp OgorICAgICAgICAoV2ViS2l0OjpXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpwb3N0 RmlsZUV4aXN0c1RvTWFpblRocmVhZCk6CisgICAgICAgIChXZWJLaXQ6OldvcmtlckZpbGVTeXN0 ZW1DYWxsYmFja3NCcmlkZ2U6OnBvc3REaXJlY3RvcnlFeGlzdHNUb01haW5UaHJlYWQpOgorICAg ICAgICAoV2ViS2l0OjpXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpwb3N0UmVhZERp cmVjdG9yeVRvTWFpblRocmVhZCk6CisgICAgICAgIChXZWJLaXQ6OldvcmtlckZpbGVTeXN0ZW1D YWxsYmFja3NCcmlkZ2U6Om9wZW5GaWxlU3lzdGVtT25NYWluVGhyZWFkKToKKyAgICAgICAgKFdl YktpdDo6V29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6bW92ZU9uTWFpblRocmVhZCk6 CisgICAgICAgIChXZWJLaXQ6OldvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U6OmNvcHlP bk1haW5UaHJlYWQpOgorICAgICAgICAoV2ViS2l0OjpXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tz QnJpZGdlOjpyZW1vdmVPbk1haW5UaHJlYWQpOgorICAgICAgICAoV2ViS2l0OjpXb3JrZXJGaWxl U3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpyZW1vdmVSZWN1cnNpdmVseU9uTWFpblRocmVhZCk6Cisg ICAgICAgIChXZWJLaXQ6OldvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U6OnJlYWRNZXRh ZGF0YU9uTWFpblRocmVhZCk6CisgICAgICAgIChXZWJLaXQ6OldvcmtlckZpbGVTeXN0ZW1DYWxs YmFja3NCcmlkZ2U6OmNyZWF0ZUZpbGVPbk1haW5UaHJlYWQpOgorICAgICAgICAoV2ViS2l0OjpX b3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpjcmVhdGVEaXJlY3RvcnlPbk1haW5UaHJl YWQpOgorICAgICAgICAoV2ViS2l0OjpXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpm aWxlRXhpc3RzT25NYWluVGhyZWFkKToKKyAgICAgICAgKFdlYktpdDo6V29ya2VyRmlsZVN5c3Rl bUNhbGxiYWNrc0JyaWRnZTo6ZGlyZWN0b3J5RXhpc3RzT25NYWluVGhyZWFkKToKKyAgICAgICAg KFdlYktpdDo6V29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6cmVhZERpcmVjdG9yeU9u TWFpblRocmVhZCk6CisgICAgICAgIChXZWJLaXQ6OldvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NC cmlkZ2U6OmRpZEZhaWxPbk1haW5UaHJlYWQpOgorICAgICAgICAoV2ViS2l0OjpXb3JrZXJGaWxl U3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpkaWRPcGVuRmlsZVN5c3RlbU9uTWFpblRocmVhZCk6Cisg ICAgICAgIChXZWJLaXQ6OldvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U6OmRpZFN1Y2Nl ZWRPbk1haW5UaHJlYWQpOgorICAgICAgICAoV2ViS2l0OjpXb3JrZXJGaWxlU3lzdGVtQ2FsbGJh Y2tzQnJpZGdlOjpkaWRSZWFkTWV0YWRhdGFPbk1haW5UaHJlYWQpOgorICAgICAgICAoV2ViS2l0 OjpXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpkaWRSZWFkRGlyZWN0b3J5T25NYWlu VGhyZWFkKToKKyAgICAgICAgKFdlYktpdDo6V29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRn ZTo6ZGlkRmFpbE9uV29ya2VyVGhyZWFkKToKKyAgICAgICAgKFdlYktpdDo6V29ya2VyRmlsZVN5 c3RlbUNhbGxiYWNrc0JyaWRnZTo6ZGlkT3BlbkZpbGVTeXN0ZW1PbldvcmtlclRocmVhZCk6Cisg ICAgICAgIChXZWJLaXQ6OldvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U6OmRpZFN1Y2Nl ZWRPbldvcmtlclRocmVhZCk6CisgICAgICAgIChXZWJLaXQ6OldvcmtlckZpbGVTeXN0ZW1DYWxs YmFja3NCcmlkZ2U6OmRpZFJlYWRNZXRhZGF0YU9uV29ya2VyVGhyZWFkKToKKyAgICAgICAgKFdl YktpdDo6V29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6ZGlkUmVhZERpcmVjdG9yeU9u V29ya2VyVGhyZWFkKToKKyAgICAgICAgKFdlYktpdDo6V29ya2VyRmlsZVN5c3RlbUNhbGxiYWNr c0JyaWRnZTo6cnVuVGFza09uTWFpblRocmVhZCk6CisgICAgICAgIChXZWJLaXQ6OldvcmtlckZp bGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U6Om1heVBvc3RUYXNrVG9Xb3JrZXIpOgorICAgICAgICAq IHNyYy9Xb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlLmg6CisKKzIwMTItMDEtMDQgIERh dmlkIExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFtjaHJvbWl1bV0gTWFr ZSBpdCBzYWZlIHRvIGRlbGV0ZSBXb3JrZXJGaWxlU3lzdGVtQ29udGV4dE9ic2VydmVyIG9uIGFu eSB0aHJlYWQuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD03NTU3MwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Xb3JrZXJG aWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UuY3BwCmluZGV4IDQzM2ZkMTZkMjM0Njhm ZjkyODQ3MTdlZjZjNmY0MTUyODc5ZGFiNDAuLjRhYTJiYzFkZGQyMTE1MWM4MzZjMWU5ZGM3MGNi M2I1YmZlMDlmMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dvcmtl ckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1dvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UuY3BwCkBAIC05MCw3ICs5MCw3 IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgTWFpblRocmVhZEZpbGVTeXN0ZW1DYWxsYmFj a3MgOiBwdWJsaWMgV2ViRmlsZVN5c3RlbUNhbGxiYWNrcyB7CiBwdWJsaWM6CiAgICAgLy8gQ2Fs bGJhY2tzIGFyZSBzZWxmLWRlc3RydWN0ZWQgYW5kIHdlIGFsd2F5cyByZXR1cm4gbGVha2VkIHBv aW50ZXIgaGVyZS4KLSAgICBzdGF0aWMgTWFpblRocmVhZEZpbGVTeXN0ZW1DYWxsYmFja3MqIGNy ZWF0ZUxlYWtlZFB0cihXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlKiBicmlkZ2UsIGNv bnN0IFN0cmluZyYgbW9kZSkKKyAgICBzdGF0aWMgTWFpblRocmVhZEZpbGVTeXN0ZW1DYWxsYmFj a3MqIGNyZWF0ZUxlYWtlZFB0cihQYXNzUmVmUHRyPFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NC cmlkZ2U+IGJyaWRnZSwgY29uc3QgU3RyaW5nJiBtb2RlKQogICAgIHsKICAgICAgICAgT3duUHRy PE1haW5UaHJlYWRGaWxlU3lzdGVtQ2FsbGJhY2tzPiBjYWxsYmFja3MgPSBhZG9wdFB0cihuZXcg TWFpblRocmVhZEZpbGVTeXN0ZW1DYWxsYmFja3MoYnJpZGdlLCBtb2RlKSk7CiAgICAgICAgIHJl dHVybiBjYWxsYmFja3MubGVha1B0cigpOwpAQCAtMTMxLDE2ICsxMzEsMTQgQEAgcHVibGljOgog ICAgIH0KIAogcHJpdmF0ZToKLSAgICBNYWluVGhyZWFkRmlsZVN5c3RlbUNhbGxiYWNrcyhXb3Jr ZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlKiBicmlkZ2UsIGNvbnN0IFN0cmluZyYgbW9kZSkK KyAgICBNYWluVGhyZWFkRmlsZVN5c3RlbUNhbGxiYWNrcyhQYXNzUmVmUHRyPFdvcmtlckZpbGVT eXN0ZW1DYWxsYmFja3NCcmlkZ2U+IGJyaWRnZSwgY29uc3QgU3RyaW5nJiBtb2RlKQogICAgICAg ICA6IG1fYnJpZGdlKGJyaWRnZSkKICAgICAgICAgLCBtX21vZGUobW9kZSkKICAgICB7CiAgICAg ICAgIEFTU0VSVChtX2JyaWRnZSk7CiAgICAgfQogCi0gICAgZnJpZW5kIGNsYXNzIFdvcmtlckZp bGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U7Ci0gICAgLy8gVGhlIGJyaWRnZSBwb2ludGVyIGlzIGtl cHQgYnkgdGhlIGJyaWRnZSBpdHNlbGYgb24gdGhlIFdvcmtlclRocmVhZC4KLSAgICBXb3JrZXJG aWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlKiBtX2JyaWRnZTsKKyAgICBSZWZQdHI8V29ya2VyRmls ZVN5c3RlbUNhbGxiYWNrc0JyaWRnZT4gbV9icmlkZ2U7CiAgICAgY29uc3QgU3RyaW5nIG1fbW9k ZTsKIH07CiAKQEAgLTIwMSw3ICsxOTksNyBAQCB2b2lkIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFj a3NCcmlkZ2U6OnBvc3RPcGVuRmlsZVN5c3RlbVRvTWFpblRocmVhZChXZWJDb21tb25XbwogICAg IGRpc3BhdGNoVGFza1RvTWFpblRocmVhZCgKICAgICAgICAgY3JlYXRlQ2FsbGJhY2tUYXNrKCZv cGVuRmlsZVN5c3RlbU9uTWFpblRocmVhZCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgIEFs bG93Q3Jvc3NUaHJlYWRBY2Nlc3MoY29tbW9uQ2xpZW50KSwgdHlwZSwgc2l6ZSwgY3JlYXRlLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgQWxsb3dDcm9zc1RocmVhZEFjY2Vzcyh0aGlzKSwg bW9kZSkpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgdGhpcywgbW9kZSkpOwogfQogCiB2 b2lkIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U6OnBvc3RNb3ZlVG9NYWluVGhyZWFk KFdlYkZpbGVTeXN0ZW0qIGZpbGVTeXN0ZW0sIGNvbnN0IEtVUkwmIHNvdXJjZVBhdGgsIGNvbnN0 IEtVUkwmIGRlc3RpbmF0aW9uUGF0aCwgY29uc3QgU3RyaW5nJiBtb2RlKQpAQCAtMjA5LDcgKzIw Nyw3IEBAIHZvaWQgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6cG9zdE1vdmVUb01h aW5UaHJlYWQoV2ViRmlsZVN5c3RlbSogZmlsZVN5CiAgICAgZGlzcGF0Y2hUYXNrVG9NYWluVGhy ZWFkKAogICAgICAgICBjcmVhdGVDYWxsYmFja1Rhc2soJm1vdmVPbk1haW5UaHJlYWQsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICBBbGxvd0Nyb3NzVGhyZWFkQWNjZXNzKGZpbGVTeXN0ZW0p LCBzb3VyY2VQYXRoLCBkZXN0aW5hdGlvblBhdGgsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICBBbGxvd0Nyb3NzVGhyZWFkQWNjZXNzKHRoaXMpLCBtb2RlKSk7CisgICAgICAgICAgICAgICAg ICAgICAgICAgICB0aGlzLCBtb2RlKSk7CiB9CiAKIHZvaWQgV29ya2VyRmlsZVN5c3RlbUNhbGxi YWNrc0JyaWRnZTo6cG9zdENvcHlUb01haW5UaHJlYWQoV2ViRmlsZVN5c3RlbSogZmlsZVN5c3Rl bSwgY29uc3QgS1VSTCYgc291cmNlUGF0aCwgY29uc3QgS1VSTCYgZGVzdGluYXRpb25QYXRoLCBj b25zdCBTdHJpbmcmIG1vZGUpCkBAIC0yMTcsNyArMjE1LDcgQEAgdm9pZCBXb3JrZXJGaWxlU3lz dGVtQ2FsbGJhY2tzQnJpZGdlOjpwb3N0Q29weVRvTWFpblRocmVhZChXZWJGaWxlU3lzdGVtKiBm aWxlU3kKICAgICBkaXNwYXRjaFRhc2tUb01haW5UaHJlYWQoCiAgICAgICAgIGNyZWF0ZUNhbGxi YWNrVGFzaygmY29weU9uTWFpblRocmVhZCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgIEFs bG93Q3Jvc3NUaHJlYWRBY2Nlc3MoZmlsZVN5c3RlbSksIHNvdXJjZVBhdGgsIGRlc3RpbmF0aW9u UGF0aCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgIEFsbG93Q3Jvc3NUaHJlYWRBY2Nlc3Mo dGhpcyksIG1vZGUpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMsIG1vZGUpKTsK IH0KIAogdm9pZCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpwb3N0UmVtb3ZlVG9N YWluVGhyZWFkKFdlYkZpbGVTeXN0ZW0qIGZpbGVTeXN0ZW0sIGNvbnN0IEtVUkwmIHBhdGgsIGNv bnN0IFN0cmluZyYgbW9kZSkKQEAgLTIyNiw3ICsyMjQsNyBAQCB2b2lkIFdvcmtlckZpbGVTeXN0 ZW1DYWxsYmFja3NCcmlkZ2U6OnBvc3RSZW1vdmVUb01haW5UaHJlYWQoV2ViRmlsZVN5c3RlbSog ZmlsZQogICAgIGRpc3BhdGNoVGFza1RvTWFpblRocmVhZCgKICAgICAgICAgY3JlYXRlQ2FsbGJh Y2tUYXNrKCZyZW1vdmVPbk1haW5UaHJlYWQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBB bGxvd0Nyb3NzVGhyZWFkQWNjZXNzKGZpbGVTeXN0ZW0pLCBwYXRoLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgQWxsb3dDcm9zc1RocmVhZEFjY2Vzcyh0aGlzKSwgbW9kZSkpOworICAgICAg ICAgICAgICAgICAgICAgICAgICAgdGhpcywgbW9kZSkpOwogfQogCiB2b2lkIFdvcmtlckZpbGVT eXN0ZW1DYWxsYmFja3NCcmlkZ2U6OnBvc3RSZW1vdmVSZWN1cnNpdmVseVRvTWFpblRocmVhZChX ZWJGaWxlU3lzdGVtKiBmaWxlU3lzdGVtLCBjb25zdCBLVVJMJiBwYXRoLCBjb25zdCBTdHJpbmcm IG1vZGUpCkBAIC0yMzUsNyArMjMzLDcgQEAgdm9pZCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tz QnJpZGdlOjpwb3N0UmVtb3ZlUmVjdXJzaXZlbHlUb01haW5UaHJlYWQoV2ViRmlsZVMKICAgICBk aXNwYXRjaFRhc2tUb01haW5UaHJlYWQoCiAgICAgICAgIGNyZWF0ZUNhbGxiYWNrVGFzaygmcmVt b3ZlUmVjdXJzaXZlbHlPbk1haW5UaHJlYWQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBB bGxvd0Nyb3NzVGhyZWFkQWNjZXNzKGZpbGVTeXN0ZW0pLCBwYXRoLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgQWxsb3dDcm9zc1RocmVhZEFjY2Vzcyh0aGlzKSwgbW9kZSkpOworICAgICAg ICAgICAgICAgICAgICAgICAgICAgdGhpcywgbW9kZSkpOwogfQogCiB2b2lkIFdvcmtlckZpbGVT eXN0ZW1DYWxsYmFja3NCcmlkZ2U6OnBvc3RSZWFkTWV0YWRhdGFUb01haW5UaHJlYWQoV2ViRmls ZVN5c3RlbSogZmlsZVN5c3RlbSwgY29uc3QgS1VSTCYgcGF0aCwgY29uc3QgU3RyaW5nJiBtb2Rl KQpAQCAtMjQ0LDcgKzI0Miw3IEBAIHZvaWQgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRn ZTo6cG9zdFJlYWRNZXRhZGF0YVRvTWFpblRocmVhZChXZWJGaWxlU3lzdGVtCiAgICAgZGlzcGF0 Y2hUYXNrVG9NYWluVGhyZWFkKAogICAgICAgICBjcmVhdGVDYWxsYmFja1Rhc2soJnJlYWRNZXRh ZGF0YU9uTWFpblRocmVhZCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgIEFsbG93Q3Jvc3NU aHJlYWRBY2Nlc3MoZmlsZVN5c3RlbSksIHBhdGgsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICBBbGxvd0Nyb3NzVGhyZWFkQWNjZXNzKHRoaXMpLCBtb2RlKSk7CisgICAgICAgICAgICAgICAg ICAgICAgICAgICB0aGlzLCBtb2RlKSk7CiB9CiAKIHZvaWQgV29ya2VyRmlsZVN5c3RlbUNhbGxi YWNrc0JyaWRnZTo6cG9zdENyZWF0ZUZpbGVUb01haW5UaHJlYWQoV2ViRmlsZVN5c3RlbSogZmls ZVN5c3RlbSwgY29uc3QgS1VSTCYgcGF0aCwgYm9vbCBleGNsdXNpdmUsIGNvbnN0IFN0cmluZyYg bW9kZSkKQEAgLTI1Miw3ICsyNTAsNyBAQCB2b2lkIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NC cmlkZ2U6OnBvc3RDcmVhdGVGaWxlVG9NYWluVGhyZWFkKFdlYkZpbGVTeXN0ZW0qCiAgICAgZGlz cGF0Y2hUYXNrVG9NYWluVGhyZWFkKAogICAgICAgICBjcmVhdGVDYWxsYmFja1Rhc2soJmNyZWF0 ZUZpbGVPbk1haW5UaHJlYWQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBBbGxvd0Nyb3Nz VGhyZWFkQWNjZXNzKGZpbGVTeXN0ZW0pLCBwYXRoLCBleGNsdXNpdmUsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICBBbGxvd0Nyb3NzVGhyZWFkQWNjZXNzKHRoaXMpLCBtb2RlKSk7CisgICAg ICAgICAgICAgICAgICAgICAgICAgICB0aGlzLCBtb2RlKSk7CiB9CiAKIHZvaWQgV29ya2VyRmls ZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6cG9zdENyZWF0ZURpcmVjdG9yeVRvTWFpblRocmVhZChX ZWJGaWxlU3lzdGVtKiBmaWxlU3lzdGVtLCBjb25zdCBLVVJMJiBwYXRoLCBib29sIGV4Y2x1c2l2 ZSwgY29uc3QgU3RyaW5nJiBtb2RlKQpAQCAtMjYxLDcgKzI1OSw3IEBAIHZvaWQgV29ya2VyRmls ZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6cG9zdENyZWF0ZURpcmVjdG9yeVRvTWFpblRocmVhZChX ZWJGaWxlU3lzCiAgICAgZGlzcGF0Y2hUYXNrVG9NYWluVGhyZWFkKAogICAgICAgICBjcmVhdGVD YWxsYmFja1Rhc2soJmNyZWF0ZURpcmVjdG9yeU9uTWFpblRocmVhZCwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgIEFsbG93Q3Jvc3NUaHJlYWRBY2Nlc3MoZmlsZVN5c3RlbSksIHBhdGgsIGV4 Y2x1c2l2ZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgIEFsbG93Q3Jvc3NUaHJlYWRBY2Nl c3ModGhpcyksIG1vZGUpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMsIG1vZGUp KTsKIH0KIAogdm9pZCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpwb3N0RmlsZUV4 aXN0c1RvTWFpblRocmVhZChXZWJGaWxlU3lzdGVtKiBmaWxlU3lzdGVtLCBjb25zdCBLVVJMJiBw YXRoLCBjb25zdCBTdHJpbmcmIG1vZGUpCkBAIC0yNzAsNyArMjY4LDcgQEAgdm9pZCBXb3JrZXJG aWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpwb3N0RmlsZUV4aXN0c1RvTWFpblRocmVhZChXZWJG aWxlU3lzdGVtKgogICAgIGRpc3BhdGNoVGFza1RvTWFpblRocmVhZCgKICAgICAgICAgY3JlYXRl Q2FsbGJhY2tUYXNrKCZmaWxlRXhpc3RzT25NYWluVGhyZWFkLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgQWxsb3dDcm9zc1RocmVhZEFjY2VzcyhmaWxlU3lzdGVtKSwgcGF0aCwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgIEFsbG93Q3Jvc3NUaHJlYWRBY2Nlc3ModGhpcyksIG1vZGUp KTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMsIG1vZGUpKTsKIH0KIAogdm9pZCBX b3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpwb3N0RGlyZWN0b3J5RXhpc3RzVG9NYWlu VGhyZWFkKFdlYkZpbGVTeXN0ZW0qIGZpbGVTeXN0ZW0sIGNvbnN0IEtVUkwmIHBhdGgsIGNvbnN0 IFN0cmluZyYgbW9kZSkKQEAgLTI3OSw3ICsyNzcsNyBAQCB2b2lkIFdvcmtlckZpbGVTeXN0ZW1D YWxsYmFja3NCcmlkZ2U6OnBvc3REaXJlY3RvcnlFeGlzdHNUb01haW5UaHJlYWQoV2ViRmlsZVN5 cwogICAgIGRpc3BhdGNoVGFza1RvTWFpblRocmVhZCgKICAgICAgICAgY3JlYXRlQ2FsbGJhY2tU YXNrKCZkaXJlY3RvcnlFeGlzdHNPbk1haW5UaHJlYWQsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICBBbGxvd0Nyb3NzVGhyZWFkQWNjZXNzKGZpbGVTeXN0ZW0pLCBwYXRoLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgQWxsb3dDcm9zc1RocmVhZEFjY2Vzcyh0aGlzKSwgbW9kZSkpOwor ICAgICAgICAgICAgICAgICAgICAgICAgICAgdGhpcywgbW9kZSkpOwogfQogCiB2b2lkIFdvcmtl ckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U6OnBvc3RSZWFkRGlyZWN0b3J5VG9NYWluVGhyZWFk KFdlYkZpbGVTeXN0ZW0qIGZpbGVTeXN0ZW0sIGNvbnN0IEtVUkwmIHBhdGgsIGNvbnN0IFN0cmlu ZyYgbW9kZSkKQEAgLTI4OCwxMCArMjg2LDEwIEBAIHZvaWQgV29ya2VyRmlsZVN5c3RlbUNhbGxi YWNrc0JyaWRnZTo6cG9zdFJlYWREaXJlY3RvcnlUb01haW5UaHJlYWQoV2ViRmlsZVN5c3RlCiAg ICAgZGlzcGF0Y2hUYXNrVG9NYWluVGhyZWFkKAogICAgICAgICBjcmVhdGVDYWxsYmFja1Rhc2so JnJlYWREaXJlY3RvcnlPbk1haW5UaHJlYWQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBB bGxvd0Nyb3NzVGhyZWFkQWNjZXNzKGZpbGVTeXN0ZW0pLCBwYXRoLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgQWxsb3dDcm9zc1RocmVhZEFjY2Vzcyh0aGlzKSwgbW9kZSkpOworICAgICAg ICAgICAgICAgICAgICAgICAgICAgdGhpcywgbW9kZSkpOwogfQogCi12b2lkIFdvcmtlckZpbGVT eXN0ZW1DYWxsYmFja3NCcmlkZ2U6Om9wZW5GaWxlU3lzdGVtT25NYWluVGhyZWFkKFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQqLCBXZWJDb21tb25Xb3JrZXJDbGllbnQqIGNvbW1vbkNsaWVudCwgV2Vi RmlsZVN5c3RlbTo6VHlwZSB0eXBlLCBsb25nIGxvbmcgc2l6ZSwgYm9vbCBjcmVhdGUsIFdvcmtl ckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UqIGJyaWRnZSwgY29uc3QgU3RyaW5nJiBtb2RlKQor dm9pZCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpvcGVuRmlsZVN5c3RlbU9uTWFp blRocmVhZChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgV2ViQ29tbW9uV29ya2VyQ2xpZW50KiBj b21tb25DbGllbnQsIFdlYkZpbGVTeXN0ZW06OlR5cGUgdHlwZSwgbG9uZyBsb25nIHNpemUsIGJv b2wgY3JlYXRlLCBQYXNzUmVmUHRyPFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U+IGJy aWRnZSwgY29uc3QgU3RyaW5nJiBtb2RlKQogewogICAgIGlmICghY29tbW9uQ2xpZW50KQogICAg ICAgICBicmlkZ2UtPmRpZEZhaWxPbk1haW5UaHJlYWQoV2ViRmlsZUVycm9yQWJvcnQsIG1vZGUp OwpAQCAtMzAwLDgyICsyOTgsODIgQEAgdm9pZCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJp ZGdlOjpvcGVuRmlsZVN5c3RlbU9uTWFpblRocmVhZChTY3JpcHRFeGVjdXRpb24KICAgICB9CiB9 CiAKLXZvaWQgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6bW92ZU9uTWFpblRocmVh ZChXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgV2ViRmlsZVN5c3RlbSogZmlsZVN5 c3RlbSwgY29uc3QgS1VSTCYgc291cmNlUGF0aCwgY29uc3QgS1VSTCYgZGVzdGluYXRpb25QYXRo LCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlKiBicmlkZ2UsIGNvbnN0IFN0cmluZyYg bW9kZSkKK3ZvaWQgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6bW92ZU9uTWFpblRo cmVhZChXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgV2ViRmlsZVN5c3RlbSogZmls ZVN5c3RlbSwgY29uc3QgS1VSTCYgc291cmNlUGF0aCwgY29uc3QgS1VSTCYgZGVzdGluYXRpb25Q YXRoLCBQYXNzUmVmUHRyPFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U+IGJyaWRnZSwg Y29uc3QgU3RyaW5nJiBtb2RlKQogewogICAgIGZpbGVTeXN0ZW0tPm1vdmUoc291cmNlUGF0aCwg ZGVzdGluYXRpb25QYXRoLCBNYWluVGhyZWFkRmlsZVN5c3RlbUNhbGxiYWNrczo6Y3JlYXRlTGVh a2VkUHRyKGJyaWRnZSwgbW9kZSkpOwogfQogCi12b2lkIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFj a3NCcmlkZ2U6OmNvcHlPbk1haW5UaHJlYWQoV2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4 dCosIFdlYkZpbGVTeXN0ZW0qIGZpbGVTeXN0ZW0sIGNvbnN0IEtVUkwmIHNvdXJjZVBhdGgsIGNv bnN0IEtVUkwmIGRlc3RpbmF0aW9uUGF0aCwgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRn ZSogYnJpZGdlLCBjb25zdCBTdHJpbmcmIG1vZGUpCit2b2lkIFdvcmtlckZpbGVTeXN0ZW1DYWxs YmFja3NCcmlkZ2U6OmNvcHlPbk1haW5UaHJlYWQoV2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9uQ29u dGV4dCosIFdlYkZpbGVTeXN0ZW0qIGZpbGVTeXN0ZW0sIGNvbnN0IEtVUkwmIHNvdXJjZVBhdGgs IGNvbnN0IEtVUkwmIGRlc3RpbmF0aW9uUGF0aCwgUGFzc1JlZlB0cjxXb3JrZXJGaWxlU3lzdGVt Q2FsbGJhY2tzQnJpZGdlPiBicmlkZ2UsIGNvbnN0IFN0cmluZyYgbW9kZSkKIHsKICAgICBmaWxl U3lzdGVtLT5jb3B5KHNvdXJjZVBhdGgsIGRlc3RpbmF0aW9uUGF0aCwgTWFpblRocmVhZEZpbGVT eXN0ZW1DYWxsYmFja3M6OmNyZWF0ZUxlYWtlZFB0cihicmlkZ2UsIG1vZGUpKTsKIH0KIAotdm9p ZCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpyZW1vdmVPbk1haW5UaHJlYWQoV2Vi Q29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFdlYkZpbGVTeXN0ZW0qIGZpbGVTeXN0ZW0s IGNvbnN0IEtVUkwmIHBhdGgsIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UqIGJyaWRn ZSwgY29uc3QgU3RyaW5nJiBtb2RlKQordm9pZCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJp ZGdlOjpyZW1vdmVPbk1haW5UaHJlYWQoV2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4dCos IFdlYkZpbGVTeXN0ZW0qIGZpbGVTeXN0ZW0sIGNvbnN0IEtVUkwmIHBhdGgsIFBhc3NSZWZQdHI8 V29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZT4gYnJpZGdlLCBjb25zdCBTdHJpbmcmIG1v ZGUpCiB7CiAgICAgZmlsZVN5c3RlbS0+cmVtb3ZlKHBhdGgsIE1haW5UaHJlYWRGaWxlU3lzdGVt Q2FsbGJhY2tzOjpjcmVhdGVMZWFrZWRQdHIoYnJpZGdlLCBtb2RlKSk7CiB9CiAKLXZvaWQgV29y a2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6cmVtb3ZlUmVjdXJzaXZlbHlPbk1haW5UaHJl YWQoV2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFdlYkZpbGVTeXN0ZW0qIGZpbGVT eXN0ZW0sIGNvbnN0IEtVUkwmIHBhdGgsIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2Uq IGJyaWRnZSwgY29uc3QgU3RyaW5nJiBtb2RlKQordm9pZCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJh Y2tzQnJpZGdlOjpyZW1vdmVSZWN1cnNpdmVseU9uTWFpblRocmVhZChXZWJDb3JlOjpTY3JpcHRF eGVjdXRpb25Db250ZXh0KiwgV2ViRmlsZVN5c3RlbSogZmlsZVN5c3RlbSwgY29uc3QgS1VSTCYg cGF0aCwgUGFzc1JlZlB0cjxXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlPiBicmlkZ2Us IGNvbnN0IFN0cmluZyYgbW9kZSkKIHsKICAgICBmaWxlU3lzdGVtLT5yZW1vdmVSZWN1cnNpdmVs eShwYXRoLCBNYWluVGhyZWFkRmlsZVN5c3RlbUNhbGxiYWNrczo6Y3JlYXRlTGVha2VkUHRyKGJy aWRnZSwgbW9kZSkpOwogfQogCi12b2lkIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U6 OnJlYWRNZXRhZGF0YU9uTWFpblRocmVhZChXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25Db250ZXh0 KiwgV2ViRmlsZVN5c3RlbSogZmlsZVN5c3RlbSwgY29uc3QgS1VSTCYgcGF0aCwgV29ya2VyRmls ZVN5c3RlbUNhbGxiYWNrc0JyaWRnZSogYnJpZGdlLCBjb25zdCBTdHJpbmcmIG1vZGUpCit2b2lk IFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U6OnJlYWRNZXRhZGF0YU9uTWFpblRocmVh ZChXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgV2ViRmlsZVN5c3RlbSogZmlsZVN5 c3RlbSwgY29uc3QgS1VSTCYgcGF0aCwgUGFzc1JlZlB0cjxXb3JrZXJGaWxlU3lzdGVtQ2FsbGJh Y2tzQnJpZGdlPiBicmlkZ2UsIGNvbnN0IFN0cmluZyYgbW9kZSkKIHsKICAgICBmaWxlU3lzdGVt LT5yZWFkTWV0YWRhdGEocGF0aCwgTWFpblRocmVhZEZpbGVTeXN0ZW1DYWxsYmFja3M6OmNyZWF0 ZUxlYWtlZFB0cihicmlkZ2UsIG1vZGUpKTsKIH0KIAotdm9pZCBXb3JrZXJGaWxlU3lzdGVtQ2Fs bGJhY2tzQnJpZGdlOjpjcmVhdGVGaWxlT25NYWluVGhyZWFkKFdlYkNvcmU6OlNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQqLCBXZWJGaWxlU3lzdGVtKiBmaWxlU3lzdGVtLCBjb25zdCBLVVJMJiBwYXRo LCBib29sIGV4Y2x1c2l2ZSwgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZSogYnJpZGdl LCBjb25zdCBTdHJpbmcmIG1vZGUpCit2b2lkIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlk Z2U6OmNyZWF0ZUZpbGVPbk1haW5UaHJlYWQoV2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4 dCosIFdlYkZpbGVTeXN0ZW0qIGZpbGVTeXN0ZW0sIGNvbnN0IEtVUkwmIHBhdGgsIGJvb2wgZXhj bHVzaXZlLCBQYXNzUmVmUHRyPFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U+IGJyaWRn ZSwgY29uc3QgU3RyaW5nJiBtb2RlKQogewogICAgIGZpbGVTeXN0ZW0tPmNyZWF0ZUZpbGUocGF0 aCwgZXhjbHVzaXZlLCBNYWluVGhyZWFkRmlsZVN5c3RlbUNhbGxiYWNrczo6Y3JlYXRlTGVha2Vk UHRyKGJyaWRnZSwgbW9kZSkpOwogfQogCi12b2lkIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NC cmlkZ2U6OmNyZWF0ZURpcmVjdG9yeU9uTWFpblRocmVhZChXZWJDb3JlOjpTY3JpcHRFeGVjdXRp b25Db250ZXh0KiwgV2ViRmlsZVN5c3RlbSogZmlsZVN5c3RlbSwgY29uc3QgS1VSTCYgcGF0aCwg Ym9vbCBleGNsdXNpdmUsIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UqIGJyaWRnZSwg Y29uc3QgU3RyaW5nJiBtb2RlKQordm9pZCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdl OjpjcmVhdGVEaXJlY3RvcnlPbk1haW5UaHJlYWQoV2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9uQ29u dGV4dCosIFdlYkZpbGVTeXN0ZW0qIGZpbGVTeXN0ZW0sIGNvbnN0IEtVUkwmIHBhdGgsIGJvb2wg ZXhjbHVzaXZlLCBQYXNzUmVmUHRyPFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U+IGJy aWRnZSwgY29uc3QgU3RyaW5nJiBtb2RlKQogewogICAgIGZpbGVTeXN0ZW0tPmNyZWF0ZURpcmVj dG9yeShwYXRoLCBleGNsdXNpdmUsIE1haW5UaHJlYWRGaWxlU3lzdGVtQ2FsbGJhY2tzOjpjcmVh dGVMZWFrZWRQdHIoYnJpZGdlLCBtb2RlKSk7CiB9CiAKLXZvaWQgV29ya2VyRmlsZVN5c3RlbUNh bGxiYWNrc0JyaWRnZTo6ZmlsZUV4aXN0c09uTWFpblRocmVhZChXZWJDb3JlOjpTY3JpcHRFeGVj dXRpb25Db250ZXh0KiwgV2ViRmlsZVN5c3RlbSogZmlsZVN5c3RlbSwgY29uc3QgS1VSTCYgcGF0 aCwgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZSogYnJpZGdlLCBjb25zdCBTdHJpbmcm IG1vZGUpCit2b2lkIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U6OmZpbGVFeGlzdHNP bk1haW5UaHJlYWQoV2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFdlYkZpbGVTeXN0 ZW0qIGZpbGVTeXN0ZW0sIGNvbnN0IEtVUkwmIHBhdGgsIFBhc3NSZWZQdHI8V29ya2VyRmlsZVN5 c3RlbUNhbGxiYWNrc0JyaWRnZT4gYnJpZGdlLCBjb25zdCBTdHJpbmcmIG1vZGUpCiB7CiAgICAg ZmlsZVN5c3RlbS0+ZmlsZUV4aXN0cyhwYXRoLCBNYWluVGhyZWFkRmlsZVN5c3RlbUNhbGxiYWNr czo6Y3JlYXRlTGVha2VkUHRyKGJyaWRnZSwgbW9kZSkpOwogfQogCi12b2lkIFdvcmtlckZpbGVT eXN0ZW1DYWxsYmFja3NCcmlkZ2U6OmRpcmVjdG9yeUV4aXN0c09uTWFpblRocmVhZChXZWJDb3Jl OjpTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgV2ViRmlsZVN5c3RlbSogZmlsZVN5c3RlbSwgY29u c3QgS1VSTCYgcGF0aCwgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZSogYnJpZGdlLCBj b25zdCBTdHJpbmcmIG1vZGUpCit2b2lkIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U6 OmRpcmVjdG9yeUV4aXN0c09uTWFpblRocmVhZChXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25Db250 ZXh0KiwgV2ViRmlsZVN5c3RlbSogZmlsZVN5c3RlbSwgY29uc3QgS1VSTCYgcGF0aCwgUGFzc1Jl ZlB0cjxXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlPiBicmlkZ2UsIGNvbnN0IFN0cmlu ZyYgbW9kZSkKIHsKICAgICBmaWxlU3lzdGVtLT5kaXJlY3RvcnlFeGlzdHMocGF0aCwgTWFpblRo cmVhZEZpbGVTeXN0ZW1DYWxsYmFja3M6OmNyZWF0ZUxlYWtlZFB0cihicmlkZ2UsIG1vZGUpKTsK IH0KIAotdm9pZCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpyZWFkRGlyZWN0b3J5 T25NYWluVGhyZWFkKFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBXZWJGaWxlU3lz dGVtKiBmaWxlU3lzdGVtLCBjb25zdCBLVVJMJiBwYXRoLCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJh Y2tzQnJpZGdlKiBicmlkZ2UsIGNvbnN0IFN0cmluZyYgbW9kZSkKK3ZvaWQgV29ya2VyRmlsZVN5 c3RlbUNhbGxiYWNrc0JyaWRnZTo6cmVhZERpcmVjdG9yeU9uTWFpblRocmVhZChXZWJDb3JlOjpT Y3JpcHRFeGVjdXRpb25Db250ZXh0KiwgV2ViRmlsZVN5c3RlbSogZmlsZVN5c3RlbSwgY29uc3Qg S1VSTCYgcGF0aCwgUGFzc1JlZlB0cjxXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlPiBi cmlkZ2UsIGNvbnN0IFN0cmluZyYgbW9kZSkKIHsKICAgICBmaWxlU3lzdGVtLT5yZWFkRGlyZWN0 b3J5KHBhdGgsIE1haW5UaHJlYWRGaWxlU3lzdGVtQ2FsbGJhY2tzOjpjcmVhdGVMZWFrZWRQdHIo YnJpZGdlLCBtb2RlKSk7CiB9CiAKIHZvaWQgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRn ZTo6ZGlkRmFpbE9uTWFpblRocmVhZChXZWJGaWxlRXJyb3IgZXJyb3IsIGNvbnN0IFN0cmluZyYg bW9kZSkKIHsKLSAgICBtYXlQb3N0VGFza1RvV29ya2VyKGNyZWF0ZUNhbGxiYWNrVGFzaygmZGlk RmFpbE9uV29ya2VyVGhyZWFkLCBBbGxvd0Nyb3NzVGhyZWFkQWNjZXNzKHRoaXMpLCBlcnJvciks IG1vZGUpOworICAgIG1heVBvc3RUYXNrVG9Xb3JrZXIoY3JlYXRlQ2FsbGJhY2tUYXNrKCZkaWRG YWlsT25Xb3JrZXJUaHJlYWQsIHRoaXMsIGVycm9yKSwgbW9kZSk7CiB9CiAKIHZvaWQgV29ya2Vy RmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6ZGlkT3BlbkZpbGVTeXN0ZW1Pbk1haW5UaHJlYWQo Y29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBLVVJMJiByb290VVJMLCBjb25zdCBTdHJpbmcmIG1v ZGUpCiB7CiAgICAgbWF5UG9zdFRhc2tUb1dvcmtlcihjcmVhdGVDYWxsYmFja1Rhc2soJmRpZE9w ZW5GaWxlU3lzdGVtT25Xb3JrZXJUaHJlYWQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgQWxsb3dDcm9zc1RocmVhZEFjY2Vzcyh0aGlzKSwgbmFtZSwgcm9vdFVS TCksIG1vZGUpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRo aXMsIG5hbWUsIHJvb3RVUkwpLCBtb2RlKTsKIH0KIAogdm9pZCBXb3JrZXJGaWxlU3lzdGVtQ2Fs bGJhY2tzQnJpZGdlOjpkaWRTdWNjZWVkT25NYWluVGhyZWFkKGNvbnN0IFN0cmluZyYgbW9kZSkK IHsKLSAgICBtYXlQb3N0VGFza1RvV29ya2VyKGNyZWF0ZUNhbGxiYWNrVGFzaygmZGlkU3VjY2Vl ZE9uV29ya2VyVGhyZWFkLCBBbGxvd0Nyb3NzVGhyZWFkQWNjZXNzKHRoaXMpKSwgbW9kZSk7Cisg ICAgbWF5UG9zdFRhc2tUb1dvcmtlcihjcmVhdGVDYWxsYmFja1Rhc2soJmRpZFN1Y2NlZWRPbldv cmtlclRocmVhZCwgdGhpcyksIG1vZGUpOwogfQogCiB2b2lkIFdvcmtlckZpbGVTeXN0ZW1DYWxs YmFja3NCcmlkZ2U6OmRpZFJlYWRNZXRhZGF0YU9uTWFpblRocmVhZChjb25zdCBXZWJGaWxlSW5m byYgaW5mbywgY29uc3QgU3RyaW5nJiBtb2RlKQogewotICAgIG1heVBvc3RUYXNrVG9Xb3JrZXIo Y3JlYXRlQ2FsbGJhY2tUYXNrKCZkaWRSZWFkTWV0YWRhdGFPbldvcmtlclRocmVhZCwgQWxsb3dD cm9zc1RocmVhZEFjY2Vzcyh0aGlzKSwgaW5mbyksIG1vZGUpOworICAgIG1heVBvc3RUYXNrVG9X b3JrZXIoY3JlYXRlQ2FsbGJhY2tUYXNrKCZkaWRSZWFkTWV0YWRhdGFPbldvcmtlclRocmVhZCwg dGhpcywgaW5mbyksIG1vZGUpOwogfQogCiB2b2lkIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NC cmlkZ2U6OmRpZFJlYWREaXJlY3RvcnlPbk1haW5UaHJlYWQoY29uc3QgV2ViVmVjdG9yPFdlYkZp bGVTeXN0ZW1FbnRyeT4mIGVudHJpZXMsIGJvb2wgaGFzTW9yZSwgY29uc3QgU3RyaW5nJiBtb2Rl KQogewogICAgIG1heVBvc3RUYXNrVG9Xb3JrZXIoCiAgICAgICAgIGNyZWF0ZUNhbGxiYWNrVGFz aygmZGlkUmVhZERpcmVjdG9yeU9uV29ya2VyVGhyZWFkLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgQWxsb3dDcm9zc1RocmVhZEFjY2Vzcyh0aGlzKSwgZW50cmllcywgaGFzTW9yZSksIG1v ZGUpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgdGhpcywgZW50cmllcywgaGFzTW9yZSks IG1vZGUpOwogfQogCiBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpXb3JrZXJGaWxl U3lzdGVtQ2FsbGJhY2tzQnJpZGdlKFdlYkNvcmU6OldvcmtlckxvYWRlclByb3h5KiB3b3JrZXJM b2FkZXJQcm94eSwgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogc2NyaXB0RXhlY3V0aW9uQ29udGV4 dCwgV2ViRmlsZVN5c3RlbUNhbGxiYWNrcyogY2FsbGJhY2tzKQpAQCAtMzkyLDI3ICszOTAsMjcg QEAgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6fldvcmtlckZpbGVTeXN0ZW1DYWxs YmFja3NCcmlkZ2UoKQogICAgIEFTU0VSVCghbV9jYWxsYmFja3NPbldvcmtlclRocmVhZCk7CiB9 CiAKLXZvaWQgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6ZGlkRmFpbE9uV29ya2Vy VGhyZWFkKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tz QnJpZGdlKiBicmlkZ2UsIFdlYkZpbGVFcnJvciBlcnJvcikKK3ZvaWQgV29ya2VyRmlsZVN5c3Rl bUNhbGxiYWNrc0JyaWRnZTo6ZGlkRmFpbE9uV29ya2VyVGhyZWFkKFNjcmlwdEV4ZWN1dGlvbkNv bnRleHQqLCBQYXNzUmVmUHRyPFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U+IGJyaWRn ZSwgV2ViRmlsZUVycm9yIGVycm9yKQogewogICAgIGJyaWRnZS0+bV9jYWxsYmFja3NPbldvcmtl clRocmVhZC0+ZGlkRmFpbChlcnJvcik7CiB9CiAKLXZvaWQgV29ya2VyRmlsZVN5c3RlbUNhbGxi YWNrc0JyaWRnZTo6ZGlkT3BlbkZpbGVTeXN0ZW1PbldvcmtlclRocmVhZChTY3JpcHRFeGVjdXRp b25Db250ZXh0KiwgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZSogYnJpZGdlLCBjb25z dCBTdHJpbmcmIG5hbWUsIGNvbnN0IEtVUkwmIHJvb3RVUkwpCit2b2lkIFdvcmtlckZpbGVTeXN0 ZW1DYWxsYmFja3NCcmlkZ2U6OmRpZE9wZW5GaWxlU3lzdGVtT25Xb3JrZXJUaHJlYWQoU2NyaXB0 RXhlY3V0aW9uQ29udGV4dCosIFBhc3NSZWZQdHI8V29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0Jy aWRnZT4gYnJpZGdlLCBjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IEtVUkwmIHJvb3RVUkwpCiB7 CiAgICAgYnJpZGdlLT5tX2NhbGxiYWNrc09uV29ya2VyVGhyZWFkLT5kaWRPcGVuRmlsZVN5c3Rl bShuYW1lLCByb290VVJMKTsKIH0KIAotdm9pZCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJp ZGdlOjpkaWRTdWNjZWVkT25Xb3JrZXJUaHJlYWQoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFdv cmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UqIGJyaWRnZSkKK3ZvaWQgV29ya2VyRmlsZVN5 c3RlbUNhbGxiYWNrc0JyaWRnZTo6ZGlkU3VjY2VlZE9uV29ya2VyVGhyZWFkKFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQqLCBQYXNzUmVmUHRyPFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U+ IGJyaWRnZSkKIHsKICAgICBicmlkZ2UtPm1fY2FsbGJhY2tzT25Xb3JrZXJUaHJlYWQtPmRpZFN1 Y2NlZWQoKTsKIH0KIAotdm9pZCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpkaWRS ZWFkTWV0YWRhdGFPbldvcmtlclRocmVhZChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgV29ya2Vy RmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZSogYnJpZGdlLCBjb25zdCBXZWJGaWxlSW5mbyYgaW5m bykKK3ZvaWQgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6ZGlkUmVhZE1ldGFkYXRh T25Xb3JrZXJUaHJlYWQoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFBhc3NSZWZQdHI8V29ya2Vy RmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZT4gYnJpZGdlLCBjb25zdCBXZWJGaWxlSW5mbyYgaW5m bykKIHsKICAgICBicmlkZ2UtPm1fY2FsbGJhY2tzT25Xb3JrZXJUaHJlYWQtPmRpZFJlYWRNZXRh ZGF0YShpbmZvKTsKIH0KIAotdm9pZCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpk aWRSZWFkRGlyZWN0b3J5T25Xb3JrZXJUaHJlYWQoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFdv cmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UqIGJyaWRnZSwgY29uc3QgV2ViVmVjdG9yPFdl YkZpbGVTeXN0ZW1FbnRyeT4mIGVudHJpZXMsIGJvb2wgaGFzTW9yZSkKK3ZvaWQgV29ya2VyRmls ZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6ZGlkUmVhZERpcmVjdG9yeU9uV29ya2VyVGhyZWFkKFNj cmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBQYXNzUmVmUHRyPFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFj a3NCcmlkZ2U+IGJyaWRnZSwgY29uc3QgV2ViVmVjdG9yPFdlYkZpbGVTeXN0ZW1FbnRyeT4mIGVu dHJpZXMsIGJvb2wgaGFzTW9yZSkKIHsKICAgICBicmlkZ2UtPm1fY2FsbGJhY2tzT25Xb3JrZXJU aHJlYWQtPmRpZFJlYWREaXJlY3RvcnkoZW50cmllcywgaGFzTW9yZSk7CiB9CkBAIC00MjEsMTAg KzQxOSw2IEBAIHZvaWQgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6ZGlkUmVhZERp cmVjdG9yeU9uV29ya2VyVGhyZWFkKFNjcmlwdEV4ZWN1CiB2b2lkIFdvcmtlckZpbGVTeXN0ZW1D YWxsYmFja3NCcmlkZ2U6OnJ1blRhc2tPbk1haW5UaHJlYWQoV2ViQ29yZTo6U2NyaXB0RXhlY3V0 aW9uQ29udGV4dCogc2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgUGFzc1JlZlB0cjxXb3JrZXJGaWxl U3lzdGVtQ2FsbGJhY2tzQnJpZGdlPiBicmlkZ2UsIFBhc3NPd25QdHI8V2ViQ29yZTo6U2NyaXB0 RXhlY3V0aW9uQ29udGV4dDo6VGFzaz4gdGFza1RvUnVuKQogewogICAgIEFTU0VSVChpc01haW5U aHJlYWQoKSk7Ci0KLSAgICAvLyBFdmVyeSB0YXNrIHJ1biB3aWxsIHJlc3VsdCBpbiBvbmUgY2Fs bCB0byBtYXlQb3N0VGFza1RvV29ya2VyLCB3aGljaCBpcyB3aGVyZSB0aGlzIHJlZiBpcyByZWxl YXNlZC4KLSAgICBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlKiBsZWFrZWQgPSBicmlk Z2UubGVha1JlZigpOwotICAgIFVOVVNFRF9QQVJBTShsZWFrZWQpOwogICAgIHRhc2tUb1J1bi0+ cGVyZm9ybVRhc2soc2NyaXB0RXhlY3V0aW9uQ29udGV4dCk7CiB9CiAKQEAgLTQ1MCwxNyArNDQ0 LDEyIEBAIHZvaWQgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6ZGlzcGF0Y2hUYXNr VG9NYWluVGhyZWFkKFBhc3NPd25QdHI8V2ViQ29yCiAKIHZvaWQgV29ya2VyRmlsZVN5c3RlbUNh bGxiYWNrc0JyaWRnZTo6bWF5UG9zdFRhc2tUb1dvcmtlcihQYXNzT3duUHRyPFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQ6OlRhc2s+IHRhc2ssIGNvbnN0IFN0cmluZyYgbW9kZSkKIHsKKyAgICAvLyBS ZWxpZXMgb24gaXRzIGNhbGxlciAoTWFpblRocmVhZEZpbGVTeXN0ZW1DYWxsYmFja3M6ZGlkKikg dG8ga2VlcCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlIGFsaXZlLgogICAgIEFTU0VS VChpc01haW5UaHJlYWQoKSk7CiAKLSAgICAvLyBCYWxhbmNpbmcgb3V0IHRoZSByZWYoKSBkb25l IGluIHJ1blRhc2tPbk1haW5UaHJlYWQuIChTaW5jZSBtX211dGV4IGlzIGEgbWVtYmVyIGFuZCB0 aGUgZGVyZWYgbWF5IHJlc3VsdAotICAgIC8vIGluIHRoZSBkZXN0cnVjdGlvbiBvZiBXb3JrZXJG aWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlLCB0aGUgb3JkZXJpbmcgb2YgdGhlIFJlZlB0ciBhbmQg dGhlIE11dGV4TG9ja2VyCi0gICAgLy8gaXMgdmVyeSBpbXBvcnRhbnQsIHRvIGVuc3VyZSB0aGF0 IHRoZSBtX211dGV4IGlzIHN0aWxsIHZhbGlkIHdoZW4gaXQgZ2V0cyB1bmxvY2tlZC4pCi0gICAg UmVmUHRyPFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U+IGJyaWRnZSA9IGFkb3B0UmVm KHRoaXMpOwogICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX2xvYWRlclByb3h5TXV0ZXgpOwogICAg IGlmIChtX3dvcmtlckxvYWRlclByb3h5KQotICAgICAgICBtX3dvcmtlckxvYWRlclByb3h5LT5w b3N0VGFza0Zvck1vZGVUb1dvcmtlckNvbnRleHQoY3JlYXRlQ2FsbGJhY2tUYXNrKCZydW5UYXNr T25Xb3JrZXJUaHJlYWQsIGJyaWRnZSwgdGFzayksIG1vZGUpOwotCi0gICAgLy8gV29ya2VyRmls ZVN5c3RlbUNhbGxiYWNrc0JyaWRnZSBtYXkgYmUgZGVsZXRlZCBoZXJlIHdoZW4gYnJpZGdlIGdv ZXMgb3V0IG9mIHNjb3BlLgorICAgICAgICBtX3dvcmtlckxvYWRlclByb3h5LT5wb3N0VGFza0Zv ck1vZGVUb1dvcmtlckNvbnRleHQoY3JlYXRlQ2FsbGJhY2tUYXNrKCZydW5UYXNrT25Xb3JrZXJU aHJlYWQsIHRoaXMsIHRhc2spLCBtb2RlKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV29ya2VyRmlsZVN5c3RlbUNh bGxiYWNrc0JyaWRnZS5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV29ya2VyRmlsZVN5 c3RlbUNhbGxiYWNrc0JyaWRnZS5oCmluZGV4IGExNzI1ZDA3YmY1NDg0N2FkNWQzMmI2YzZlNjZi ZDRiNzA2YWMzZTAuLmVhODZjMDcwM2IzMDE2NDQ1Yjg3NDVkYjUwZDQ2M2FkYmQ1NTNlYjkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dvcmtlckZpbGVTeXN0ZW1DYWxs YmFja3NCcmlkZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Xb3JrZXJGaWxl U3lzdGVtQ2FsbGJhY2tzQnJpZGdlLmgKQEAgLTU5LDYgKzU5LDEwIEBAIHN0cnVjdCBXZWJGaWxl U3lzdGVtRW50cnk7CiAKIC8vIFVzZWQgdG8gcG9zdCBhIG9wZW5GaWxlU3lzdGVtIHJlcXVlc3Qg dG8gdGhlIG1haW4gdGhyZWFkIGFuZCBnZXQgY2FsbGVkIGJhY2sgZm9yIHRoZSByZXF1ZXN0Lgog Ly8KKy8vIExpZmV0aW1lIGZvciB0aGlzIGNsYXNzIGlzIG1haW50YWluZWQgYnkgdGhlIHRhc2tz IHBvc3RlZCB3aGljaCByZWYgY291bnQgaXQgYW5kIGJ5IE1haW5UaHJlYWRGaWxlU3lzdGVtQ2Fs bGJhY2tzLgorLy8gRWl0aGVyIG9uZSBhIHRhc2sgZmluaXNoaW5nIG9yIHRoZSBNYWluVGhyZWFk RmlsZVN5c3RlbUNhbGxiYWNrcyBiZWluZyBkZWxldGVkIG1heSBjYXVzZSB0aGUgbGFzdCByZWYg b24KKy8vIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UgdG8gZ28gYXdheS4KKy8vCiAv LyBBIHR5cGljYWwgZmxvdyBmb3Igb3BlbkZpbGVTeXN0ZW0gd291bGQgbG9vayBsaWtlIHRoaXM6 CiAvLyBCcmlkZ2U6OnBvc3RPcGVuRmlsZVN5c3RlbVRvTWFpblRocmVhZCgpIG9uIFdvcmtlclRo cmVhZAogLy8gIC0tPiBCcmlkZ2U6Om9wZW5GaWxlU3lzdGVtT25NYWluVGhyZWFkKCkgaXMgY2Fs bGVkIG9uIE1haW5UaHJlYWQKQEAgLTY3LDggKzcxLDcgQEAgc3RydWN0IFdlYkZpbGVTeXN0ZW1F bnRyeTsKIC8vICAtLT4gTWFpblRocmVhZEZpbGVTeXN0ZW1DYWxsYmFja3M6OmRpZFh4eCBpcyBj YWxsZWQgb24gTWFpblRocmVhZAogLy8gIC0tPiBCcmlkZ2U6OmRpZFh4eE9uTWFpblRocmVhZCBp cyBjYWxsZWQgb24gTWFpblRocmVhZAogLy8gIC0tPiBCcmlkZ2U6OmRpZFh4eE9uV29ya2VyVGhy ZWFkIGlzIGNhbGxlZCBvbiBXb3JrZXJUaHJlYWQKLS8vICAgICAgVGhpcyBjYWxscyB0aGUgb3Jp Z2luYWwgY2FsbGJhY2tzIChtX2NhbGxiYWNrc09uV29ya2VyVGhyZWFkKSBhbmQKLS8vICAgICAg cmVsZWFzZXMgYSBzZWxmLXJlZmVyZW5jZSB0byB0aGUgYnJpZGdlLgorLy8gICAgICBUaGlzIGNh bGxzIHRoZSBvcmlnaW5hbCBjYWxsYmFja3MgKG1fY2FsbGJhY2tzT25Xb3JrZXJUaHJlYWQpLgog Y2xhc3MgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZSA6IHB1YmxpYyBUaHJlYWRTYWZl UmVmQ291bnRlZDxXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlPiB7CiBwdWJsaWM6CiAg ICAgdm9pZCBzdG9wKCk7CkBAIC0xMDUsMjYgKzEwOCwyNiBAQCBwcml2YXRlOgogICAgIH5Xb3Jr ZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlKCk7CiAKICAgICAvLyBNZXRob2RzIHRoYXQgYXJl IHRvIGJlIGNhbGxlZCBvbiB0aGUgbWFpbiB0aHJlYWQuCi0gICAgc3RhdGljIHZvaWQgb3BlbkZp bGVTeXN0ZW1Pbk1haW5UaHJlYWQoV2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFdl YkNvbW1vbldvcmtlckNsaWVudCosIFdlYkZpbGVTeXN0ZW06OlR5cGUsIGxvbmcgbG9uZyBzaXpl LCBib29sIGNyZWF0ZSwgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZSosIGNvbnN0IFN0 cmluZyYgbW9kZSk7Ci0gICAgc3RhdGljIHZvaWQgbW92ZU9uTWFpblRocmVhZChXZWJDb3JlOjpT Y3JpcHRFeGVjdXRpb25Db250ZXh0KiwgV2ViRmlsZVN5c3RlbSosIGNvbnN0IFdlYkNvcmU6OktV UkwmIHNyY1BhdGgsIGNvbnN0IFdlYkNvcmU6OktVUkwmIGRlc3RQYXRoLCBXb3JrZXJGaWxlU3lz dGVtQ2FsbGJhY2tzQnJpZGdlKiwgY29uc3QgU3RyaW5nJiBtb2RlKTsKLSAgICBzdGF0aWMgdm9p ZCBjb3B5T25NYWluVGhyZWFkKFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBXZWJG aWxlU3lzdGVtKiwgY29uc3QgV2ViQ29yZTo6S1VSTCYgc3JjUGF0aCwgY29uc3QgV2ViQ29yZTo6 S1VSTCYgZGVzdFBhdGgsIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UqLCBjb25zdCBT dHJpbmcmIG1vZGUpOwotICAgIHN0YXRpYyB2b2lkIHJlbW92ZU9uTWFpblRocmVhZChXZWJDb3Jl OjpTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgV2ViRmlsZVN5c3RlbSosIGNvbnN0IFdlYkNvcmU6 OktVUkwmIHBhdGgsIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UqLCBjb25zdCBTdHJp bmcmIG1vZGUpOwotICAgIHN0YXRpYyB2b2lkIHJlbW92ZVJlY3Vyc2l2ZWx5T25NYWluVGhyZWFk KFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBXZWJGaWxlU3lzdGVtKiwgY29uc3Qg V2ViQ29yZTo6S1VSTCYgcGF0aCwgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZSosIGNv bnN0IFN0cmluZyYgbW9kZSk7Ci0gICAgc3RhdGljIHZvaWQgcmVhZE1ldGFkYXRhT25NYWluVGhy ZWFkKFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBXZWJGaWxlU3lzdGVtKiwgY29u c3QgV2ViQ29yZTo6S1VSTCYgcGF0aCwgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZSos IGNvbnN0IFN0cmluZyYgbW9kZSk7Ci0gICAgc3RhdGljIHZvaWQgY3JlYXRlRmlsZU9uTWFpblRo cmVhZChXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgV2ViRmlsZVN5c3RlbSosIGNv bnN0IFdlYkNvcmU6OktVUkwmIHBhdGgsIGJvb2wgZXhjbHVzaXZlLCBXb3JrZXJGaWxlU3lzdGVt Q2FsbGJhY2tzQnJpZGdlKiwgY29uc3QgU3RyaW5nJiBtb2RlKTsKLSAgICBzdGF0aWMgdm9pZCBj cmVhdGVEaXJlY3RvcnlPbk1haW5UaHJlYWQoV2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4 dCosIFdlYkZpbGVTeXN0ZW0qLCBjb25zdCBXZWJDb3JlOjpLVVJMJiBwYXRoLCBib29sIGV4Y2x1 c2l2ZSwgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZSosIGNvbnN0IFN0cmluZyYgbW9k ZSk7Ci0gICAgc3RhdGljIHZvaWQgZmlsZUV4aXN0c09uTWFpblRocmVhZChXZWJDb3JlOjpTY3Jp cHRFeGVjdXRpb25Db250ZXh0KiwgV2ViRmlsZVN5c3RlbSosIGNvbnN0IFdlYkNvcmU6OktVUkwm IHBhdGgsIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UqLCBjb25zdCBTdHJpbmcmIG1v ZGUpOwotICAgIHN0YXRpYyB2b2lkIGRpcmVjdG9yeUV4aXN0c09uTWFpblRocmVhZChXZWJDb3Jl OjpTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgV2ViRmlsZVN5c3RlbSosIGNvbnN0IFdlYkNvcmU6 OktVUkwmIHBhdGgsIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UqLCBjb25zdCBTdHJp bmcmIG1vZGUpOwotICAgIHN0YXRpYyB2b2lkIHJlYWREaXJlY3RvcnlPbk1haW5UaHJlYWQoV2Vi Q29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFdlYkZpbGVTeXN0ZW0qLCBjb25zdCBXZWJD b3JlOjpLVVJMJiBwYXRoLCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlKiwgY29uc3Qg U3RyaW5nJiBtb2RlKTsKKyAgICBzdGF0aWMgdm9pZCBvcGVuRmlsZVN5c3RlbU9uTWFpblRocmVh ZChXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgV2ViQ29tbW9uV29ya2VyQ2xpZW50 KiwgV2ViRmlsZVN5c3RlbTo6VHlwZSwgbG9uZyBsb25nIHNpemUsIGJvb2wgY3JlYXRlLCBQYXNz UmVmUHRyPFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U+LCBjb25zdCBTdHJpbmcmIG1v ZGUpOworICAgIHN0YXRpYyB2b2lkIG1vdmVPbk1haW5UaHJlYWQoV2ViQ29yZTo6U2NyaXB0RXhl Y3V0aW9uQ29udGV4dCosIFdlYkZpbGVTeXN0ZW0qLCBjb25zdCBXZWJDb3JlOjpLVVJMJiBzcmNQ YXRoLCBjb25zdCBXZWJDb3JlOjpLVVJMJiBkZXN0UGF0aCwgUGFzc1JlZlB0cjxXb3JrZXJGaWxl U3lzdGVtQ2FsbGJhY2tzQnJpZGdlPiwgY29uc3QgU3RyaW5nJiBtb2RlKTsKKyAgICBzdGF0aWMg dm9pZCBjb3B5T25NYWluVGhyZWFkKFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBX ZWJGaWxlU3lzdGVtKiwgY29uc3QgV2ViQ29yZTo6S1VSTCYgc3JjUGF0aCwgY29uc3QgV2ViQ29y ZTo6S1VSTCYgZGVzdFBhdGgsIFBhc3NSZWZQdHI8V29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0Jy aWRnZT4sIGNvbnN0IFN0cmluZyYgbW9kZSk7CisgICAgc3RhdGljIHZvaWQgcmVtb3ZlT25NYWlu VGhyZWFkKFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBXZWJGaWxlU3lzdGVtKiwg Y29uc3QgV2ViQ29yZTo6S1VSTCYgcGF0aCwgUGFzc1JlZlB0cjxXb3JrZXJGaWxlU3lzdGVtQ2Fs bGJhY2tzQnJpZGdlPiwgY29uc3QgU3RyaW5nJiBtb2RlKTsKKyAgICBzdGF0aWMgdm9pZCByZW1v dmVSZWN1cnNpdmVseU9uTWFpblRocmVhZChXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25Db250ZXh0 KiwgV2ViRmlsZVN5c3RlbSosIGNvbnN0IFdlYkNvcmU6OktVUkwmIHBhdGgsIFBhc3NSZWZQdHI8 V29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZT4sIGNvbnN0IFN0cmluZyYgbW9kZSk7Cisg ICAgc3RhdGljIHZvaWQgcmVhZE1ldGFkYXRhT25NYWluVGhyZWFkKFdlYkNvcmU6OlNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQqLCBXZWJGaWxlU3lzdGVtKiwgY29uc3QgV2ViQ29yZTo6S1VSTCYgcGF0 aCwgUGFzc1JlZlB0cjxXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlPiwgY29uc3QgU3Ry aW5nJiBtb2RlKTsKKyAgICBzdGF0aWMgdm9pZCBjcmVhdGVGaWxlT25NYWluVGhyZWFkKFdlYkNv cmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBXZWJGaWxlU3lzdGVtKiwgY29uc3QgV2ViQ29y ZTo6S1VSTCYgcGF0aCwgYm9vbCBleGNsdXNpdmUsIFBhc3NSZWZQdHI8V29ya2VyRmlsZVN5c3Rl bUNhbGxiYWNrc0JyaWRnZT4sIGNvbnN0IFN0cmluZyYgbW9kZSk7CisgICAgc3RhdGljIHZvaWQg Y3JlYXRlRGlyZWN0b3J5T25NYWluVGhyZWFkKFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQqLCBXZWJGaWxlU3lzdGVtKiwgY29uc3QgV2ViQ29yZTo6S1VSTCYgcGF0aCwgYm9vbCBleGNs dXNpdmUsIFBhc3NSZWZQdHI8V29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZT4sIGNvbnN0 IFN0cmluZyYgbW9kZSk7CisgICAgc3RhdGljIHZvaWQgZmlsZUV4aXN0c09uTWFpblRocmVhZChX ZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgV2ViRmlsZVN5c3RlbSosIGNvbnN0IFdl YkNvcmU6OktVUkwmIHBhdGgsIFBhc3NSZWZQdHI8V29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0Jy aWRnZT4sIGNvbnN0IFN0cmluZyYgbW9kZSk7CisgICAgc3RhdGljIHZvaWQgZGlyZWN0b3J5RXhp c3RzT25NYWluVGhyZWFkKFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBXZWJGaWxl U3lzdGVtKiwgY29uc3QgV2ViQ29yZTo6S1VSTCYgcGF0aCwgUGFzc1JlZlB0cjxXb3JrZXJGaWxl U3lzdGVtQ2FsbGJhY2tzQnJpZGdlPiwgY29uc3QgU3RyaW5nJiBtb2RlKTsKKyAgICBzdGF0aWMg dm9pZCByZWFkRGlyZWN0b3J5T25NYWluVGhyZWFkKFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNv bnRleHQqLCBXZWJGaWxlU3lzdGVtKiwgY29uc3QgV2ViQ29yZTo6S1VSTCYgcGF0aCwgUGFzc1Jl ZlB0cjxXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlPiwgY29uc3QgU3RyaW5nJiBtb2Rl KTsKIAogICAgIGZyaWVuZCBjbGFzcyBNYWluVGhyZWFkRmlsZVN5c3RlbUNhbGxiYWNrczsKIAog ICAgIC8vIE1ldGhvZHMgdGhhdCBkaXNwYXRjaCBXZWJGaWxlU3lzdGVtQ2FsbGJhY2tzIG9uIHRo ZSB3b3JrZXIgdGhyZWFkcy4KLSAgICBzdGF0aWMgdm9pZCBkaWRGYWlsT25Xb3JrZXJUaHJlYWQo V2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFj a3NCcmlkZ2UqLCBXZWJGaWxlRXJyb3IpOwotICAgIHN0YXRpYyB2b2lkIGRpZE9wZW5GaWxlU3lz dGVtT25Xb3JrZXJUaHJlYWQoV2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFdvcmtl ckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UqLCBjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFdl YkNvcmU6OktVUkwmIHJvb3RQYXRoKTsKLSAgICBzdGF0aWMgdm9pZCBkaWRTdWNjZWVkT25Xb3Jr ZXJUaHJlYWQoV2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFdvcmtlckZpbGVTeXN0 ZW1DYWxsYmFja3NCcmlkZ2UqKTsKLSAgICBzdGF0aWMgdm9pZCBkaWRSZWFkTWV0YWRhdGFPbldv cmtlclRocmVhZChXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgV29ya2VyRmlsZVN5 c3RlbUNhbGxiYWNrc0JyaWRnZSosIGNvbnN0IFdlYkZpbGVJbmZvJik7Ci0gICAgc3RhdGljIHZv aWQgZGlkUmVhZERpcmVjdG9yeU9uV29ya2VyVGhyZWFkKFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlv bkNvbnRleHQqLCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlKiwgY29uc3QgV2ViVmVj dG9yPFdlYkZpbGVTeXN0ZW1FbnRyeT4mLCBib29sIGhhc01vcmUpOworICAgIHN0YXRpYyB2b2lk IGRpZEZhaWxPbldvcmtlclRocmVhZChXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25Db250ZXh0Kiwg UGFzc1JlZlB0cjxXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlPiwgV2ViRmlsZUVycm9y KTsKKyAgICBzdGF0aWMgdm9pZCBkaWRPcGVuRmlsZVN5c3RlbU9uV29ya2VyVGhyZWFkKFdlYkNv cmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBQYXNzUmVmUHRyPFdvcmtlckZpbGVTeXN0ZW1D YWxsYmFja3NCcmlkZ2U+LCBjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFdlYkNvcmU6OktVUkwm IHJvb3RQYXRoKTsKKyAgICBzdGF0aWMgdm9pZCBkaWRTdWNjZWVkT25Xb3JrZXJUaHJlYWQoV2Vi Q29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFBhc3NSZWZQdHI8V29ya2VyRmlsZVN5c3Rl bUNhbGxiYWNrc0JyaWRnZT4pOworICAgIHN0YXRpYyB2b2lkIGRpZFJlYWRNZXRhZGF0YU9uV29y a2VyVGhyZWFkKFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBQYXNzUmVmUHRyPFdv cmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U+LCBjb25zdCBXZWJGaWxlSW5mbyYpOworICAg IHN0YXRpYyB2b2lkIGRpZFJlYWREaXJlY3RvcnlPbldvcmtlclRocmVhZChXZWJDb3JlOjpTY3Jp cHRFeGVjdXRpb25Db250ZXh0KiwgUGFzc1JlZlB0cjxXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tz QnJpZGdlPiwgY29uc3QgV2ViVmVjdG9yPFdlYkZpbGVTeXN0ZW1FbnRyeT4mLCBib29sIGhhc01v cmUpOwogCiAgICAgc3RhdGljIHZvaWQgcnVuVGFza09uTWFpblRocmVhZChXZWJDb3JlOjpTY3Jp cHRFeGVjdXRpb25Db250ZXh0KiwgUGFzc1JlZlB0cjxXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tz QnJpZGdlPiwgUGFzc093blB0cjxXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25Db250ZXh0OjpUYXNr Pik7CiAgICAgc3RhdGljIHZvaWQgcnVuVGFza09uV29ya2VyVGhyZWFkKFdlYkNvcmU6OlNjcmlw dEV4ZWN1dGlvbkNvbnRleHQqLCBQYXNzUmVmUHRyPFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NC cmlkZ2U+LCBQYXNzT3duUHRyPFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OlRhc2s+ KTsK