108923 2013-02-05 01:32:22 -0800 [chromium] remove unneccessary 0 checks for testRunner now that the TestRunner library owns it 2013-02-05 02:21:43 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 91308 1 jochen jochen haraken webkit.review.bot oldest_to_newest 825268 0 jochen 2013-02-05 01:32:22 -0800 [chromium] remove unneccessary 0 checks for testRunner now that the TestRunner library owns it 825269 1 186576 jochen 2013-02-05 01:32:49 -0800 Created attachment 186576 Patch 825271 2 186576 haraken 2013-02-05 01:35:13 -0800 Comment on attachment 186576 Patch looks ok 825301 3 186576 webkit.review.bot 2013-02-05 02:21:40 -0800 Comment on attachment 186576 Patch Clearing flags on attachment: 186576 Committed r141878: <http://trac.webkit.org/changeset/141878> 825302 4 webkit.review.bot 2013-02-05 02:21:43 -0800 All reviewed patches have been landed. Closing bug. 186576 2013-02-05 01:32:49 -0800 2013-02-05 02:21:39 -0800 Patch bug-108923-20130205102926.patch text/plain 27148 jochen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxODY3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjIxZTVjYmU3ZDVmOTliMzdiYWFmMDY4NjNkNTY0OWVi NGEyMTRhMS4uNGM5ZDNmYTkwNGM3NGVlNTlhMDRjNjI0ZTFjYWM5MGFmZTcxMzQ3YyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU1 IEBACisyMDEzLTAyLTA1ICBKb2NoZW4gRWlzaW5nZXIgIDxqb2NoZW5AY2hyb21pdW0ub3JnPgor CisgICAgICAgIFtjaHJvbWl1bV0gcmVtb3ZlIHVubmVjY2Vzc2FyeSAwIGNoZWNrcyBmb3IgdGVz dFJ1bm5lciBub3cgdGhhdCB0aGUgVGVzdFJ1bm5lciBsaWJyYXJ5IG93bnMgaXQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwODkyMworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUv Y2hyb21pdW0vVGVzdFJ1bm5lci9zcmMvV2ViVGVzdFByb3h5LmNwcDoKKyAgICAgICAgKFdlYlRl c3RSdW5uZXIpOgorICAgICAgICAoV2ViVGVzdFJ1bm5lcjo6V2ViVGVzdFByb3h5QmFzZTo6c2hv dWxkQmVnaW5FZGl0aW5nKToKKyAgICAgICAgKFdlYlRlc3RSdW5uZXI6OldlYlRlc3RQcm94eUJh c2U6OnNob3VsZEVuZEVkaXRpbmcpOgorICAgICAgICAoV2ViVGVzdFJ1bm5lcjo6V2ViVGVzdFBy b3h5QmFzZTo6c2hvdWxkSW5zZXJ0Tm9kZSk6CisgICAgICAgIChXZWJUZXN0UnVubmVyOjpXZWJU ZXN0UHJveHlCYXNlOjpzaG91bGRJbnNlcnRUZXh0KToKKyAgICAgICAgKFdlYlRlc3RSdW5uZXI6 OldlYlRlc3RQcm94eUJhc2U6OnNob3VsZENoYW5nZVNlbGVjdGVkUmFuZ2UpOgorICAgICAgICAo V2ViVGVzdFJ1bm5lcjo6V2ViVGVzdFByb3h5QmFzZTo6c2hvdWxkRGVsZXRlUmFuZ2UpOgorICAg ICAgICAoV2ViVGVzdFJ1bm5lcjo6V2ViVGVzdFByb3h5QmFzZTo6c2hvdWxkQXBwbHlTdHlsZSk6 CisgICAgICAgIChXZWJUZXN0UnVubmVyOjpXZWJUZXN0UHJveHlCYXNlOjpkaWRCZWdpbkVkaXRp bmcpOgorICAgICAgICAoV2ViVGVzdFJ1bm5lcjo6V2ViVGVzdFByb3h5QmFzZTo6ZGlkQ2hhbmdl U2VsZWN0aW9uKToKKyAgICAgICAgKFdlYlRlc3RSdW5uZXI6OldlYlRlc3RQcm94eUJhc2U6OmRp ZENoYW5nZUNvbnRlbnRzKToKKyAgICAgICAgKFdlYlRlc3RSdW5uZXI6OldlYlRlc3RQcm94eUJh c2U6OmRpZEVuZEVkaXRpbmcpOgorICAgICAgICAoV2ViVGVzdFJ1bm5lcjo6V2ViVGVzdFByb3h5 QmFzZTo6Y3JlYXRlVmlldyk6CisgICAgICAgIChXZWJUZXN0UnVubmVyOjpXZWJUZXN0UHJveHlC YXNlOjpzZXRTdGF0dXNUZXh0KToKKyAgICAgICAgKFdlYlRlc3RSdW5uZXI6OldlYlRlc3RQcm94 eUJhc2U6OmRpZFN0b3BMb2FkaW5nKToKKyAgICAgICAgKFdlYlRlc3RSdW5uZXI6OldlYlRlc3RQ cm94eUJhc2U6OmlzU21hcnRJbnNlcnREZWxldGVFbmFibGVkKToKKyAgICAgICAgKFdlYlRlc3RS dW5uZXI6OldlYlRlc3RQcm94eUJhc2U6OmlzU2VsZWN0VHJhaWxpbmdXaGl0ZXNwYWNlRW5hYmxl ZCk6CisgICAgICAgIChXZWJUZXN0UnVubmVyOjpXZWJUZXN0UHJveHlCYXNlOjp3aWxsUGVyZm9y bUNsaWVudFJlZGlyZWN0KToKKyAgICAgICAgKFdlYlRlc3RSdW5uZXI6OldlYlRlc3RQcm94eUJh c2U6OmRpZENhbmNlbENsaWVudFJlZGlyZWN0KToKKyAgICAgICAgKFdlYlRlc3RSdW5uZXI6Oldl YlRlc3RQcm94eUJhc2U6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKToKKyAgICAgICAgKFdlYlRl c3RSdW5uZXI6OldlYlRlc3RQcm94eUJhc2U6OmRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclBy b3Zpc2lvbmFsTG9hZCk6CisgICAgICAgIChXZWJUZXN0UnVubmVyOjpXZWJUZXN0UHJveHlCYXNl OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkKToKKyAgICAgICAgKFdlYlRlc3RSdW5uZXI6OldlYlRl c3RQcm94eUJhc2U6OmRpZENvbW1pdFByb3Zpc2lvbmFsTG9hZCk6CisgICAgICAgIChXZWJUZXN0 UnVubmVyOjpXZWJUZXN0UHJveHlCYXNlOjpkaWRSZWNlaXZlVGl0bGUpOgorICAgICAgICAoV2Vi VGVzdFJ1bm5lcjo6V2ViVGVzdFByb3h5QmFzZTo6ZGlkRmluaXNoRG9jdW1lbnRMb2FkKToKKyAg ICAgICAgKFdlYlRlc3RSdW5uZXI6OldlYlRlc3RQcm94eUJhc2U6OmRpZEhhbmRsZU9ubG9hZEV2 ZW50cyk6CisgICAgICAgIChXZWJUZXN0UnVubmVyOjpXZWJUZXN0UHJveHlCYXNlOjpkaWRGYWls TG9hZCk6CisgICAgICAgIChXZWJUZXN0UnVubmVyOjpXZWJUZXN0UHJveHlCYXNlOjpkaWRGaW5p c2hMb2FkKToKKyAgICAgICAgKFdlYlRlc3RSdW5uZXI6OldlYlRlc3RQcm94eUJhc2U6OmRpZENo YW5nZUxvY2F0aW9uV2l0aGluUGFnZSk6CisgICAgICAgIChXZWJUZXN0UnVubmVyOjpXZWJUZXN0 UHJveHlCYXNlOjpkaWREaXNwbGF5SW5zZWN1cmVDb250ZW50KToKKyAgICAgICAgKFdlYlRlc3RS dW5uZXI6OldlYlRlc3RQcm94eUJhc2U6OmRpZFJ1bkluc2VjdXJlQ29udGVudCk6CisgICAgICAg IChXZWJUZXN0UnVubmVyOjpXZWJUZXN0UHJveHlCYXNlOjpkaWREZXRlY3RYU1MpOgorICAgICAg ICAoV2ViVGVzdFJ1bm5lcjo6V2ViVGVzdFByb3h5QmFzZTo6YXNzaWduSWRlbnRpZmllclRvUmVx dWVzdCk6CisgICAgICAgIChXZWJUZXN0UnVubmVyOjpXZWJUZXN0UHJveHlCYXNlOjp3aWxsUmVx dWVzdFJlc291cmNlKToKKyAgICAgICAgKFdlYlRlc3RSdW5uZXI6OldlYlRlc3RQcm94eUJhc2U6 OmRpZENyZWF0ZURhdGFTb3VyY2UpOgorICAgICAgICAoV2ViVGVzdFJ1bm5lcjo6V2ViVGVzdFBy b3h5QmFzZTo6d2lsbFNlbmRSZXF1ZXN0KToKKyAgICAgICAgKFdlYlRlc3RSdW5uZXI6OldlYlRl c3RQcm94eUJhc2U6OmRpZFJlY2VpdmVSZXNwb25zZSk6CisgICAgICAgIChXZWJUZXN0UnVubmVy OjpXZWJUZXN0UHJveHlCYXNlOjpkaWRGaW5pc2hSZXNvdXJjZUxvYWQpOgorICAgICAgICAoV2Vi VGVzdFJ1bm5lcjo6V2ViVGVzdFByb3h5QmFzZTo6ZGlkRmFpbFJlc291cmNlTG9hZCk6CisgICAg ICAgIChXZWJUZXN0UnVubmVyOjpXZWJUZXN0UHJveHlCYXNlOjpydW5Nb2RhbEJlZm9yZVVubG9h ZERpYWxvZyk6CisgICAgICAgIChXZWJUZXN0UnVubmVyOjpXZWJUZXN0UHJveHlCYXNlOjpsb2Nh dGlvbkNoYW5nZURvbmUpOgorICAgICAgICAoV2ViVGVzdFJ1bm5lcjo6V2ViVGVzdFByb3h5QmFz ZTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbik6CisgICAgICAgIChXZWJUZXN0UnVubmVyOjpX ZWJUZXN0UHJveHlCYXNlOjp3aWxsQ2hlY2tBbmREaXNwYXRjaE1lc3NhZ2VFdmVudCk6CisKIDIw MTMtMDItMDQgIEFsYW4gQ3V0dGVyICA8YWxhbmN1dHRlckBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgRVdTIGJvdHMgZG9uJ3QgcmVtb3ZlIHVudHJhY2tlZCBmaWxlcyBhZnRlciBwcm9jZXNzaW5n IGEgcGF0Y2gKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RS dW5uZXIvc3JjL1dlYlRlc3RQcm94eS5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1 bS9UZXN0UnVubmVyL3NyYy9XZWJUZXN0UHJveHkuY3BwCmluZGV4IDcyZThkNTQ2YzZjY2UwOTY0 YTIwZjU4MDM0ZWZiZmU0MmQ3MWQ0MzQuLjY0NzBmMGE0MTEyMmY5YzlmYzM3MWRhY2FiYTUzOTM5 MzVhZDI3NTkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RS dW5uZXIvc3JjL1dlYlRlc3RQcm94eS5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hy b21pdW0vVGVzdFJ1bm5lci9zcmMvV2ViVGVzdFByb3h5LmNwcApAQCAtNDU1LDEyICs0NTUsOSBA QCB2b2lkIFdlYlRlc3RQcm94eUJhc2U6OnN0YXJ0RHJhZ2dpbmcoV2ViRnJhbWUqLCBjb25zdCBX ZWJEcmFnRGF0YSYgZGF0YSwgV2ViRHJhZwogLy8gVGhlIG91dHB1dCBmcm9tIHRoZXNlIG1ldGhv ZHMgaW4gbGF5b3V0IHRlc3QgbW9kZSBzaG91bGQgbWF0Y2ggdGhhdAogLy8gZXhwZWN0ZWQgYnkg dGhlIGxheW91dCB0ZXN0cy4gU2VlIEVkaXRpbmdEZWxlZ2F0ZS5tIGluIER1bXBSZW5kZXJUcmVl LgogCi0vLyBGSVhNRTogUmVtb3ZlIHRoZSAwIGNoZWNrcyBmb3IgbV90ZXN0SW50ZXJmYWNlcy0+ dGVzdFJ1bm5lcigpIG9uY2UgdGhlCi0vLyBUZXN0SW50ZXJmYWNlcyBjbGFzcyBvd25zIHRoZSBU ZXN0UnVubmVyLgotCiBib29sIFdlYlRlc3RQcm94eUJhc2U6OnNob3VsZEJlZ2luRWRpdGluZyhj b25zdCBXZWJSYW5nZSYgcmFuZ2UpCiB7Ci0gICAgaWYgKG1fdGVzdEludGVyZmFjZXMtPnRlc3RS dW5uZXIoKSAmJiBtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCktPnNob3VsZER1bXBFZGl0 aW5nQ2FsbGJhY2tzKCkpIHsKKyAgICBpZiAobV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigp LT5zaG91bGREdW1wRWRpdGluZ0NhbGxiYWNrcygpKSB7CiAgICAgICAgIG1fZGVsZWdhdGUtPnBy aW50TWVzc2FnZSgiRURJVElORyBERUxFR0FURTogc2hvdWxkQmVnaW5FZGl0aW5nSW5ET01SYW5n ZToiKTsKICAgICAgICAgcHJpbnRSYW5nZURlc2NyaXB0aW9uKG1fZGVsZWdhdGUsIHJhbmdlKTsK ICAgICAgICAgbV9kZWxlZ2F0ZS0+cHJpbnRNZXNzYWdlKCJcbiIpOwpAQCAtNDcwLDcgKzQ2Nyw3 IEBAIGJvb2wgV2ViVGVzdFByb3h5QmFzZTo6c2hvdWxkQmVnaW5FZGl0aW5nKGNvbnN0IFdlYlJh bmdlJiByYW5nZSkKIAogYm9vbCBXZWJUZXN0UHJveHlCYXNlOjpzaG91bGRFbmRFZGl0aW5nKGNv bnN0IFdlYlJhbmdlJiByYW5nZSkKIHsKLSAgICBpZiAobV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1 bm5lcigpICYmIG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKS0+c2hvdWxkRHVtcEVkaXRp bmdDYWxsYmFja3MoKSkgeworICAgIGlmIChtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCkt PnNob3VsZER1bXBFZGl0aW5nQ2FsbGJhY2tzKCkpIHsKICAgICAgICAgbV9kZWxlZ2F0ZS0+cHJp bnRNZXNzYWdlKCJFRElUSU5HIERFTEVHQVRFOiBzaG91bGRFbmRFZGl0aW5nSW5ET01SYW5nZToi KTsKICAgICAgICAgcHJpbnRSYW5nZURlc2NyaXB0aW9uKG1fZGVsZWdhdGUsIHJhbmdlKTsKICAg ICAgICAgbV9kZWxlZ2F0ZS0+cHJpbnRNZXNzYWdlKCJcbiIpOwpAQCAtNDgwLDcgKzQ3Nyw3IEBA IGJvb2wgV2ViVGVzdFByb3h5QmFzZTo6c2hvdWxkRW5kRWRpdGluZyhjb25zdCBXZWJSYW5nZSYg cmFuZ2UpCiAKIGJvb2wgV2ViVGVzdFByb3h5QmFzZTo6c2hvdWxkSW5zZXJ0Tm9kZShjb25zdCBX ZWJOb2RlJiBub2RlLCBjb25zdCBXZWJSYW5nZSYgcmFuZ2UsIFdlYkVkaXRpbmdBY3Rpb24gYWN0 aW9uKQogewotICAgIGlmIChtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCkgJiYgbV90ZXN0 SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpLT5zaG91bGREdW1wRWRpdGluZ0NhbGxiYWNrcygpKSB7 CisgICAgaWYgKG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKS0+c2hvdWxkRHVtcEVkaXRp bmdDYWxsYmFja3MoKSkgewogICAgICAgICBtX2RlbGVnYXRlLT5wcmludE1lc3NhZ2UoIkVESVRJ TkcgREVMRUdBVEU6IHNob3VsZEluc2VydE5vZGU6Iik7CiAgICAgICAgIHByaW50Tm9kZURlc2Ny aXB0aW9uKG1fZGVsZWdhdGUsIG5vZGUsIDApOwogICAgICAgICBtX2RlbGVnYXRlLT5wcmludE1l c3NhZ2UoIiByZXBsYWNpbmdET01SYW5nZToiKTsKQEAgLTQ5Miw3ICs0ODksNyBAQCBib29sIFdl YlRlc3RQcm94eUJhc2U6OnNob3VsZEluc2VydE5vZGUoY29uc3QgV2ViTm9kZSYgbm9kZSwgY29u c3QgV2ViUmFuZ2UmIHJhbgogCiBib29sIFdlYlRlc3RQcm94eUJhc2U6OnNob3VsZEluc2VydFRl eHQoY29uc3QgV2ViU3RyaW5nJiB0ZXh0LCBjb25zdCBXZWJSYW5nZSYgcmFuZ2UsIFdlYkVkaXRp bmdBY3Rpb24gYWN0aW9uKQogewotICAgIGlmIChtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVy KCkgJiYgbV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpLT5zaG91bGREdW1wRWRpdGluZ0Nh bGxiYWNrcygpKSB7CisgICAgaWYgKG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKS0+c2hv dWxkRHVtcEVkaXRpbmdDYWxsYmFja3MoKSkgewogICAgICAgICBtX2RlbGVnYXRlLT5wcmludE1l c3NhZ2Uoc3RyaW5nKCJFRElUSU5HIERFTEVHQVRFOiBzaG91bGRJbnNlcnRUZXh0OiIpICsgdGV4 dC51dGY4KCkuZGF0YSgpICsgIiByZXBsYWNpbmdET01SYW5nZToiKTsKICAgICAgICAgcHJpbnRS YW5nZURlc2NyaXB0aW9uKG1fZGVsZWdhdGUsIHJhbmdlKTsKICAgICAgICAgbV9kZWxlZ2F0ZS0+ cHJpbnRNZXNzYWdlKHN0cmluZygiIGdpdmVuQWN0aW9uOiIpICsgZWRpdGluZ0FjdGlvbkRlc2Ny aXB0aW9uKGFjdGlvbikgKyAiXG4iKTsKQEAgLTUwMyw3ICs1MDAsNyBAQCBib29sIFdlYlRlc3RQ cm94eUJhc2U6OnNob3VsZEluc2VydFRleHQoY29uc3QgV2ViU3RyaW5nJiB0ZXh0LCBjb25zdCBX ZWJSYW5nZSYgcgogYm9vbCBXZWJUZXN0UHJveHlCYXNlOjpzaG91bGRDaGFuZ2VTZWxlY3RlZFJh bmdlKAogICAgIGNvbnN0IFdlYlJhbmdlJiBmcm9tUmFuZ2UsIGNvbnN0IFdlYlJhbmdlJiB0b1Jh bmdlLCBXZWJUZXh0QWZmaW5pdHkgYWZmaW5pdHksIGJvb2wgc3RpbGxTZWxlY3RpbmcpCiB7Ci0g ICAgaWYgKG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKSAmJiBtX3Rlc3RJbnRlcmZhY2Vz LT50ZXN0UnVubmVyKCktPnNob3VsZER1bXBFZGl0aW5nQ2FsbGJhY2tzKCkpIHsKKyAgICBpZiAo bV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpLT5zaG91bGREdW1wRWRpdGluZ0NhbGxiYWNr cygpKSB7CiAgICAgICAgIG1fZGVsZWdhdGUtPnByaW50TWVzc2FnZSgiRURJVElORyBERUxFR0FU RTogc2hvdWxkQ2hhbmdlU2VsZWN0ZWRET01SYW5nZToiKTsKICAgICAgICAgcHJpbnRSYW5nZURl c2NyaXB0aW9uKG1fZGVsZWdhdGUsIGZyb21SYW5nZSk7CiAgICAgICAgIG1fZGVsZWdhdGUtPnBy aW50TWVzc2FnZSgiIHRvRE9NUmFuZ2U6Iik7CkBAIC01MTUsNyArNTEyLDcgQEAgYm9vbCBXZWJU ZXN0UHJveHlCYXNlOjpzaG91bGRDaGFuZ2VTZWxlY3RlZFJhbmdlKAogCiBib29sIFdlYlRlc3RQ cm94eUJhc2U6OnNob3VsZERlbGV0ZVJhbmdlKGNvbnN0IFdlYlJhbmdlJiByYW5nZSkKIHsKLSAg ICBpZiAobV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpICYmIG1fdGVzdEludGVyZmFjZXMt PnRlc3RSdW5uZXIoKS0+c2hvdWxkRHVtcEVkaXRpbmdDYWxsYmFja3MoKSkgeworICAgIGlmICht X3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCktPnNob3VsZER1bXBFZGl0aW5nQ2FsbGJhY2tz KCkpIHsKICAgICAgICAgbV9kZWxlZ2F0ZS0+cHJpbnRNZXNzYWdlKCJFRElUSU5HIERFTEVHQVRF OiBzaG91bGREZWxldGVET01SYW5nZToiKTsKICAgICAgICAgcHJpbnRSYW5nZURlc2NyaXB0aW9u KG1fZGVsZWdhdGUsIHJhbmdlKTsKICAgICAgICAgbV9kZWxlZ2F0ZS0+cHJpbnRNZXNzYWdlKCJc biIpOwpAQCAtNTI1LDcgKzUyMiw3IEBAIGJvb2wgV2ViVGVzdFByb3h5QmFzZTo6c2hvdWxkRGVs ZXRlUmFuZ2UoY29uc3QgV2ViUmFuZ2UmIHJhbmdlKQogCiBib29sIFdlYlRlc3RQcm94eUJhc2U6 OnNob3VsZEFwcGx5U3R5bGUoY29uc3QgV2ViU3RyaW5nJiBzdHlsZSwgY29uc3QgV2ViUmFuZ2Um IHJhbmdlKQogewotICAgIGlmIChtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCkgJiYgbV90 ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpLT5zaG91bGREdW1wRWRpdGluZ0NhbGxiYWNrcygp KSB7CisgICAgaWYgKG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKS0+c2hvdWxkRHVtcEVk aXRpbmdDYWxsYmFja3MoKSkgewogICAgICAgICBtX2RlbGVnYXRlLT5wcmludE1lc3NhZ2Uoc3Ry aW5nKCJFRElUSU5HIERFTEVHQVRFOiBzaG91bGRBcHBseVN0eWxlOiIpICsgc3R5bGUudXRmOCgp LmRhdGEoKSArICIgdG9FbGVtZW50c0luRE9NUmFuZ2U6Iik7CiAgICAgICAgIHByaW50UmFuZ2VE ZXNjcmlwdGlvbihtX2RlbGVnYXRlLCByYW5nZSk7CiAgICAgICAgIG1fZGVsZWdhdGUtPnByaW50 TWVzc2FnZSgiXG4iKTsKQEAgLTUzNSwyNSArNTMyLDI1IEBAIGJvb2wgV2ViVGVzdFByb3h5QmFz ZTo6c2hvdWxkQXBwbHlTdHlsZShjb25zdCBXZWJTdHJpbmcmIHN0eWxlLCBjb25zdCBXZWJSYW5n ZSYKIAogdm9pZCBXZWJUZXN0UHJveHlCYXNlOjpkaWRCZWdpbkVkaXRpbmcoKQogewotICAgIGlm IChtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCkgJiYgbV90ZXN0SW50ZXJmYWNlcy0+dGVz dFJ1bm5lcigpLT5zaG91bGREdW1wRWRpdGluZ0NhbGxiYWNrcygpKQorICAgIGlmIChtX3Rlc3RJ bnRlcmZhY2VzLT50ZXN0UnVubmVyKCktPnNob3VsZER1bXBFZGl0aW5nQ2FsbGJhY2tzKCkpCiAg ICAgICAgIG1fZGVsZWdhdGUtPnByaW50TWVzc2FnZSgiRURJVElORyBERUxFR0FURTogd2ViVmll d0RpZEJlZ2luRWRpdGluZzpXZWJWaWV3RGlkQmVnaW5FZGl0aW5nTm90aWZpY2F0aW9uXG4iKTsK IH0KIAogdm9pZCBXZWJUZXN0UHJveHlCYXNlOjpkaWRDaGFuZ2VTZWxlY3Rpb24oYm9vbCBpc0Vt cHR5U2VsZWN0aW9uKQogewotICAgIGlmIChtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCkg JiYgbV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpLT5zaG91bGREdW1wRWRpdGluZ0NhbGxi YWNrcygpKQorICAgIGlmIChtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCktPnNob3VsZER1 bXBFZGl0aW5nQ2FsbGJhY2tzKCkpCiAgICAgICAgIG1fZGVsZWdhdGUtPnByaW50TWVzc2FnZSgi RURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hh bmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uXG4iKTsKIH0KIAogdm9pZCBXZWJUZXN0UHJveHlCYXNl OjpkaWRDaGFuZ2VDb250ZW50cygpCiB7Ci0gICAgaWYgKG1fdGVzdEludGVyZmFjZXMtPnRlc3RS dW5uZXIoKSAmJiBtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCktPnNob3VsZER1bXBFZGl0 aW5nQ2FsbGJhY2tzKCkpCisgICAgaWYgKG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKS0+ c2hvdWxkRHVtcEVkaXRpbmdDYWxsYmFja3MoKSkKICAgICAgICAgbV9kZWxlZ2F0ZS0+cHJpbnRN ZXNzYWdlKCJFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlOldlYlZpZXdEaWRDaGFu Z2VOb3RpZmljYXRpb25cbiIpOwogfQogCiB2b2lkIFdlYlRlc3RQcm94eUJhc2U6OmRpZEVuZEVk aXRpbmcoKQogewotICAgIGlmIChtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCkgJiYgbV90 ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpLT5zaG91bGREdW1wRWRpdGluZ0NhbGxiYWNrcygp KQorICAgIGlmIChtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCktPnNob3VsZER1bXBFZGl0 aW5nQ2FsbGJhY2tzKCkpCiAgICAgICAgIG1fZGVsZWdhdGUtPnByaW50TWVzc2FnZSgiRURJVElO RyBERUxFR0FURTogd2ViVmlld0RpZEVuZEVkaXRpbmc6V2ViVmlld0RpZEVuZEVkaXRpbmdOb3Rp ZmljYXRpb25cbiIpOwogfQogCkBAIC01OTQsNyArNTkxLDcgQEAgdm9pZCBXZWJUZXN0UHJveHlC YXNlOjpkaXNwYXRjaEludGVudChXZWJGcmFtZSogc291cmNlLCBjb25zdCBXZWJJbnRlbnRSZXF1 ZXN0JgogCiBib29sIFdlYlRlc3RQcm94eUJhc2U6OmNyZWF0ZVZpZXcoV2ViRnJhbWUqLCBjb25z dCBXZWJVUkxSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBXZWJXaW5kb3dGZWF0dXJlcyYsIGNvbnN0 IFdlYlN0cmluZyYsIFdlYk5hdmlnYXRpb25Qb2xpY3kpCiB7Ci0gICAgaWYgKCFtX3Rlc3RJbnRl cmZhY2VzLT50ZXN0UnVubmVyKCkgfHwgIW1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKS0+ Y2FuT3BlbldpbmRvd3MoKSkKKyAgICBpZiAoIW1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIo KS0+Y2FuT3BlbldpbmRvd3MoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmIChtX3Rl c3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCktPnNob3VsZER1bXBDcmVhdGVWaWV3KCkpCiAgICAg ICAgIG1fZGVsZWdhdGUtPnByaW50TWVzc2FnZShzdHJpbmcoImNyZWF0ZVZpZXcoIikgKyBVUkxE ZXNjcmlwdGlvbihyZXF1ZXN0LnVybCgpKSArICIpXG4iKTsKQEAgLTYxMCw0NSArNjA3LDQxIEBA IFdlYlBsdWdpbiogV2ViVGVzdFByb3h5QmFzZTo6Y3JlYXRlUGx1Z2luKFdlYkZyYW1lKiBmcmFt ZSwgY29uc3QgV2ViUGx1Z2luUGFyYW1zCiAKIHZvaWQgV2ViVGVzdFByb3h5QmFzZTo6c2V0U3Rh dHVzVGV4dChjb25zdCBXZWJTdHJpbmcmIHRleHQpCiB7Ci0gICAgaWYgKCFtX3Rlc3RJbnRlcmZh Y2VzLT50ZXN0UnVubmVyKCkgfHwgIW1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKS0+c2hv dWxkRHVtcFN0YXR1c0NhbGxiYWNrcygpKQorICAgIGlmICghbV90ZXN0SW50ZXJmYWNlcy0+dGVz dFJ1bm5lcigpLT5zaG91bGREdW1wU3RhdHVzQ2FsbGJhY2tzKCkpCiAgICAgICAgIHJldHVybjsK ICAgICBtX2RlbGVnYXRlLT5wcmludE1lc3NhZ2Uoc3RyaW5nKCJVSSBERUxFR0FURSBTVEFUVVMg Q0FMTEJBQ0s6IHNldFN0YXR1c1RleHQ6IikgKyB0ZXh0LnV0ZjgoKS5kYXRhKCkgKyAiXG4iKTsK IH0KIAogdm9pZCBXZWJUZXN0UHJveHlCYXNlOjpkaWRTdG9wTG9hZGluZygpCiB7Ci0gICAgaWYg KG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKSAmJiBtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0 UnVubmVyKCktPnNob3VsZER1bXBQcm9ncmVzc0ZpbmlzaGVkQ2FsbGJhY2soKSkKKyAgICBpZiAo bV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpLT5zaG91bGREdW1wUHJvZ3Jlc3NGaW5pc2hl ZENhbGxiYWNrKCkpCiAgICAgICAgIG1fZGVsZWdhdGUtPnByaW50TWVzc2FnZSgicG9zdFByb2dy ZXNzRmluaXNoZWROb3RpZmljYXRpb25cbiIpOwogfQogCiBib29sIFdlYlRlc3RQcm94eUJhc2U6 OmlzU21hcnRJbnNlcnREZWxldGVFbmFibGVkKCkKIHsKLSAgICBpZiAobV90ZXN0SW50ZXJmYWNl cy0+dGVzdFJ1bm5lcigpKQotICAgICAgICByZXR1cm4gbV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1 bm5lcigpLT5pc1NtYXJ0SW5zZXJ0RGVsZXRlRW5hYmxlZCgpOwotICAgIHJldHVybiB0cnVlOwor ICAgIHJldHVybiBtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCktPmlzU21hcnRJbnNlcnRE ZWxldGVFbmFibGVkKCk7CiB9CiAKIGJvb2wgV2ViVGVzdFByb3h5QmFzZTo6aXNTZWxlY3RUcmFp bGluZ1doaXRlc3BhY2VFbmFibGVkKCkKIHsKLSAgICBpZiAobV90ZXN0SW50ZXJmYWNlcy0+dGVz dFJ1bm5lcigpKQotICAgICAgICByZXR1cm4gbV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigp LT5pc1NlbGVjdFRyYWlsaW5nV2hpdGVzcGFjZUVuYWJsZWQoKTsKLSAgICByZXR1cm4gZmFsc2U7 CisgICAgcmV0dXJuIG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKS0+aXNTZWxlY3RUcmFp bGluZ1doaXRlc3BhY2VFbmFibGVkKCk7CiB9CiAKIHZvaWQgV2ViVGVzdFByb3h5QmFzZTo6d2ls bFBlcmZvcm1DbGllbnRSZWRpcmVjdChXZWJGcmFtZSogZnJhbWUsIGNvbnN0IFdlYlVSTCYsIGNv bnN0IFdlYlVSTCYgdG8sIGRvdWJsZSwgZG91YmxlKQogewotICAgIGlmIChtX3Rlc3RJbnRlcmZh Y2VzLT50ZXN0UnVubmVyKCkgJiYgbV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpLT5zaG91 bGREdW1wRnJhbWVMb2FkQ2FsbGJhY2tzKCkpIHsKKyAgICBpZiAobV90ZXN0SW50ZXJmYWNlcy0+ dGVzdFJ1bm5lcigpLT5zaG91bGREdW1wRnJhbWVMb2FkQ2FsbGJhY2tzKCkpIHsKICAgICAgICAg cHJpbnRGcmFtZURlc2NyaXB0aW9uKG1fZGVsZWdhdGUsIGZyYW1lKTsKICAgICAgICAgbV9kZWxl Z2F0ZS0+cHJpbnRNZXNzYWdlKHN0cmluZygiIC0gd2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdFRv VVJMOiAiKSArIHRvLnNwZWMoKS5kYXRhKCkgKyAiIFxuIik7CiAgICAgfQogCi0gICAgaWYgKG1f dGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKSAmJiBtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVu bmVyKCktPnNob3VsZER1bXBVc2VyR2VzdHVyZUluRnJhbWVMb2FkQ2FsbGJhY2tzKCkpCisgICAg aWYgKG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKS0+c2hvdWxkRHVtcFVzZXJHZXN0dXJl SW5GcmFtZUxvYWRDYWxsYmFja3MoKSkKICAgICAgICAgcHJpbnRGcmFtZVVzZXJHZXN0dXJlU3Rh dHVzKG1fZGVsZWdhdGUsIGZyYW1lLCAiIC0gaW4gd2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdFxu Iik7CiB9CiAKIHZvaWQgV2ViVGVzdFByb3h5QmFzZTo6ZGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3Qo V2ViRnJhbWUqIGZyYW1lKQogewotICAgIGlmIChtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVy KCkgJiYgbV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpLT5zaG91bGREdW1wRnJhbWVMb2Fk Q2FsbGJhY2tzKCkpIHsKKyAgICBpZiAobV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpLT5z aG91bGREdW1wRnJhbWVMb2FkQ2FsbGJhY2tzKCkpIHsKICAgICAgICAgcHJpbnRGcmFtZURlc2Ny aXB0aW9uKG1fZGVsZWdhdGUsIGZyYW1lKTsKICAgICAgICAgbV9kZWxlZ2F0ZS0+cHJpbnRNZXNz YWdlKCIgLSBkaWRDYW5jZWxDbGllbnRSZWRpcmVjdEZvckZyYW1lXG4iKTsKICAgICB9CkBAIC02 NTYsMTggKzY0OSwxOCBAQCB2b2lkIFdlYlRlc3RQcm94eUJhc2U6OmRpZENhbmNlbENsaWVudFJl ZGlyZWN0KFdlYkZyYW1lKiBmcmFtZSkKIAogdm9pZCBXZWJUZXN0UHJveHlCYXNlOjpkaWRTdGFy dFByb3Zpc2lvbmFsTG9hZChXZWJGcmFtZSogZnJhbWUpCiB7Ci0gICAgaWYgKG1fdGVzdEludGVy ZmFjZXMtPnRlc3RSdW5uZXIoKSAmJiAhbV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpLT50 b3BMb2FkaW5nRnJhbWUoKSkKKyAgICBpZiAoIW1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIo KS0+dG9wTG9hZGluZ0ZyYW1lKCkpCiAgICAgICAgIG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5u ZXIoKS0+c2V0VG9wTG9hZGluZ0ZyYW1lKGZyYW1lLCBmYWxzZSk7CiAKLSAgICBpZiAobV90ZXN0 SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpICYmIG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIo KS0+c2hvdWxkRHVtcEZyYW1lTG9hZENhbGxiYWNrcygpKSB7CisgICAgaWYgKG1fdGVzdEludGVy ZmFjZXMtPnRlc3RSdW5uZXIoKS0+c2hvdWxkRHVtcEZyYW1lTG9hZENhbGxiYWNrcygpKSB7CiAg ICAgICAgIHByaW50RnJhbWVEZXNjcmlwdGlvbihtX2RlbGVnYXRlLCBmcmFtZSk7CiAgICAgICAg IG1fZGVsZWdhdGUtPnByaW50TWVzc2FnZSgiIC0gZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JG cmFtZVxuIik7CiAgICAgfQogCi0gICAgaWYgKG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIo KSAmJiBtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCktPnNob3VsZER1bXBVc2VyR2VzdHVy ZUluRnJhbWVMb2FkQ2FsbGJhY2tzKCkpCisgICAgaWYgKG1fdGVzdEludGVyZmFjZXMtPnRlc3RS dW5uZXIoKS0+c2hvdWxkRHVtcFVzZXJHZXN0dXJlSW5GcmFtZUxvYWRDYWxsYmFja3MoKSkKICAg ICAgICAgcHJpbnRGcmFtZVVzZXJHZXN0dXJlU3RhdHVzKG1fZGVsZWdhdGUsIGZyYW1lLCAiIC0g aW4gZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZVxuIik7CiAKLSAgICBpZiAobV90ZXN0 SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpICYmIG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIo KS0+c3RvcFByb3Zpc2lvbmFsRnJhbWVMb2FkcygpKSB7CisgICAgaWYgKG1fdGVzdEludGVyZmFj ZXMtPnRlc3RSdW5uZXIoKS0+c3RvcFByb3Zpc2lvbmFsRnJhbWVMb2FkcygpKSB7CiAgICAgICAg IHByaW50RnJhbWVEZXNjcmlwdGlvbihtX2RlbGVnYXRlLCBmcmFtZSk7CiAgICAgICAgIG1fZGVs ZWdhdGUtPnByaW50TWVzc2FnZSgiIC0gc3RvcHBpbmcgbG9hZCBpbiBkaWRTdGFydFByb3Zpc2lv bmFsTG9hZEZvckZyYW1lIGNhbGxiYWNrXG4iKTsKICAgICAgICAgZnJhbWUtPnN0b3BMb2FkaW5n KCk7CkBAIC02NzYsNyArNjY5LDcgQEAgdm9pZCBXZWJUZXN0UHJveHlCYXNlOjpkaWRTdGFydFBy b3Zpc2lvbmFsTG9hZChXZWJGcmFtZSogZnJhbWUpCiAKIHZvaWQgV2ViVGVzdFByb3h5QmFzZTo6 ZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkKFdlYkZyYW1lKiBmcmFt ZSkKIHsKLSAgICBpZiAobV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpICYmIG1fdGVzdElu dGVyZmFjZXMtPnRlc3RSdW5uZXIoKS0+c2hvdWxkRHVtcEZyYW1lTG9hZENhbGxiYWNrcygpKSB7 CisgICAgaWYgKG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKS0+c2hvdWxkRHVtcEZyYW1l TG9hZENhbGxiYWNrcygpKSB7CiAgICAgICAgIHByaW50RnJhbWVEZXNjcmlwdGlvbihtX2RlbGVn YXRlLCBmcmFtZSk7CiAgICAgICAgIG1fZGVsZWdhdGUtPnByaW50TWVzc2FnZSgiIC0gZGlkUmVj ZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWVcbiIpOwogICAgIH0K QEAgLTY4NCw3ICs2NzcsNyBAQCB2b2lkIFdlYlRlc3RQcm94eUJhc2U6OmRpZFJlY2VpdmVTZXJ2 ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZChXZWJGcmFtZSogZnJhbQogCiB2b2lkIFdlYlRl c3RQcm94eUJhc2U6OmRpZEZhaWxQcm92aXNpb25hbExvYWQoV2ViRnJhbWUqIGZyYW1lLCBjb25z dCBXZWJVUkxFcnJvciYpCiB7Ci0gICAgaWYgKG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIo KSAmJiBtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCktPnNob3VsZER1bXBGcmFtZUxvYWRD YWxsYmFja3MoKSkgeworICAgIGlmIChtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCktPnNo b3VsZER1bXBGcmFtZUxvYWRDYWxsYmFja3MoKSkgewogICAgICAgICBwcmludEZyYW1lRGVzY3Jp cHRpb24obV9kZWxlZ2F0ZSwgZnJhbWUpOwogICAgICAgICBtX2RlbGVnYXRlLT5wcmludE1lc3Nh Z2UoIiAtIGRpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3JcbiIpOwogICAgIH0KQEAgLTY5 Myw3ICs2ODYsNyBAQCB2b2lkIFdlYlRlc3RQcm94eUJhc2U6OmRpZEZhaWxQcm92aXNpb25hbExv YWQoV2ViRnJhbWUqIGZyYW1lLCBjb25zdCBXZWJVUkxFcnJvcgogCiB2b2lkIFdlYlRlc3RQcm94 eUJhc2U6OmRpZENvbW1pdFByb3Zpc2lvbmFsTG9hZChXZWJGcmFtZSogZnJhbWUsIGJvb2wpCiB7 Ci0gICAgaWYgKG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKSAmJiBtX3Rlc3RJbnRlcmZh Y2VzLT50ZXN0UnVubmVyKCktPnNob3VsZER1bXBGcmFtZUxvYWRDYWxsYmFja3MoKSkgeworICAg IGlmIChtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCktPnNob3VsZER1bXBGcmFtZUxvYWRD YWxsYmFja3MoKSkgewogICAgICAgICBwcmludEZyYW1lRGVzY3JpcHRpb24obV9kZWxlZ2F0ZSwg ZnJhbWUpOwogICAgICAgICBtX2RlbGVnYXRlLT5wcmludE1lc3NhZ2UoIiAtIGRpZENvbW1pdExv YWRGb3JGcmFtZVxuIik7CiAgICAgfQpAQCAtNzAzLDIxICs2OTYsMjAgQEAgdm9pZCBXZWJUZXN0 UHJveHlCYXNlOjpkaWRSZWNlaXZlVGl0bGUoV2ViRnJhbWUqIGZyYW1lLCBjb25zdCBXZWJTdHJp bmcmIHRpdGxlLAogewogICAgIFdlYkNTdHJpbmcgdGl0bGU4ID0gdGl0bGUudXRmOCgpOwogCi0g ICAgaWYgKG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKSAmJiBtX3Rlc3RJbnRlcmZhY2Vz LT50ZXN0UnVubmVyKCktPnNob3VsZER1bXBGcmFtZUxvYWRDYWxsYmFja3MoKSkgeworICAgIGlm IChtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCktPnNob3VsZER1bXBGcmFtZUxvYWRDYWxs YmFja3MoKSkgewogICAgICAgICBwcmludEZyYW1lRGVzY3JpcHRpb24obV9kZWxlZ2F0ZSwgZnJh bWUpOwogICAgICAgICBtX2RlbGVnYXRlLT5wcmludE1lc3NhZ2Uoc3RyaW5nKCIgLSBkaWRSZWNl aXZlVGl0bGU6ICIpICsgdGl0bGU4LmRhdGEoKSArICJcbiIpOwogICAgIH0KIAotICAgIGlmICht X3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCkgJiYgbV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1 bm5lcigpLT5zaG91bGREdW1wVGl0bGVDaGFuZ2VzKCkpCisgICAgaWYgKG1fdGVzdEludGVyZmFj ZXMtPnRlc3RSdW5uZXIoKS0+c2hvdWxkRHVtcFRpdGxlQ2hhbmdlcygpKQogICAgICAgICBtX2Rl bGVnYXRlLT5wcmludE1lc3NhZ2Uoc3RyaW5nKCJUSVRMRSBDSEFOR0VEOiAnIikgKyB0aXRsZTgu ZGF0YSgpICsgIidcbiIpOwogCi0gICAgaWYgKG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIo KSkKLSAgICAgICAgbV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpLT5zZXRUaXRsZVRleHRE aXJlY3Rpb24oZGlyZWN0aW9uKTsKKyAgICBtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCkt PnNldFRpdGxlVGV4dERpcmVjdGlvbihkaXJlY3Rpb24pOwogfQogCiB2b2lkIFdlYlRlc3RQcm94 eUJhc2U6OmRpZEZpbmlzaERvY3VtZW50TG9hZChXZWJGcmFtZSogZnJhbWUpCiB7Ci0gICAgaWYg KG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKSAmJiBtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0 UnVubmVyKCktPnNob3VsZER1bXBGcmFtZUxvYWRDYWxsYmFja3MoKSkgeworICAgIGlmIChtX3Rl c3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCktPnNob3VsZER1bXBGcmFtZUxvYWRDYWxsYmFja3Mo KSkgewogICAgICAgICBwcmludEZyYW1lRGVzY3JpcHRpb24obV9kZWxlZ2F0ZSwgZnJhbWUpOwog ICAgICAgICBtX2RlbGVnYXRlLT5wcmludE1lc3NhZ2UoIiAtIGRpZEZpbmlzaERvY3VtZW50TG9h ZEZvckZyYW1lXG4iKTsKICAgICB9IGVsc2UgewpAQCAtNzMzLDcgKzcyNSw3IEBAIHZvaWQgV2Vi VGVzdFByb3h5QmFzZTo6ZGlkRmluaXNoRG9jdW1lbnRMb2FkKFdlYkZyYW1lKiBmcmFtZSkKIAog dm9pZCBXZWJUZXN0UHJveHlCYXNlOjpkaWRIYW5kbGVPbmxvYWRFdmVudHMoV2ViRnJhbWUqIGZy YW1lKQogewotICAgIGlmIChtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCkgJiYgbV90ZXN0 SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpLT5zaG91bGREdW1wRnJhbWVMb2FkQ2FsbGJhY2tzKCkp IHsKKyAgICBpZiAobV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpLT5zaG91bGREdW1wRnJh bWVMb2FkQ2FsbGJhY2tzKCkpIHsKICAgICAgICAgcHJpbnRGcmFtZURlc2NyaXB0aW9uKG1fZGVs ZWdhdGUsIGZyYW1lKTsKICAgICAgICAgbV9kZWxlZ2F0ZS0+cHJpbnRNZXNzYWdlKCIgLSBkaWRI YW5kbGVPbmxvYWRFdmVudHNGb3JGcmFtZVxuIik7CiAgICAgfQpAQCAtNzQxLDcgKzczMyw3IEBA IHZvaWQgV2ViVGVzdFByb3h5QmFzZTo6ZGlkSGFuZGxlT25sb2FkRXZlbnRzKFdlYkZyYW1lKiBm cmFtZSkKIAogdm9pZCBXZWJUZXN0UHJveHlCYXNlOjpkaWRGYWlsTG9hZChXZWJGcmFtZSogZnJh bWUsIGNvbnN0IFdlYlVSTEVycm9yJikKIHsKLSAgICBpZiAobV90ZXN0SW50ZXJmYWNlcy0+dGVz dFJ1bm5lcigpICYmIG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKS0+c2hvdWxkRHVtcEZy YW1lTG9hZENhbGxiYWNrcygpKSB7CisgICAgaWYgKG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5u ZXIoKS0+c2hvdWxkRHVtcEZyYW1lTG9hZENhbGxiYWNrcygpKSB7CiAgICAgICAgIHByaW50RnJh bWVEZXNjcmlwdGlvbihtX2RlbGVnYXRlLCBmcmFtZSk7CiAgICAgICAgIG1fZGVsZWdhdGUtPnBy aW50TWVzc2FnZSgiIC0gZGlkRmFpbExvYWRXaXRoRXJyb3JcbiIpOwogICAgIH0KQEAgLTc1MCw3 ICs3NDIsNyBAQCB2b2lkIFdlYlRlc3RQcm94eUJhc2U6OmRpZEZhaWxMb2FkKFdlYkZyYW1lKiBm cmFtZSwgY29uc3QgV2ViVVJMRXJyb3ImKQogCiB2b2lkIFdlYlRlc3RQcm94eUJhc2U6OmRpZEZp bmlzaExvYWQoV2ViRnJhbWUqIGZyYW1lKQogewotICAgIGlmIChtX3Rlc3RJbnRlcmZhY2VzLT50 ZXN0UnVubmVyKCkgJiYgbV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpLT5zaG91bGREdW1w RnJhbWVMb2FkQ2FsbGJhY2tzKCkpIHsKKyAgICBpZiAobV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1 bm5lcigpLT5zaG91bGREdW1wRnJhbWVMb2FkQ2FsbGJhY2tzKCkpIHsKICAgICAgICAgcHJpbnRG cmFtZURlc2NyaXB0aW9uKG1fZGVsZWdhdGUsIGZyYW1lKTsKICAgICAgICAgbV9kZWxlZ2F0ZS0+ cHJpbnRNZXNzYWdlKCIgLSBkaWRGaW5pc2hMb2FkRm9yRnJhbWVcbiIpOwogICAgIH0KQEAgLTc1 OSw3ICs3NTEsNyBAQCB2b2lkIFdlYlRlc3RQcm94eUJhc2U6OmRpZEZpbmlzaExvYWQoV2ViRnJh bWUqIGZyYW1lKQogCiB2b2lkIFdlYlRlc3RQcm94eUJhc2U6OmRpZENoYW5nZUxvY2F0aW9uV2l0 aGluUGFnZShXZWJGcmFtZSogZnJhbWUpCiB7Ci0gICAgaWYgKG1fdGVzdEludGVyZmFjZXMtPnRl c3RSdW5uZXIoKSAmJiBtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCktPnNob3VsZER1bXBG cmFtZUxvYWRDYWxsYmFja3MoKSkgeworICAgIGlmIChtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVu bmVyKCktPnNob3VsZER1bXBGcmFtZUxvYWRDYWxsYmFja3MoKSkgewogICAgICAgICBwcmludEZy YW1lRGVzY3JpcHRpb24obV9kZWxlZ2F0ZSwgZnJhbWUpOwogICAgICAgICBtX2RlbGVnYXRlLT5w cmludE1lc3NhZ2UoIiAtIGRpZENoYW5nZUxvY2F0aW9uV2l0aGluUGFnZUZvckZyYW1lXG4iKTsK ICAgICB9CkBAIC03NjcsMjUgKzc1OSwyNSBAQCB2b2lkIFdlYlRlc3RQcm94eUJhc2U6OmRpZENo YW5nZUxvY2F0aW9uV2l0aGluUGFnZShXZWJGcmFtZSogZnJhbWUpCiAKIHZvaWQgV2ViVGVzdFBy b3h5QmFzZTo6ZGlkRGlzcGxheUluc2VjdXJlQ29udGVudChXZWJGcmFtZSopCiB7Ci0gICAgaWYg KG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKSAmJiBtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0 UnVubmVyKCktPnNob3VsZER1bXBGcmFtZUxvYWRDYWxsYmFja3MoKSkKKyAgICBpZiAobV90ZXN0 SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpLT5zaG91bGREdW1wRnJhbWVMb2FkQ2FsbGJhY2tzKCkp CiAgICAgICAgIG1fZGVsZWdhdGUtPnByaW50TWVzc2FnZSgiZGlkRGlzcGxheUluc2VjdXJlQ29u dGVudFxuIik7CiB9CiAKIHZvaWQgV2ViVGVzdFByb3h5QmFzZTo6ZGlkUnVuSW5zZWN1cmVDb250 ZW50KFdlYkZyYW1lKiwgY29uc3QgV2ViU2VjdXJpdHlPcmlnaW4mLCBjb25zdCBXZWJVUkwmKQog ewotICAgIGlmIChtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCkgJiYgbV90ZXN0SW50ZXJm YWNlcy0+dGVzdFJ1bm5lcigpLT5zaG91bGREdW1wRnJhbWVMb2FkQ2FsbGJhY2tzKCkpCisgICAg aWYgKG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKS0+c2hvdWxkRHVtcEZyYW1lTG9hZENh bGxiYWNrcygpKQogICAgICAgICBtX2RlbGVnYXRlLT5wcmludE1lc3NhZ2UoImRpZFJ1bkluc2Vj dXJlQ29udGVudFxuIik7CiB9CiAKIHZvaWQgV2ViVGVzdFByb3h5QmFzZTo6ZGlkRGV0ZWN0WFNT KFdlYkZyYW1lKiwgY29uc3QgV2ViVVJMJiwgYm9vbCkKIHsKLSAgICBpZiAobV90ZXN0SW50ZXJm YWNlcy0+dGVzdFJ1bm5lcigpICYmIG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKS0+c2hv dWxkRHVtcEZyYW1lTG9hZENhbGxiYWNrcygpKQorICAgIGlmIChtX3Rlc3RJbnRlcmZhY2VzLT50 ZXN0UnVubmVyKCktPnNob3VsZER1bXBGcmFtZUxvYWRDYWxsYmFja3MoKSkKICAgICAgICAgbV9k ZWxlZ2F0ZS0+cHJpbnRNZXNzYWdlKCJkaWREZXRlY3RYU1NcbiIpOwogfQogCiB2b2lkIFdlYlRl c3RQcm94eUJhc2U6OmFzc2lnbklkZW50aWZpZXJUb1JlcXVlc3QoV2ViRnJhbWUqLCB1bnNpZ25l ZCBpZGVudGlmaWVyLCBjb25zdCBXZWJLaXQ6OldlYlVSTFJlcXVlc3QmIHJlcXVlc3QpCiB7Ci0g ICAgaWYgKG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKSAmJiBtX3Rlc3RJbnRlcmZhY2Vz LT50ZXN0UnVubmVyKCktPnNob3VsZER1bXBSZXNvdXJjZUxvYWRDYWxsYmFja3MoKSkgeworICAg IGlmIChtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCktPnNob3VsZER1bXBSZXNvdXJjZUxv YWRDYWxsYmFja3MoKSkgewogICAgICAgICBBU1NFUlQobV9yZXNvdXJjZUlkZW50aWZpZXJNYXAu ZmluZChpZGVudGlmaWVyKSA9PSBtX3Jlc291cmNlSWRlbnRpZmllck1hcC5lbmQoKSk7CiAgICAg ICAgIG1fcmVzb3VyY2VJZGVudGlmaWVyTWFwW2lkZW50aWZpZXJdID0gZGVzY3JpcHRpb25TdWl0 YWJsZUZvclRlc3RSZXN1bHQocmVxdWVzdC51cmwoKS5zcGVjKCkpOwogICAgIH0KQEAgLTc5Myw3 ICs3ODUsNyBAQCB2b2lkIFdlYlRlc3RQcm94eUJhc2U6OmFzc2lnbklkZW50aWZpZXJUb1JlcXVl c3QoV2ViRnJhbWUqLCB1bnNpZ25lZCBpZGVudGlmaWVyLAogCiB2b2lkIFdlYlRlc3RQcm94eUJh c2U6OndpbGxSZXF1ZXN0UmVzb3VyY2UoV2ViRnJhbWUqIGZyYW1lLCBjb25zdCBXZWJLaXQ6Oldl YkNhY2hlZFVSTFJlcXVlc3QmIHJlcXVlc3QpCiB7Ci0gICAgaWYgKG1fdGVzdEludGVyZmFjZXMt PnRlc3RSdW5uZXIoKSAmJiBtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCktPnNob3VsZER1 bXBSZXNvdXJjZVJlcXVlc3RDYWxsYmFja3MoKSkgeworICAgIGlmIChtX3Rlc3RJbnRlcmZhY2Vz LT50ZXN0UnVubmVyKCktPnNob3VsZER1bXBSZXNvdXJjZVJlcXVlc3RDYWxsYmFja3MoKSkgewog ICAgICAgICBwcmludEZyYW1lRGVzY3JpcHRpb24obV9kZWxlZ2F0ZSwgZnJhbWUpOwogICAgICAg ICBXZWJFbGVtZW50IGVsZW1lbnQgPSByZXF1ZXN0LmluaXRpYXRvckVsZW1lbnQoKTsKICAgICAg ICAgaWYgKCFlbGVtZW50LmlzTnVsbCgpKSB7CkBAIC04MjksNyArODIxLDcgQEAgV2ViVVJMRXJy b3IgV2ViVGVzdFByb3h5QmFzZTo6Y2Fubm90SGFuZGxlUmVxdWVzdEVycm9yKFdlYkZyYW1lKiwg Y29uc3QgV2ViVVJMUmUKIAogdm9pZCBXZWJUZXN0UHJveHlCYXNlOjpkaWRDcmVhdGVEYXRhU291 cmNlKFdlYkZyYW1lKiwgV2ViRGF0YVNvdXJjZSogZHMpCiB7Ci0gICAgaWYgKG1fdGVzdEludGVy ZmFjZXMtPnRlc3RSdW5uZXIoKSAmJiAhbV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpLT5k ZWZlck1haW5SZXNvdXJjZURhdGFMb2FkKCkpCisgICAgaWYgKCFtX3Rlc3RJbnRlcmZhY2VzLT50 ZXN0UnVubmVyKCktPmRlZmVyTWFpblJlc291cmNlRGF0YUxvYWQoKSkKICAgICAgICAgZHMtPnNl dERlZmVyTWFpblJlc291cmNlRGF0YUxvYWQoZmFsc2UpOwogfQogCkBAIC04NDEsNyArODMzLDcg QEAgdm9pZCBXZWJUZXN0UHJveHlCYXNlOjp3aWxsU2VuZFJlcXVlc3QoV2ViRnJhbWUqLCB1bnNp Z25lZCBpZGVudGlmaWVyLCBXZWJLaXQ6OlcKIAogICAgIEdVUkwgbWFpbkRvY3VtZW50VVJMID0g cmVxdWVzdC5maXJzdFBhcnR5Rm9yQ29va2llcygpOwogCi0gICAgaWYgKG1fdGVzdEludGVyZmFj ZXMtPnRlc3RSdW5uZXIoKSAmJiBtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCktPnNob3Vs ZER1bXBSZXNvdXJjZUxvYWRDYWxsYmFja3MoKSkgeworICAgIGlmIChtX3Rlc3RJbnRlcmZhY2Vz LT50ZXN0UnVubmVyKCktPnNob3VsZER1bXBSZXNvdXJjZUxvYWRDYWxsYmFja3MoKSkgewogICAg ICAgICBpZiAobV9yZXNvdXJjZUlkZW50aWZpZXJNYXAuZmluZChpZGVudGlmaWVyKSA9PSBtX3Jl c291cmNlSWRlbnRpZmllck1hcC5lbmQoKSkKICAgICAgICAgICAgIG1fZGVsZWdhdGUtPnByaW50 TWVzc2FnZSgiPHVua25vd24+Iik7CiAgICAgICAgIGVsc2UKQEAgLTg1NywxOCArODQ5LDE4IEBA IHZvaWQgV2ViVGVzdFByb3h5QmFzZTo6d2lsbFNlbmRSZXF1ZXN0KFdlYkZyYW1lKiwgdW5zaWdu ZWQgaWRlbnRpZmllciwgV2ViS2l0OjpXCiAgICAgICAgIG1fZGVsZWdhdGUtPnByaW50TWVzc2Fn ZSgiXG4iKTsKICAgICB9CiAKLSAgICBpZiAoIXJlZGlyZWN0UmVzcG9uc2UuaXNOdWxsKCkgJiYg bV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpICYmIG1fdGVzdEludGVyZmFjZXMtPnRlc3RS dW5uZXIoKS0+c2hvdWxkQmxvY2tSZWRpcmVjdHMoKSkgeworICAgIGlmICghcmVkaXJlY3RSZXNw b25zZS5pc051bGwoKSAmJiBtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCktPnNob3VsZEJs b2NrUmVkaXJlY3RzKCkpIHsKICAgICAgICAgbV9kZWxlZ2F0ZS0+cHJpbnRNZXNzYWdlKCJSZXR1 cm5pbmcgbnVsbCBmb3IgdGhpcyByZWRpcmVjdFxuIik7CiAgICAgICAgIGJsb2NrUmVxdWVzdChy ZXF1ZXN0KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGlmIChtX3Rlc3RJbnRlcmZh Y2VzLT50ZXN0UnVubmVyKCkgJiYgbV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpLT53aWxs U2VuZFJlcXVlc3RTaG91bGRSZXR1cm5OdWxsKCkpIHsKKyAgICBpZiAobV90ZXN0SW50ZXJmYWNl cy0+dGVzdFJ1bm5lcigpLT53aWxsU2VuZFJlcXVlc3RTaG91bGRSZXR1cm5OdWxsKCkpIHsKICAg ICAgICAgYmxvY2tSZXF1ZXN0KHJlcXVlc3QpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0g ICAgaWYgKG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKSAmJiBtX3Rlc3RJbnRlcmZhY2Vz LT50ZXN0UnVubmVyKCktPmh0dHBIZWFkZXJzVG9DbGVhcigpKSB7CisgICAgaWYgKG1fdGVzdElu dGVyZmFjZXMtPnRlc3RSdW5uZXIoKS0+aHR0cEhlYWRlcnNUb0NsZWFyKCkpIHsKICAgICAgICAg Y29uc3Qgc2V0PHN0cmluZz4gKmNsZWFySGVhZGVycyA9IG1fdGVzdEludGVyZmFjZXMtPnRlc3RS dW5uZXIoKS0+aHR0cEhlYWRlcnNUb0NsZWFyKCk7CiAgICAgICAgIGZvciAoc2V0PHN0cmluZz46 OmNvbnN0X2l0ZXJhdG9yIGhlYWRlciA9IGNsZWFySGVhZGVycy0+YmVnaW4oKTsgaGVhZGVyICE9 IGNsZWFySGVhZGVycy0+ZW5kKCk7ICsraGVhZGVyKQogICAgICAgICAgICAgcmVxdWVzdC5jbGVh ckhUVFBIZWFkZXJGaWVsZChXZWJTdHJpbmc6OmZyb21VVEY4KCpoZWFkZXIpKTsKQEAgLTg5MSw3 ICs4ODMsNyBAQCB2b2lkIFdlYlRlc3RQcm94eUJhc2U6OndpbGxTZW5kUmVxdWVzdChXZWJGcmFt ZSosIHVuc2lnbmVkIGlkZW50aWZpZXIsIFdlYktpdDo6VwogCiB2b2lkIFdlYlRlc3RQcm94eUJh c2U6OmRpZFJlY2VpdmVSZXNwb25zZShXZWJGcmFtZSosIHVuc2lnbmVkIGlkZW50aWZpZXIsIGNv bnN0IFdlYktpdDo6V2ViVVJMUmVzcG9uc2UmIHJlc3BvbnNlKQogewotICAgIGlmIChtX3Rlc3RJ bnRlcmZhY2VzLT50ZXN0UnVubmVyKCkgJiYgbV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigp LT5zaG91bGREdW1wUmVzb3VyY2VMb2FkQ2FsbGJhY2tzKCkpIHsKKyAgICBpZiAobV90ZXN0SW50 ZXJmYWNlcy0+dGVzdFJ1bm5lcigpLT5zaG91bGREdW1wUmVzb3VyY2VMb2FkQ2FsbGJhY2tzKCkp IHsKICAgICAgICAgaWYgKG1fcmVzb3VyY2VJZGVudGlmaWVyTWFwLmZpbmQoaWRlbnRpZmllcikg PT0gbV9yZXNvdXJjZUlkZW50aWZpZXJNYXAuZW5kKCkpCiAgICAgICAgICAgICBtX2RlbGVnYXRl LT5wcmludE1lc3NhZ2UoIjx1bmtub3duPiIpOwogICAgICAgICBlbHNlCkBAIC05MDAsNyArODky LDcgQEAgdm9pZCBXZWJUZXN0UHJveHlCYXNlOjpkaWRSZWNlaXZlUmVzcG9uc2UoV2ViRnJhbWUq LCB1bnNpZ25lZCBpZGVudGlmaWVyLCBjb25zdAogICAgICAgICBwcmludFJlc3BvbnNlRGVzY3Jp cHRpb24obV9kZWxlZ2F0ZSwgcmVzcG9uc2UpOwogICAgICAgICBtX2RlbGVnYXRlLT5wcmludE1l c3NhZ2UoIlxuIik7CiAgICAgfQotICAgIGlmIChtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVy KCkgJiYgbV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpLT5zaG91bGREdW1wUmVzb3VyY2VS ZXNwb25zZU1JTUVUeXBlcygpKSB7CisgICAgaWYgKG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5u ZXIoKS0+c2hvdWxkRHVtcFJlc291cmNlUmVzcG9uc2VNSU1FVHlwZXMoKSkgewogICAgICAgICBH VVJMIHVybCA9IHJlc3BvbnNlLnVybCgpOwogICAgICAgICBXZWJTdHJpbmcgbWltZVR5cGUgPSBy ZXNwb25zZS5taW1lVHlwZSgpOwogICAgICAgICBtX2RlbGVnYXRlLT5wcmludE1lc3NhZ2UodXJs LkV4dHJhY3RGaWxlTmFtZSgpKTsKQEAgLTkxMyw3ICs5MDUsNyBAQCB2b2lkIFdlYlRlc3RQcm94 eUJhc2U6OmRpZFJlY2VpdmVSZXNwb25zZShXZWJGcmFtZSosIHVuc2lnbmVkIGlkZW50aWZpZXIs IGNvbnN0CiAKIHZvaWQgV2ViVGVzdFByb3h5QmFzZTo6ZGlkRmluaXNoUmVzb3VyY2VMb2FkKFdl YkZyYW1lKiwgdW5zaWduZWQgaWRlbnRpZmllcikKIHsKLSAgICBpZiAobV90ZXN0SW50ZXJmYWNl cy0+dGVzdFJ1bm5lcigpICYmIG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKS0+c2hvdWxk RHVtcFJlc291cmNlTG9hZENhbGxiYWNrcygpKSB7CisgICAgaWYgKG1fdGVzdEludGVyZmFjZXMt PnRlc3RSdW5uZXIoKS0+c2hvdWxkRHVtcFJlc291cmNlTG9hZENhbGxiYWNrcygpKSB7CiAgICAg ICAgIGlmIChtX3Jlc291cmNlSWRlbnRpZmllck1hcC5maW5kKGlkZW50aWZpZXIpID09IG1fcmVz b3VyY2VJZGVudGlmaWVyTWFwLmVuZCgpKQogICAgICAgICAgICAgbV9kZWxlZ2F0ZS0+cHJpbnRN ZXNzYWdlKCI8dW5rbm93bj4iKTsKICAgICAgICAgZWxzZQpAQCAtOTI1LDcgKzkxNyw3IEBAIHZv aWQgV2ViVGVzdFByb3h5QmFzZTo6ZGlkRmluaXNoUmVzb3VyY2VMb2FkKFdlYkZyYW1lKiwgdW5z aWduZWQgaWRlbnRpZmllcikKIAogdm9pZCBXZWJUZXN0UHJveHlCYXNlOjpkaWRGYWlsUmVzb3Vy Y2VMb2FkKFdlYkZyYW1lKiwgdW5zaWduZWQgaWRlbnRpZmllciwgY29uc3QgV2ViS2l0OjpXZWJV UkxFcnJvciYgZXJyb3IpCiB7Ci0gICAgaWYgKG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIo KSAmJiBtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCktPnNob3VsZER1bXBSZXNvdXJjZUxv YWRDYWxsYmFja3MoKSkgeworICAgIGlmIChtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCkt PnNob3VsZER1bXBSZXNvdXJjZUxvYWRDYWxsYmFja3MoKSkgewogICAgICAgICBpZiAobV9yZXNv dXJjZUlkZW50aWZpZXJNYXAuZmluZChpZGVudGlmaWVyKSA9PSBtX3Jlc291cmNlSWRlbnRpZmll ck1hcC5lbmQoKSkKICAgICAgICAgICAgIG1fZGVsZWdhdGUtPnByaW50TWVzc2FnZSgiPHVua25v d24+Iik7CiAgICAgICAgIGVsc2UKQEAgLTk5MCwxNSArOTgyLDExIEBAIGJvb2wgV2ViVGVzdFBy b3h5QmFzZTo6cnVuTW9kYWxQcm9tcHREaWFsb2coV2ViRnJhbWUqIGZyYW1lLCBjb25zdCBXZWJT dHJpbmcmIG1lCiBib29sIFdlYlRlc3RQcm94eUJhc2U6OnJ1bk1vZGFsQmVmb3JlVW5sb2FkRGlh bG9nKFdlYkZyYW1lKiwgY29uc3QgV2ViU3RyaW5nJiBtZXNzYWdlKQogewogICAgIG1fZGVsZWdh dGUtPnByaW50TWVzc2FnZShzdHJpbmcoIkNPTkZJUk0gTkFWSUdBVElPTjogIikgKyBtZXNzYWdl LnV0ZjgoKS5kYXRhKCkgKyAiXG4iKTsKLSAgICBpZiAoIW1fdGVzdEludGVyZmFjZXMtPnRlc3RS dW5uZXIoKSkKLSAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgcmV0dXJuICFtX3Rlc3RJbnRlcmZh Y2VzLT50ZXN0UnVubmVyKCktPnNob3VsZFN0YXlPblBhZ2VBZnRlckhhbmRsaW5nQmVmb3JlVW5s b2FkKCk7CiB9CiAKIHZvaWQgV2ViVGVzdFByb3h5QmFzZTo6bG9jYXRpb25DaGFuZ2VEb25lKFdl YkZyYW1lKiBmcmFtZSkKIHsKLSAgICBpZiAoIW1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIo KSkKLSAgICAgICAgcmV0dXJuOwogICAgIGlmIChmcmFtZSAhPSBtX3Rlc3RJbnRlcmZhY2VzLT50 ZXN0UnVubmVyKCktPnRvcExvYWRpbmdGcmFtZSgpKQogICAgICAgICByZXR1cm47CiAgICAgbV90 ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpLT5zZXRUb3BMb2FkaW5nRnJhbWUoZnJhbWUsIHRy dWUpOwpAQCAtMTAwNyw3ICs5OTUsNyBAQCB2b2lkIFdlYlRlc3RQcm94eUJhc2U6OmxvY2F0aW9u Q2hhbmdlRG9uZShXZWJGcmFtZSogZnJhbWUpCiBXZWJOYXZpZ2F0aW9uUG9saWN5IFdlYlRlc3RQ cm94eUJhc2U6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb24oV2ViRnJhbWUqLCBjb25zdCBXZWJV UkxSZXF1ZXN0JiByZXF1ZXN0LCBXZWJOYXZpZ2F0aW9uVHlwZSB0eXBlLCBjb25zdCBXZWJOb2Rl JiBvcmlnaW5hdGluZ05vZGUsIFdlYk5hdmlnYXRpb25Qb2xpY3kgZGVmYXVsdFBvbGljeSwgYm9v bCBpc1JlZGlyZWN0KQogewogICAgIFdlYk5hdmlnYXRpb25Qb2xpY3kgcmVzdWx0OwotICAgIGlm ICghKG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKSAmJiBtX3Rlc3RJbnRlcmZhY2VzLT50 ZXN0UnVubmVyKCktPnBvbGljeURlbGVnYXRlRW5hYmxlZCgpKSkKKyAgICBpZiAoIW1fdGVzdElu dGVyZmFjZXMtPnRlc3RSdW5uZXIoKS0+cG9saWN5RGVsZWdhdGVFbmFibGVkKCkpCiAgICAgICAg IHJldHVybiBkZWZhdWx0UG9saWN5OwogCiAgICAgbV9kZWxlZ2F0ZS0+cHJpbnRNZXNzYWdlKHN0 cmluZygiUG9saWN5IGRlbGVnYXRlOiBhdHRlbXB0IHRvIGxvYWQgIikgKyBVUkxEZXNjcmlwdGlv bihyZXF1ZXN0LnVybCgpKSArICIgd2l0aCBuYXZpZ2F0aW9uIHR5cGUgJyIgKyB3ZWJOYXZpZ2F0 aW9uVHlwZVRvU3RyaW5nKHR5cGUpICsgIiciKTsKQEAgLTEwMjgsNyArMTAxNiw3IEBAIFdlYk5h dmlnYXRpb25Qb2xpY3kgV2ViVGVzdFByb3h5QmFzZTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlv bihXZWJGcmFtZSosIGNvbnN0CiAKIGJvb2wgV2ViVGVzdFByb3h5QmFzZTo6d2lsbENoZWNrQW5k RGlzcGF0Y2hNZXNzYWdlRXZlbnQoV2ViRnJhbWUqLCBXZWJGcmFtZSosIFdlYlNlY3VyaXR5T3Jp Z2luLCBXZWJET01NZXNzYWdlRXZlbnQpCiB7Ci0gICAgaWYgKG1fdGVzdEludGVyZmFjZXMtPnRl c3RSdW5uZXIoKSAmJiBtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCktPnNob3VsZEludGVy Y2VwdFBvc3RNZXNzYWdlKCkpIHsKKyAgICBpZiAobV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5l cigpLT5zaG91bGRJbnRlcmNlcHRQb3N0TWVzc2FnZSgpKSB7CiAgICAgICAgIG1fZGVsZWdhdGUt PnByaW50TWVzc2FnZSgiaW50ZXJjZXB0ZWQgcG9zdE1lc3NhZ2VcbiIpOwogICAgICAgICByZXR1 cm4gdHJ1ZTsKICAgICB9Cg==