135128 2014-07-21 13:06:18 -0700 [MSE] YouTube video decode error when variant-switching 2014-12-16 13:26:00 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble calvaris commit-queue eric.carlson glenn ltilve philipj sergio oldest_to_newest 1023764 0 jer.noble 2014-07-21 13:06:18 -0700 [MSE] YouTube video decode error when variant-switching 1023767 1 235242 jer.noble 2014-07-21 13:16:40 -0700 Created attachment 235242 Patch 1023768 2 jer.noble 2014-07-21 13:17:13 -0700 <rdar://problem/17740181> 1023771 3 235243 jer.noble 2014-07-21 13:31:07 -0700 Created attachment 235243 Patch 1023775 4 235243 bfulgham 2014-07-21 13:44:30 -0700 Comment on attachment 235243 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=235243&action=review r=me. > Source/WebCore/Modules/mediasource/SampleMap.cpp:119 > + decodeOrder().m_samples.insert(DecodeOrderSampleMap::MapType::value_type(decodeKey, sample)); All this seems a bit verbose, but certainly is fine. 1023776 5 jer.noble 2014-07-21 13:47:24 -0700 Committed r171316: <http://trac.webkit.org/changeset/171316> 1056082 6 jer.noble 2014-12-16 13:26:00 -0800 <rdar://problem/19268991> 235242 2014-07-21 13:16:40 -0700 2014-07-21 13:31:04 -0700 Patch bug-135128-20140721131625.patch text/plain 18396 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTcxMjQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjBjNGNhZmM5NzJhNjNh MGRkODcwODIzYjI5MDkxZmFiMjA3MmRlMC4uY2MzN2U4YjE0MmIwNGJlNDIzMTY4OWM3YjlkODNl ZDljZjAwMjBhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE0LTA3LTIxICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtNU0VdIFlvdVR1YmUgdmlk ZW8gZGVjb2RlIGVycm9yIHdoZW4gdmFyaWFudC1zd2l0Y2hpbmcKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTEyOAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL21lZGlhLXNvdXJjZS9t ZWRpYS1zb3VyY2Utb3ZlcmxhcHBpbmctZGVjb2RldGltZS5odG1sCisKKyAgICAgICAgV2hlbiB2 YXJpYW50LXN3aXRjaGluZywgdGhlIHNpdHVhdGlvbiBjYW4gYXJpc2Ugd2hlcmUgYW4gZXhpc3Rp bmcgc2FtcGxlIHdpdGggYSBwcmVzZW50YXRpb24KKyAgICAgICAgdGltZXN0YW1wIG9mIE4gYW5k IGEgZGVjb2RlIHRpbWVzdGFtcCBvZiBNLCBhbmQgYSBuZXcgc2FtcGxlIHdpdGggYSBwcmVzZW50 YXRpb24gdGltZXN0YW1wID4gTgorICAgICAgICBhbmQgdGhlIHNhbWUgZGVjb2RlIHRpbWVzdGFt cCBvZiBNLCB3aWxsIGtlZXAgdGhlIG5ldyBzYW1wbGUgZnJvbSBiZWluZyBhZGRlZCB0byB0aGUg U2FtcGxlTWFwLgorICAgICAgICBUaGlzIGNhbiByZXN1bHQgaW4gYSBkZWNvZGUgZXJyb3Igd2hl biBzYW1wbGVzIGRlcGVuZGluZyBvbiB0aGF0IG5ldywgbWlzc2luZyBzYW1wbGUgYXJlIGVucXVl dWVkLgorCisgICAgICAgIFRoZSBNU0Ugc3BlYyBpcyBzaWxlbnQgb24gdGhlIGlzc3VlIG9mIG92 ZXJsYXBwaW5nIGRlY29kZSB0aW1lc3RhbXBzLiBIb3dldmVyLCBpdCBndWFyYW50ZWVzIHRoYXQK KyAgICAgICAgcHJlc2VudGF0aW9uIHRpbWVzdGFtcHMgYXJlIG5vbi1vdmVybGFwcGluZy4gU28g aW5zdGVhZCBvZiB1c2luZyBqdXN0IHRoZSBkZWNvZGUgdGltZXN0YW1wIGFzIGEga2V5CisgICAg ICAgIGZvciBzdG9yaW5nIHRoZSBzYW1wbGVzIGluIGRlY29kZSBvcmRlciwgdXNlIGJvdGggdGhl IGRlY29kZSB0aW1lc3RhbXAgYW5kIHRoZSBwcmVzZW50YXRpb24gdGltZXN0YW1wLgorICAgICAg ICBUaGF0IGVuc3VyZXMgdGhhdCBzYW1wbGVzIHdpdGggZGlmZmVyZW50IHByZXNlbnRhdGlvbiB0 aW1lcyBidXQgZXF1YWwgZGVjb2RlIHRpbWVzIGFyZSBib3RoIGluc2VydGVkCisgICAgICAgIGlu dG8gdGhlIGRlY29kZSBxdWV1ZSwgYW5kIGluIHRoZSBjb3JyZWN0IG9yZGVyLgorCisgICAgICAg ICogTW9kdWxlcy9tZWRpYXNvdXJjZS9TYW1wbGVNYXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U2FtcGxlSXNSYW5kb21BY2Nlc3M6Om9wZXJhdG9yKCkpOiBVcGRhdGUgdGhlIHBhcmFtZXRlciB0 eXBlIHRvIG1hdGNoIHRoZSBuZXcgS2V5VHlwZS4KKyAgICAgICAgKFdlYkNvcmU6OlNhbXBsZU1h cDo6YWRkU2FtcGxlKTogUGFzcyBib3RoIGRlY29kZVRpbWUgYW5kIHByZXNlbnRhdGlvblRpbWUg YXMgdGhlIGtleSB0byBkZWNvZGVPcmRlci4KKyAgICAgICAgKFdlYkNvcmU6OlNhbXBsZU1hcDo6 cmVtb3ZlU2FtcGxlKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpEZWNvZGVPcmRlclNhbXBs ZU1hcDo6ZmluZFNhbXBsZVdpdGhEZWNvZGVLZXkpOiBSZW5hbWVkIGZyb20gZmluZFNhbXBsZVdp dGhEZWNvZGVUaW1lLgorICAgICAgICAoV2ViQ29yZTo6RGVjb2RlT3JkZXJTYW1wbGVNYXA6OnJl dmVyc2VGaW5kU2FtcGxlV2l0aERlY29kZUtleSk6IHJlbmFtZWQgZnJvbSByZXZlcnNlRmluZFNh bXBsZVdpdGhEZWNvZGVUaW1lLgorICAgICAgICAoV2ViQ29yZTo6RGVjb2RlT3JkZXJTYW1wbGVN YXA6OmZpbmRTeW5jU2FtcGxlUHJpb3JUb1ByZXNlbnRhdGlvblRpbWUpOiBVc2UgcmVuYW1lZCB2 ZXJzaW9uIG9mIGFib3ZlLgorICAgICAgICAoV2ViQ29yZTo6RGVjb2RlT3JkZXJTYW1wbGVNYXA6 OmZpbmRTeW5jU2FtcGxlQWZ0ZXJQcmVzZW50YXRpb25UaW1lKTogRGl0dG8uCisgICAgICAgIChX ZWJDb3JlOjpEZWNvZGVPcmRlclNhbXBsZU1hcDo6ZmluZERlcGVuZGVudFNhbXBsZXMpOiBEaXR0 by4KKyAgICAgICAgKFdlYkNvcmU6OkRlY29kZU9yZGVyU2FtcGxlTWFwOjpmaW5kU2FtcGxlV2l0 aERlY29kZVRpbWUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RGVjb2RlT3JkZXJTYW1w bGVNYXA6OnJldmVyc2VGaW5kU2FtcGxlV2l0aERlY29kZVRpbWUpOiBEZWxldGVkLgorICAgICAg ICAqIE1vZHVsZXMvbWVkaWFzb3VyY2UvU2FtcGxlTWFwLmg6CisgICAgICAgICogTW9kdWxlcy9t ZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U291cmNlQnVm ZmVyOjpyZW1vdmVDb2RlZEZyYW1lcyk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6U291cmNl QnVmZmVyOjpzb3VyY2VCdWZmZXJQcml2YXRlRGlkUmVjZWl2ZVNhbXBsZSk6IERpdHRvLgorICAg ICAgICAoV2ViQ29yZTo6U291cmNlQnVmZmVyOjpyZWVucXVldWVNZWRpYUZvclRpbWUpOiBEaXR0 by4KKwogMjAxNC0wNy0xNiAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAg ICAgICBFbmFibGUgbGVnYWN5IGZ1bGxzY3JlZW4gQVBJIGluIG1lZGlhIGNvbnRyb2xzCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL1NhbXBsZU1hcC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL1NhbXBsZU1hcC5jcHAKaW5kZXgg NjkyZTEwODliMTE4YTk2ZmE1MjUzNTU1NDRkNTZkNzljMTQ5MmRmMy4uNDU0NDcyZDJhYzgwMTVk ZTg2YzUwYmM1YmZmNmVkNzZhNmVjYTY0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYXNvdXJjZS9TYW1wbGVNYXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFzb3VyY2UvU2FtcGxlTWFwLmNwcApAQCAtNjYsNyArNjYsNyBAQCBwdWJsaWM6CiAK IGNsYXNzIFNhbXBsZUlzUmFuZG9tQWNjZXNzIHsKIHB1YmxpYzoKLSAgICBib29sIG9wZXJhdG9y KCkoc3RkOjpwYWlyPE1lZGlhVGltZSwgUmVmUHRyPE1lZGlhU2FtcGxlPj4gdmFsdWUpCisgICAg Ym9vbCBvcGVyYXRvcigpKERlY29kZU9yZGVyU2FtcGxlTWFwOjpNYXBUeXBlOjp2YWx1ZV90eXBl JiB2YWx1ZSkKICAgICB7CiAgICAgICAgIHJldHVybiB2YWx1ZS5zZWNvbmQtPmZsYWdzKCkgPT0g TWVkaWFTYW1wbGU6OklzU3luYzsKICAgICB9CkBAIC0xMTIsOCArMTEyLDExIEBAIHZvaWQgU2Ft cGxlTWFwOjphZGRTYW1wbGUoUGFzc1JlZlB0cjxNZWRpYVNhbXBsZT4gcHJwU2FtcGxlKQogewog ICAgIFJlZlB0cjxNZWRpYVNhbXBsZT4gc2FtcGxlID0gcHJwU2FtcGxlOwogICAgIEFTU0VSVChz YW1wbGUpOworCiAgICAgcHJlc2VudGF0aW9uT3JkZXIoKS5tX3NhbXBsZXMuaW5zZXJ0KFByZXNl bnRhdGlvbk9yZGVyU2FtcGxlTWFwOjpNYXBUeXBlOjp2YWx1ZV90eXBlKHNhbXBsZS0+cHJlc2Vu dGF0aW9uVGltZSgpLCBzYW1wbGUpKTsKLSAgICBkZWNvZGVPcmRlcigpLm1fc2FtcGxlcy5pbnNl cnQoRGVjb2RlT3JkZXJTYW1wbGVNYXA6Ok1hcFR5cGU6OnZhbHVlX3R5cGUoc2FtcGxlLT5kZWNv ZGVUaW1lKCksIHNhbXBsZSkpOworCisgICAgYXV0byBkZWNvZGVLZXkgPSBEZWNvZGVPcmRlclNh bXBsZU1hcDo6S2V5VHlwZShzYW1wbGUtPmRlY29kZVRpbWUoKSwgc2FtcGxlLT5wcmVzZW50YXRp b25UaW1lKCkpOworICAgIGRlY29kZU9yZGVyKCkubV9zYW1wbGVzLmluc2VydChEZWNvZGVPcmRl clNhbXBsZU1hcDo6TWFwVHlwZTo6dmFsdWVfdHlwZShkZWNvZGVLZXksIHNhbXBsZSkpOwogCiAg ICAgbV90b3RhbFNpemUgKz0gc2FtcGxlLT5zaXplSW5CeXRlcygpOwogfQpAQCAtMTIyLDcgKzEy NSw5IEBAIHZvaWQgU2FtcGxlTWFwOjpyZW1vdmVTYW1wbGUoTWVkaWFTYW1wbGUqIHNhbXBsZSkK IHsKICAgICBBU1NFUlQoc2FtcGxlKTsKICAgICBwcmVzZW50YXRpb25PcmRlcigpLm1fc2FtcGxl cy5lcmFzZShzYW1wbGUtPnByZXNlbnRhdGlvblRpbWUoKSk7Ci0gICAgZGVjb2RlT3JkZXIoKS5t X3NhbXBsZXMuZXJhc2Uoc2FtcGxlLT5kZWNvZGVUaW1lKCkpOworCisgICAgYXV0byBkZWNvZGVL ZXkgPSBEZWNvZGVPcmRlclNhbXBsZU1hcDo6S2V5VHlwZShzYW1wbGUtPmRlY29kZVRpbWUoKSwg c2FtcGxlLT5wcmVzZW50YXRpb25UaW1lKCkpOworICAgIGRlY29kZU9yZGVyKCkubV9zYW1wbGVz LmVyYXNlKGRlY29kZUtleSk7CiAKICAgICBtX3RvdGFsU2l6ZSAtPSBzYW1wbGUtPnNpemVJbkJ5 dGVzKCk7CiB9CkBAIC0xNDgsOSArMTUzLDkgQEAgUHJlc2VudGF0aW9uT3JkZXJTYW1wbGVNYXA6 Oml0ZXJhdG9yIFByZXNlbnRhdGlvbk9yZGVyU2FtcGxlTWFwOjpmaW5kU2FtcGxlT25PckEKICAg ICByZXR1cm4gbV9zYW1wbGVzLmxvd2VyX2JvdW5kKHRpbWUpOwogfQogCi1EZWNvZGVPcmRlclNh bXBsZU1hcDo6aXRlcmF0b3IgRGVjb2RlT3JkZXJTYW1wbGVNYXA6OmZpbmRTYW1wbGVXaXRoRGVj b2RlVGltZShjb25zdCBNZWRpYVRpbWUmIHRpbWUpCitEZWNvZGVPcmRlclNhbXBsZU1hcDo6aXRl cmF0b3IgRGVjb2RlT3JkZXJTYW1wbGVNYXA6OmZpbmRTYW1wbGVXaXRoRGVjb2RlS2V5KGNvbnN0 IEtleVR5cGUmIGtleSkKIHsKLSAgICByZXR1cm4gbV9zYW1wbGVzLmZpbmQodGltZSk7CisgICAg cmV0dXJuIG1fc2FtcGxlcy5maW5kKGtleSk7CiB9CiAKIFByZXNlbnRhdGlvbk9yZGVyU2FtcGxl TWFwOjpyZXZlcnNlX2l0ZXJhdG9yIFByZXNlbnRhdGlvbk9yZGVyU2FtcGxlTWFwOjpyZXZlcnNl RmluZFNhbXBsZUNvbnRhaW5pbmdQcmVzZW50YXRpb25UaW1lKGNvbnN0IE1lZGlhVGltZSYgdGlt ZSkKQEAgLTE2Niw5ICsxNzEsOSBAQCBQcmVzZW50YXRpb25PcmRlclNhbXBsZU1hcDo6cmV2ZXJz ZV9pdGVyYXRvciBQcmVzZW50YXRpb25PcmRlclNhbXBsZU1hcDo6cmV2ZXJzZQogICAgIHJldHVy biBzdGQ6Omxvd2VyX2JvdW5kKHJiZWdpbigpLCByZW5kKCksIHRpbWUsIFNhbXBsZUlzR3JlYXRl clRoYW5NZWRpYVRpbWVDb21wYXJhdG9yPE1hcFR5cGU+KCkpOwogfQogCi1EZWNvZGVPcmRlclNh bXBsZU1hcDo6cmV2ZXJzZV9pdGVyYXRvciBEZWNvZGVPcmRlclNhbXBsZU1hcDo6cmV2ZXJzZUZp bmRTYW1wbGVXaXRoRGVjb2RlVGltZShjb25zdCBNZWRpYVRpbWUmIHRpbWUpCitEZWNvZGVPcmRl clNhbXBsZU1hcDo6cmV2ZXJzZV9pdGVyYXRvciBEZWNvZGVPcmRlclNhbXBsZU1hcDo6cmV2ZXJz ZUZpbmRTYW1wbGVXaXRoRGVjb2RlS2V5KGNvbnN0IEtleVR5cGUmIGtleSkKIHsKLSAgICBEZWNv ZGVPcmRlclNhbXBsZU1hcDo6aXRlcmF0b3IgZm91bmQgPSBmaW5kU2FtcGxlV2l0aERlY29kZVRp bWUodGltZSk7CisgICAgRGVjb2RlT3JkZXJTYW1wbGVNYXA6Oml0ZXJhdG9yIGZvdW5kID0gZmlu ZFNhbXBsZVdpdGhEZWNvZGVLZXkoa2V5KTsKICAgICBpZiAoZm91bmQgPT0gZW5kKCkpCiAgICAg ICAgIHJldHVybiByZW5kKCk7CiAgICAgcmV0dXJuIC0tcmV2ZXJzZV9pdGVyYXRvcihmb3VuZCk7 CkBAIC0xODAsNyArMTg1LDggQEAgRGVjb2RlT3JkZXJTYW1wbGVNYXA6OnJldmVyc2VfaXRlcmF0 b3IgRGVjb2RlT3JkZXJTYW1wbGVNYXA6OmZpbmRTeW5jU2FtcGxlUHJpb3IKICAgICBpZiAocmV2 ZXJzZUN1cnJlbnRTYW1wbGVQVFMgPT0gbV9wcmVzZW50YXRpb25PcmRlci5yZW5kKCkpCiAgICAg ICAgIHJldHVybiByZW5kKCk7CiAKLSAgICByZXZlcnNlX2l0ZXJhdG9yIHJldmVyc2VDdXJyZW50 U2FtcGxlRFRTID0gcmV2ZXJzZUZpbmRTYW1wbGVXaXRoRGVjb2RlVGltZShyZXZlcnNlQ3VycmVu dFNhbXBsZVBUUy0+c2Vjb25kLT5kZWNvZGVUaW1lKCkpOworICAgIGNvbnN0IFJlZlB0cjxNZWRp YVNhbXBsZT4mIHNhbXBsZSA9IHJldmVyc2VDdXJyZW50U2FtcGxlUFRTLT5zZWNvbmQ7CisgICAg cmV2ZXJzZV9pdGVyYXRvciByZXZlcnNlQ3VycmVudFNhbXBsZURUUyA9IHJldmVyc2VGaW5kU2Ft cGxlV2l0aERlY29kZUtleShLZXlUeXBlKHNhbXBsZS0+ZGVjb2RlVGltZSgpLCBzYW1wbGUtPnBy ZXNlbnRhdGlvblRpbWUoKSkpOwogCiAgICAgcmV2ZXJzZV9pdGVyYXRvciBmb3VuZFNhbXBsZSA9 IGZpbmRTeW5jU2FtcGxlUHJpb3JUb0RlY29kZUl0ZXJhdG9yKHJldmVyc2VDdXJyZW50U2FtcGxl RFRTKTsKICAgICBpZiAoZm91bmRTYW1wbGUgPT0gcmVuZCgpKQpAQCAtMjAxLDcgKzIwNyw4IEBA IERlY29kZU9yZGVyU2FtcGxlTWFwOjppdGVyYXRvciBEZWNvZGVPcmRlclNhbXBsZU1hcDo6Zmlu ZFN5bmNTYW1wbGVBZnRlclByZXNlbnRhCiAgICAgaWYgKGN1cnJlbnRTYW1wbGVQVFMgPT0gbV9w cmVzZW50YXRpb25PcmRlci5lbmQoKSkKICAgICAgICAgcmV0dXJuIGVuZCgpOwogCi0gICAgaXRl cmF0b3IgY3VycmVudFNhbXBsZURUUyA9IGZpbmRTYW1wbGVXaXRoRGVjb2RlVGltZShjdXJyZW50 U2FtcGxlUFRTLT5zZWNvbmQtPmRlY29kZVRpbWUoKSk7CisgICAgY29uc3QgUmVmUHRyPE1lZGlh U2FtcGxlPiYgc2FtcGxlID0gY3VycmVudFNhbXBsZVBUUy0+c2Vjb25kOworICAgIGl0ZXJhdG9y IGN1cnJlbnRTYW1wbGVEVFMgPSBmaW5kU2FtcGxlV2l0aERlY29kZUtleShLZXlUeXBlKHNhbXBs ZS0+ZGVjb2RlVGltZSgpLCBzYW1wbGUtPnByZXNlbnRhdGlvblRpbWUoKSkpOwogICAgIAogICAg IE1lZGlhVGltZSB1cHBlckJvdW5kID0gdGltZSArIHRocmVzaG9sZDsKICAgICBpdGVyYXRvciBm b3VuZFNhbXBsZSA9IHN0ZDo6ZmluZF9pZihjdXJyZW50U2FtcGxlRFRTLCBlbmQoKSwgU2FtcGxl SXNSYW5kb21BY2Nlc3MoKSk7CkBAIC0yMzQsNyArMjQxLDcgQEAgUHJlc2VudGF0aW9uT3JkZXJT YW1wbGVNYXA6Oml0ZXJhdG9yX3JhbmdlIFByZXNlbnRhdGlvbk9yZGVyU2FtcGxlTWFwOjpmaW5k U2FtcGwKIERlY29kZU9yZGVyU2FtcGxlTWFwOjpyZXZlcnNlX2l0ZXJhdG9yX3JhbmdlIERlY29k ZU9yZGVyU2FtcGxlTWFwOjpmaW5kRGVwZW5kZW50U2FtcGxlcyhNZWRpYVNhbXBsZSogc2FtcGxl KQogewogICAgIEFTU0VSVChzYW1wbGUpOwotICAgIHJldmVyc2VfaXRlcmF0b3IgY3VycmVudERl Y29kZUl0ZXIgPSByZXZlcnNlRmluZFNhbXBsZVdpdGhEZWNvZGVUaW1lKHNhbXBsZS0+ZGVjb2Rl VGltZSgpKTsKKyAgICByZXZlcnNlX2l0ZXJhdG9yIGN1cnJlbnREZWNvZGVJdGVyID0gcmV2ZXJz ZUZpbmRTYW1wbGVXaXRoRGVjb2RlS2V5KEtleVR5cGUoc2FtcGxlLT5kZWNvZGVUaW1lKCksIHNh bXBsZS0+cHJlc2VudGF0aW9uVGltZSgpKSk7CiAgICAgcmV2ZXJzZV9pdGVyYXRvciBuZXh0U3lu Y1NhbXBsZSA9IGZpbmRTeW5jU2FtcGxlUHJpb3JUb0RlY29kZUl0ZXJhdG9yKGN1cnJlbnREZWNv ZGVJdGVyKTsKICAgICByZXR1cm4gcmV2ZXJzZV9pdGVyYXRvcl9yYW5nZShjdXJyZW50RGVjb2Rl SXRlciwgbmV4dFN5bmNTYW1wbGUpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYXNvdXJjZS9TYW1wbGVNYXAuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVk aWFzb3VyY2UvU2FtcGxlTWFwLmgKaW5kZXggY2U2ODdmMzk5NGUyZTdkM2M4NTZmOTJmODRjZGMw NmEyZTNmNTM5NS4uZjMwMDA1NzVlMzhmYTdhNmU4MWMzZDYzN2ZlYjY1ZDc3NmQwYjVjOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9TYW1wbGVNYXAuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL1NhbXBsZU1hcC5oCkBAIC00 MCw3ICs0MCw3IEBAIGNsYXNzIFNhbXBsZU1hcDsKIGNsYXNzIFByZXNlbnRhdGlvbk9yZGVyU2Ft cGxlTWFwIHsKICAgICBmcmllbmQgY2xhc3MgU2FtcGxlTWFwOwogcHVibGljOgotICAgIHR5cGVk ZWYgc3RkOjptYXA8TWVkaWFUaW1lLCBSZWZQdHI8TWVkaWFTYW1wbGU+PiBNYXBUeXBlOworICAg IHR5cGVkZWYgc3RkOjptdWx0aW1hcDxNZWRpYVRpbWUsIFJlZlB0cjxNZWRpYVNhbXBsZT4+IE1h cFR5cGU7CiAgICAgdHlwZWRlZiBNYXBUeXBlOjppdGVyYXRvciBpdGVyYXRvcjsKICAgICB0eXBl ZGVmIE1hcFR5cGU6OnJldmVyc2VfaXRlcmF0b3IgcmV2ZXJzZV9pdGVyYXRvcjsKICAgICB0eXBl ZGVmIHN0ZDo6cGFpcjxpdGVyYXRvciwgaXRlcmF0b3I+IGl0ZXJhdG9yX3JhbmdlOwpAQCAtNjUs NyArNjUsOCBAQCBwcml2YXRlOgogY2xhc3MgRGVjb2RlT3JkZXJTYW1wbGVNYXAgewogICAgIGZy aWVuZCBjbGFzcyBTYW1wbGVNYXA7CiBwdWJsaWM6Ci0gICAgdHlwZWRlZiBzdGQ6Om1hcDxNZWRp YVRpbWUsIFJlZlB0cjxNZWRpYVNhbXBsZT4+IE1hcFR5cGU7CisgICAgdHlwZWRlZiBzdGQ6OnBh aXI8TWVkaWFUaW1lLCBNZWRpYVRpbWU+IEtleVR5cGU7CisgICAgdHlwZWRlZiBzdGQ6Om11bHRp bWFwPEtleVR5cGUsIFJlZlB0cjxNZWRpYVNhbXBsZT4+IE1hcFR5cGU7CiAgICAgdHlwZWRlZiBN YXBUeXBlOjppdGVyYXRvciBpdGVyYXRvcjsKICAgICB0eXBlZGVmIE1hcFR5cGU6OnJldmVyc2Vf aXRlcmF0b3IgcmV2ZXJzZV9pdGVyYXRvcjsKICAgICB0eXBlZGVmIHN0ZDo6cGFpcjxyZXZlcnNl X2l0ZXJhdG9yLCByZXZlcnNlX2l0ZXJhdG9yPiByZXZlcnNlX2l0ZXJhdG9yX3JhbmdlOwpAQCAt NzUsOCArNzYsOCBAQCBwdWJsaWM6CiAgICAgcmV2ZXJzZV9pdGVyYXRvciByYmVnaW4oKSB7IHJl dHVybiBtX3NhbXBsZXMucmJlZ2luKCk7IH0KICAgICByZXZlcnNlX2l0ZXJhdG9yIHJlbmQoKSB7 IHJldHVybiBtX3NhbXBsZXMucmVuZCgpOyB9CiAKLSAgICBpdGVyYXRvciBmaW5kU2FtcGxlV2l0 aERlY29kZVRpbWUoY29uc3QgTWVkaWFUaW1lJik7Ci0gICAgcmV2ZXJzZV9pdGVyYXRvciByZXZl cnNlRmluZFNhbXBsZVdpdGhEZWNvZGVUaW1lKGNvbnN0IE1lZGlhVGltZSYpOworICAgIGl0ZXJh dG9yIGZpbmRTYW1wbGVXaXRoRGVjb2RlS2V5KGNvbnN0IEtleVR5cGUmKTsKKyAgICByZXZlcnNl X2l0ZXJhdG9yIHJldmVyc2VGaW5kU2FtcGxlV2l0aERlY29kZUtleShjb25zdCBLZXlUeXBlJik7 CiAgICAgcmV2ZXJzZV9pdGVyYXRvciBmaW5kU3luY1NhbXBsZVByaW9yVG9QcmVzZW50YXRpb25U aW1lKGNvbnN0IE1lZGlhVGltZSYsIGNvbnN0IE1lZGlhVGltZSYgdGhyZXNob2xkID0gTWVkaWFU aW1lOjpwb3NpdGl2ZUluZmluaXRlVGltZSgpKTsKICAgICByZXZlcnNlX2l0ZXJhdG9yIGZpbmRT eW5jU2FtcGxlUHJpb3JUb0RlY29kZUl0ZXJhdG9yKHJldmVyc2VfaXRlcmF0b3IpOwogICAgIGl0 ZXJhdG9yIGZpbmRTeW5jU2FtcGxlQWZ0ZXJQcmVzZW50YXRpb25UaW1lKGNvbnN0IE1lZGlhVGlt ZSYsIGNvbnN0IE1lZGlhVGltZSYgdGhyZXNob2xkID0gTWVkaWFUaW1lOjpwb3NpdGl2ZUluZmlu aXRlVGltZSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3Vy Y2UvU291cmNlQnVmZmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2Uv U291cmNlQnVmZmVyLmNwcAppbmRleCBjNjQ1MDIxOTYzYWIzM2YxMmY5YmVhMmI2MjNiZWQxY2Rk MWFiZjYwLi45ODMyYThkNDM3MmY1ZjcxMGZiMzc0MDg4YjQ5NWMyMTEzODU2MDExIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuY3Bw CkBAIC01NjIsNyArNTYyLDggQEAgdm9pZCBTb3VyY2VCdWZmZXI6OnJlbW92ZUNvZGVkRnJhbWVz KGNvbnN0IE1lZGlhVGltZSYgc3RhcnQsIGNvbnN0IE1lZGlhVGltZSYgZW4KICAgICAgICAgLy8g YW5kIHRoZSBuZXh0IHN5bmMgc2FtcGxlIGZyYW1lIGFyZSByZW1vdmVkLiBCdXQgd2UgbXVzdCBz dGFydCBmcm9tIHRoZSBmaXJzdCBzYW1wbGUgaW4gZGVjb2RlIG9yZGVyLCBub3QKICAgICAgICAg Ly8gcHJlc2VudGF0aW9uIG9yZGVyLgogICAgICAgICBQcmVzZW50YXRpb25PcmRlclNhbXBsZU1h cDo6aXRlcmF0b3IgbWluRGVjb2RlVGltZUl0ZXIgPSBzdGQ6Om1pbl9lbGVtZW50KHJlbW92ZVBy ZXNlbnRhdGlvblN0YXJ0LCByZW1vdmVQcmVzZW50YXRpb25FbmQsIGRlY29kZVRpbWVDb21wYXJh dG9yKTsKLSAgICAgICAgRGVjb2RlT3JkZXJTYW1wbGVNYXA6Oml0ZXJhdG9yIHJlbW92ZURlY29k ZVN0YXJ0ID0gdHJhY2tCdWZmZXIuc2FtcGxlcy5kZWNvZGVPcmRlcigpLmZpbmRTYW1wbGVXaXRo RGVjb2RlVGltZShtaW5EZWNvZGVUaW1lSXRlci0+c2Vjb25kLT5kZWNvZGVUaW1lKCkpOworICAg ICAgICBEZWNvZGVPcmRlclNhbXBsZU1hcDo6S2V5VHlwZSBkZWNvZGVLZXkobWluRGVjb2RlVGlt ZUl0ZXItPnNlY29uZC0+ZGVjb2RlVGltZSgpLCBtaW5EZWNvZGVUaW1lSXRlci0+c2Vjb25kLT5w cmVzZW50YXRpb25UaW1lKCkpOworICAgICAgICBEZWNvZGVPcmRlclNhbXBsZU1hcDo6aXRlcmF0 b3IgcmVtb3ZlRGVjb2RlU3RhcnQgPSB0cmFja0J1ZmZlci5zYW1wbGVzLmRlY29kZU9yZGVyKCku ZmluZFNhbXBsZVdpdGhEZWNvZGVLZXkoZGVjb2RlS2V5KTsKIAogICAgICAgICBEZWNvZGVPcmRl clNhbXBsZU1hcDo6TWFwVHlwZSBlcmFzZWRTYW1wbGVzKHJlbW92ZURlY29kZVN0YXJ0LCByZW1v dmVEZWNvZGVFbmQpOwogCkBAIC0xMTU3LDggKzExNTgsOCBAQCB2b2lkIFNvdXJjZUJ1ZmZlcjo6 c291cmNlQnVmZmVyUHJpdmF0ZURpZFJlY2VpdmVTYW1wbGUoU291cmNlQnVmZmVyUHJpdmF0ZSos IFBhcwogCiAgICAgICAgICAgICAvLyBPdGhlcndpc2U6IFJlbW92ZSBhbGwgY29kZWQgZnJhbWVz IGJldHdlZW4gdGhlIGNvZGVkIGZyYW1lcyByZW1vdmVkIGluIHRoZSBwcmV2aW91cyBzdGVwCiAg ICAgICAgICAgICAvLyBhbmQgdGhlIG5leHQgcmFuZG9tIGFjY2VzcyBwb2ludCBhZnRlciB0aG9z ZSByZW1vdmVkIGZyYW1lcy4KLSAgICAgICAgICAgIGF1dG8gZmlyc3REZWNvZGVJdGVyID0gdHJh Y2tCdWZmZXIuc2FtcGxlcy5kZWNvZGVPcmRlcigpLmZpbmRTYW1wbGVXaXRoRGVjb2RlVGltZShl cmFzZWRTYW1wbGVzLmRlY29kZU9yZGVyKCkuYmVnaW4oKS0+Zmlyc3QpOwotICAgICAgICAgICAg YXV0byBsYXN0RGVjb2RlSXRlciA9IHRyYWNrQnVmZmVyLnNhbXBsZXMuZGVjb2RlT3JkZXIoKS5m aW5kU2FtcGxlV2l0aERlY29kZVRpbWUoZXJhc2VkU2FtcGxlcy5kZWNvZGVPcmRlcigpLnJiZWdp bigpLT5maXJzdCk7CisgICAgICAgICAgICBhdXRvIGZpcnN0RGVjb2RlSXRlciA9IHRyYWNrQnVm ZmVyLnNhbXBsZXMuZGVjb2RlT3JkZXIoKS5maW5kU2FtcGxlV2l0aERlY29kZUtleShlcmFzZWRT YW1wbGVzLmRlY29kZU9yZGVyKCkuYmVnaW4oKS0+Zmlyc3QpOworICAgICAgICAgICAgYXV0byBs YXN0RGVjb2RlSXRlciA9IHRyYWNrQnVmZmVyLnNhbXBsZXMuZGVjb2RlT3JkZXIoKS5maW5kU2Ft cGxlV2l0aERlY29kZUtleShlcmFzZWRTYW1wbGVzLmRlY29kZU9yZGVyKCkucmJlZ2luKCktPmZp cnN0KTsKICAgICAgICAgICAgIGF1dG8gbmV4dFN5bmNJdGVyID0gdHJhY2tCdWZmZXIuc2FtcGxl cy5kZWNvZGVPcmRlcigpLmZpbmRTeW5jU2FtcGxlQWZ0ZXJEZWNvZGVJdGVyYXRvcihsYXN0RGVj b2RlSXRlcik7CiAgICAgICAgICAgICBkZXBlbmRlbnRTYW1wbGVzLmluc2VydChmaXJzdERlY29k ZUl0ZXIsIG5leHRTeW5jSXRlcik7CiAKQEAgLTExODYsNyArMTE4Nyw5IEBAIHZvaWQgU291cmNl QnVmZmVyOjpzb3VyY2VCdWZmZXJQcml2YXRlRGlkUmVjZWl2ZVNhbXBsZShTb3VyY2VCdWZmZXJQ cml2YXRlKiwgUGFzCiAgICAgICAgIC8vIE90aGVyd2lzZToKICAgICAgICAgLy8gQWRkIHRoZSBj b2RlZCBmcmFtZSB3aXRoIHRoZSBwcmVzZW50YXRpb24gdGltZXN0YW1wLCBkZWNvZGUgdGltZXN0 YW1wLCBhbmQgZnJhbWUgZHVyYXRpb24gdG8gdGhlIHRyYWNrIGJ1ZmZlci4KICAgICAgICAgdHJh Y2tCdWZmZXIuc2FtcGxlcy5hZGRTYW1wbGUoc2FtcGxlKTsKLSAgICAgICAgdHJhY2tCdWZmZXIu ZGVjb2RlUXVldWUuaW5zZXJ0KERlY29kZU9yZGVyU2FtcGxlTWFwOjpNYXBUeXBlOjp2YWx1ZV90 eXBlKGRlY29kZVRpbWVzdGFtcCwgc2FtcGxlKSk7CisKKyAgICAgICAgRGVjb2RlT3JkZXJTYW1w bGVNYXA6OktleVR5cGUgZGVjb2RlS2V5KGRlY29kZVRpbWVzdGFtcCwgcHJlc2VudGF0aW9uVGlt ZXN0YW1wKTsKKyAgICAgICAgdHJhY2tCdWZmZXIuZGVjb2RlUXVldWUuaW5zZXJ0KERlY29kZU9y ZGVyU2FtcGxlTWFwOjpNYXBUeXBlOjp2YWx1ZV90eXBlKGRlY29kZUtleSwgc2FtcGxlKSk7CiAK ICAgICAgICAgLy8gMS4xOCBTZXQgbGFzdCBkZWNvZGUgdGltZXN0YW1wIGZvciB0cmFjayBidWZm ZXIgdG8gZGVjb2RlIHRpbWVzdGFtcC4KICAgICAgICAgdHJhY2tCdWZmZXIubGFzdERlY29kZVRp bWVzdGFtcCA9IGRlY29kZVRpbWVzdGFtcDsKQEAgLTEzODAsOCArMTM4Myw4IEBAIHZvaWQgU291 cmNlQnVmZmVyOjpyZWVucXVldWVNZWRpYUZvclRpbWUoVHJhY2tCdWZmZXImIHRyYWNrQnVmZmVy LCBBdG9taWNTdHJpbmcKICAgICB9CiAKICAgICAvLyBTZWFjaCBiYWNrd2FyZCBmb3IgdGhlIHBy ZXZpb3VzIHN5bmMgc2FtcGxlLgotICAgIE1lZGlhVGltZSBjdXJyZW50U2FtcGxlRGVjb2RlVGlt ZSA9IGN1cnJlbnRTYW1wbGVQVFNJdGVyYXRvci0+c2Vjb25kLT5kZWNvZGVUaW1lKCk7Ci0gICAg YXV0byBjdXJyZW50U2FtcGxlRFRTSXRlcmF0b3IgPSB0cmFja0J1ZmZlci5zYW1wbGVzLmRlY29k ZU9yZGVyKCkuZmluZFNhbXBsZVdpdGhEZWNvZGVUaW1lKGN1cnJlbnRTYW1wbGVEZWNvZGVUaW1l KTsKKyAgICBEZWNvZGVPcmRlclNhbXBsZU1hcDo6S2V5VHlwZSBkZWNvZGVLZXkoY3VycmVudFNh bXBsZVBUU0l0ZXJhdG9yLT5zZWNvbmQtPmRlY29kZVRpbWUoKSwgY3VycmVudFNhbXBsZVBUU0l0 ZXJhdG9yLT5zZWNvbmQtPnByZXNlbnRhdGlvblRpbWUoKSk7CisgICAgYXV0byBjdXJyZW50U2Ft cGxlRFRTSXRlcmF0b3IgPSB0cmFja0J1ZmZlci5zYW1wbGVzLmRlY29kZU9yZGVyKCkuZmluZFNh bXBsZVdpdGhEZWNvZGVLZXkoZGVjb2RlS2V5KTsKICAgICBBU1NFUlQoY3VycmVudFNhbXBsZURU U0l0ZXJhdG9yICE9IHRyYWNrQnVmZmVyLnNhbXBsZXMuZGVjb2RlT3JkZXIoKS5lbmQoKSk7CiAK ICAgICBhdXRvIHJldmVyc2VDdXJyZW50U2FtcGxlSXRlciA9IC0tRGVjb2RlT3JkZXJTYW1wbGVN YXA6OnJldmVyc2VfaXRlcmF0b3IoY3VycmVudFNhbXBsZURUU0l0ZXJhdG9yKTsKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA5 OTI4YzA4OTYzMTNkNGNkNDI2ODJmMmNiNjE2YjRiYzUzMTA3YWMwLi4yNDFmNDNmYjFkNmY4MjA5 Mzg3ZTA5YTNkZDAwOTIyZWQyMDUwYjcwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTQtMDct MjEgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgW01TRV0gWW91 VHViZSB2aWRlbyBkZWNvZGUgZXJyb3Igd2hlbiB2YXJpYW50LXN3aXRjaGluZworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1MTI4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBtZWRpYS9tZWRpYS1zb3Vy Y2UvbWVkaWEtc291cmNlLW92ZXJsYXBwaW5nLWRlY29kZXRpbWUtZXhwZWN0ZWQudHh0OiBBZGRl ZC4KKyAgICAgICAgKiBtZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLW92ZXJsYXBwaW5n LWRlY29kZXRpbWUuaHRtbDogQWRkZWQuCisKIDIwMTQtMDctMTYgIEplciBOb2JsZSAgPGplci5u b2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgRW5hYmxlIGxlZ2FjeSBmdWxsc2NyZWVuIEFQSSBp biBtZWRpYSBjb250cm9scwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEtc291 cmNlL21lZGlhLXNvdXJjZS1vdmVybGFwcGluZy1kZWNvZGV0aW1lLWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL21lZGlhL21lZGlhLXNvdXJjZS9tZWRpYS1zb3VyY2Utb3ZlcmxhcHBpbmctZGVj b2RldGltZS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNTA0NGRhYWEyYjhmYmUwYmY4ODY3MmZm MGUwNzMzYTUyODA5YWM3NgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21l ZGlhLXNvdXJjZS9tZWRpYS1zb3VyY2Utb3ZlcmxhcHBpbmctZGVjb2RldGltZS1leHBlY3RlZC50 eHQKQEAgLTAsMCArMSwyMCBAQAorCitSVU4odmlkZW8uc3JjID0gVVJMLmNyZWF0ZU9iamVjdFVS TChzb3VyY2UpKQorRVZFTlQoc291cmNlb3BlbikKK1JVTihzb3VyY2VCdWZmZXIgPSBzb3VyY2Uu YWRkU291cmNlQnVmZmVyKCJ2aWRlby9tb2NrOyBjb2RlY3M9bW9jayIpKQorUlVOKHNvdXJjZUJ1 ZmZlci5hcHBlbmRCdWZmZXIoaW5pdFNlZ21lbnQpKQorRVZFTlQodXBkYXRlZW5kKQorUlVOKHNv dXJjZUJ1ZmZlci5hcHBlbmRCdWZmZXIoc2FtcGxlcykpCitFVkVOVCh1cGRhdGVlbmQpCitSVU4o c291cmNlQnVmZmVyLmFwcGVuZEJ1ZmZlcihzYW1wbGVzKSkKK0VWRU5UKHVwZGF0ZWVuZCkKK0VY UEVDVEVEIChidWZmZXJlZFNhbXBsZXMubGVuZ3RoID09ICc3JykgT0sKK3tQVFMoezAvMTAwMCwg MC4wMDAwMDB9KSwgRFRTKHswLzEwMDAsIDAuMDAwMDAwfSksIGR1cmF0aW9uKHsxMDAwLzEwMDAs IDEuMDAwMDAwfSksIGZsYWdzKDEpLCBnZW5lcmF0aW9uKDApfQore1BUUyh7MTAwMC8xMDAwLCAx LjAwMDAwMH0pLCBEVFMoezEwMDAvMTAwMCwgMS4wMDAwMDB9KSwgZHVyYXRpb24oezEwMDAvMTAw MCwgMS4wMDAwMDB9KSwgZmxhZ3MoMCksIGdlbmVyYXRpb24oMCl9Cit7UFRTKHsyMDAwLzEwMDAs IDIuMDAwMDAwfSksIERUUyh7MjAwMC8xMDAwLCAyLjAwMDAwMH0pLCBkdXJhdGlvbih7MTAwMC8x MDAwLCAxLjAwMDAwMH0pLCBmbGFncygwKSwgZ2VuZXJhdGlvbigwKX0KK3tQVFMoezMwMDAvMTAw MCwgMy4wMDAwMDB9KSwgRFRTKHszMDAwLzEwMDAsIDMuMDAwMDAwfSksIGR1cmF0aW9uKHsxMDAw LzEwMDAsIDEuMDAwMDAwfSksIGZsYWdzKDEpLCBnZW5lcmF0aW9uKDApfQore1BUUyh7NDAwMC8x MDAwLCA0LjAwMDAwMH0pLCBEVFMoezMwMDAvMTAwMCwgMy4wMDAwMDB9KSwgZHVyYXRpb24oezEw MDAvMTAwMCwgMS4wMDAwMDB9KSwgZmxhZ3MoMSksIGdlbmVyYXRpb24oMSl9Cit7UFRTKHs1MDAw LzEwMDAsIDUuMDAwMDAwfSksIERUUyh7NDAwMC8xMDAwLCA0LjAwMDAwMH0pLCBkdXJhdGlvbih7 MTAwMC8xMDAwLCAxLjAwMDAwMH0pLCBmbGFncygwKSwgZ2VuZXJhdGlvbigxKX0KK3tQVFMoezYw MDAvMTAwMCwgNi4wMDAwMDB9KSwgRFRTKHs1MDAwLzEwMDAsIDUuMDAwMDAwfSksIGR1cmF0aW9u KHsxMDAwLzEwMDAsIDEuMDAwMDAwfSksIGZsYWdzKDApLCBnZW5lcmF0aW9uKDEpfQorRU5EIE9G IFRFU1QKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEtc291cmNlL21lZGlh LXNvdXJjZS1vdmVybGFwcGluZy1kZWNvZGV0aW1lLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS9t ZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLW92ZXJsYXBwaW5nLWRlY29kZXRpbWUuaHRtbApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi4yZTkyOGY2MzA0MTA2NDEyM2RhYjgwNTY5ZDE0YTFkMTY0YmQ3NzhiCi0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEtc291cmNlL21lZGlhLXNvdXJjZS1v dmVybGFwcGluZy1kZWNvZGV0aW1lLmh0bWwKQEAgLTAsMCArMSw3MSBAQAorPCFET0NUWVBFIGh0 bWw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDx0aXRsZT5tb2NrLW1lZGlhLXNvdXJjZTwvdGl0bGU+ CisgICAgPHNjcmlwdCBzcmM9Im1vY2stbWVkaWEtc291cmNlLmpzIj48L3NjcmlwdD4KKyAgICA8 c2NyaXB0IHNyYz0iLi4vdmlkZW8tdGVzdC5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdD4KKyAg ICB2YXIgc291cmNlOworICAgIHZhciBzb3VyY2VCdWZmZXI7CisgICAgdmFyIGluaXRTZWdtZW50 OworICAgIHZhciBzYW1wbGVzOworICAgIHZhciBidWZmZXJlZFNhbXBsZXM7CisKKyAgICBpZiAo d2luZG93LmludGVybmFscykKKyAgICAgICAgaW50ZXJuYWxzLmluaXRpYWxpemVNb2NrTWVkaWFT b3VyY2UoKTsKKworICAgIGZ1bmN0aW9uIHJ1blRlc3QoKQorICAgIHsKKyAgICAgICAgZmluZE1l ZGlhRWxlbWVudCgpOworCisgICAgICAgIHNvdXJjZSA9IG5ldyBNZWRpYVNvdXJjZSgpOworICAg ICAgICB3YWl0Rm9yRXZlbnRPbihzb3VyY2UsICdzb3VyY2VvcGVuJywgc291cmNlT3Blbik7Cisg ICAgICAgIHJ1bigndmlkZW8uc3JjID0gVVJMLmNyZWF0ZU9iamVjdFVSTChzb3VyY2UpJyk7Cisg ICAgfQorCisgICAgZnVuY3Rpb24gc291cmNlT3BlbigpCisgICAgeworICAgICAgICBydW4oJ3Nv dXJjZUJ1ZmZlciA9IHNvdXJjZS5hZGRTb3VyY2VCdWZmZXIoInZpZGVvL21vY2s7IGNvZGVjcz1t b2NrIiknKTsKKyAgICAgICAgd2FpdEZvckV2ZW50T24oc291cmNlQnVmZmVyLCAndXBkYXRlZW5k JywgbG9hZE9yZGVyZWRTYW1wbGVzLCBmYWxzZSwgdHJ1ZSk7CisgICAgICAgIGluaXRTZWdtZW50 ID0gbWFrZUFJbml0KDgsIFttYWtlQVRyYWNrKDEsICdtb2NrJywgVFJBQ0tfS0lORC5WSURFTyld KTsKKyAgICAgICAgcnVuKCdzb3VyY2VCdWZmZXIuYXBwZW5kQnVmZmVyKGluaXRTZWdtZW50KScp OworICAgIH0KKworICAgIGZ1bmN0aW9uIGxvYWRPcmRlcmVkU2FtcGxlcygpCisgICAgeworICAg ICAgIHNhbXBsZXMgPSBjb25jYXRlbmF0ZVNhbXBsZXMoWworICAgICAgICAgICAgbWFrZUFTYW1w bGUoMCwgMCwgMSwgMSwgU0FNUExFX0ZMQUcuU1lOQywgMCksCisgICAgICAgICAgICBtYWtlQVNh bXBsZSgxLCAxLCAxLCAxLCBTQU1QTEVfRkxBRy5OT05FLCAwKSwKKyAgICAgICAgICAgIG1ha2VB U2FtcGxlKDIsIDIsIDEsIDEsIFNBTVBMRV9GTEFHLk5PTkUsIDApLAorICAgICAgICAgICAgbWFr ZUFTYW1wbGUoMywgMywgMSwgMSwgU0FNUExFX0ZMQUcuU1lOQywgMCksCisgICAgICAgICAgICBt YWtlQVNhbXBsZSg0LCA0LCAxLCAxLCBTQU1QTEVfRkxBRy5OT05FLCAwKSwKKyAgICAgICAgICAg IG1ha2VBU2FtcGxlKDUsIDUsIDEsIDEsIFNBTVBMRV9GTEFHLk5PTkUsIDApLAorICAgICAgICBd KTsKKyAgICAgICAgd2FpdEZvckV2ZW50T24oc291cmNlQnVmZmVyLCAndXBkYXRlZW5kJywgbG9h ZE1vcmVPcmRlcmVkU2FtcGxlcywgZmFsc2UsIHRydWUpOworICAgICAgICBydW4oJ3NvdXJjZUJ1 ZmZlci5hcHBlbmRCdWZmZXIoc2FtcGxlcyknKTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBsb2Fk TW9yZU9yZGVyZWRTYW1wbGVzKCkKKyAgICB7CisgICAgICAgIHNhbXBsZXMgPSBjb25jYXRlbmF0 ZVNhbXBsZXMoWworICAgICAgICAgICAgbWFrZUFTYW1wbGUoNCwgMywgMSwgMSwgU0FNUExFX0ZM QUcuU1lOQywgMSksCisgICAgICAgICAgICBtYWtlQVNhbXBsZSg1LCA0LCAxLCAxLCBTQU1QTEVf RkxBRy5OT05FLCAxKSwKKyAgICAgICAgICAgIG1ha2VBU2FtcGxlKDYsIDUsIDEsIDEsIFNBTVBM RV9GTEFHLk5PTkUsIDEpLAorICAgICAgICBdKTsKKyAgICAgICAgd2FpdEZvckV2ZW50T24oc291 cmNlQnVmZmVyLCAndXBkYXRlZW5kJywgc2FtcGxlc0FkZGVkLCBmYWxzZSwgdHJ1ZSk7CisgICAg ICAgIHJ1bignc291cmNlQnVmZmVyLmFwcGVuZEJ1ZmZlcihzYW1wbGVzKScpOworICAgIH0KKwor ICAgICBmdW5jdGlvbiBzYW1wbGVzQWRkZWQoKQorICAgIHsKKyAgICAgICAgYnVmZmVyZWRTYW1w bGVzID0gaW50ZXJuYWxzLmJ1ZmZlcmVkU2FtcGxlc0ZvclRyYWNrSUQoc291cmNlQnVmZmVyLCAx KTsKKyAgICAgICAgdGVzdEV4cGVjdGVkKCJidWZmZXJlZFNhbXBsZXMubGVuZ3RoIiwgNyk7Cisg ICAgICAgIGJ1ZmZlcmVkU2FtcGxlcy5mb3JFYWNoKGNvbnNvbGVXcml0ZSk7CisKKyAgICAgICAg ZW5kVGVzdCgpOworICAgIH0KKyAgICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9ubG9hZD0i cnVuVGVzdCgpIj4KKyAgICA8dmlkZW8+PC92aWRlbz4KKzwvYm9keT4K 235243 2014-07-21 13:31:07 -0700 2014-07-21 13:44:30 -0700 Patch bug-135128-20140721133051.patch text/plain 17994 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTcxMjQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjBjNGNhZmM5NzJhNjNh MGRkODcwODIzYjI5MDkxZmFiMjA3MmRlMC4uY2MzN2U4YjE0MmIwNGJlNDIzMTY4OWM3YjlkODNl ZDljZjAwMjBhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE0LTA3LTIxICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtNU0VdIFlvdVR1YmUgdmlk ZW8gZGVjb2RlIGVycm9yIHdoZW4gdmFyaWFudC1zd2l0Y2hpbmcKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTEyOAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL21lZGlhLXNvdXJjZS9t ZWRpYS1zb3VyY2Utb3ZlcmxhcHBpbmctZGVjb2RldGltZS5odG1sCisKKyAgICAgICAgV2hlbiB2 YXJpYW50LXN3aXRjaGluZywgdGhlIHNpdHVhdGlvbiBjYW4gYXJpc2Ugd2hlcmUgYW4gZXhpc3Rp bmcgc2FtcGxlIHdpdGggYSBwcmVzZW50YXRpb24KKyAgICAgICAgdGltZXN0YW1wIG9mIE4gYW5k IGEgZGVjb2RlIHRpbWVzdGFtcCBvZiBNLCBhbmQgYSBuZXcgc2FtcGxlIHdpdGggYSBwcmVzZW50 YXRpb24gdGltZXN0YW1wID4gTgorICAgICAgICBhbmQgdGhlIHNhbWUgZGVjb2RlIHRpbWVzdGFt cCBvZiBNLCB3aWxsIGtlZXAgdGhlIG5ldyBzYW1wbGUgZnJvbSBiZWluZyBhZGRlZCB0byB0aGUg U2FtcGxlTWFwLgorICAgICAgICBUaGlzIGNhbiByZXN1bHQgaW4gYSBkZWNvZGUgZXJyb3Igd2hl biBzYW1wbGVzIGRlcGVuZGluZyBvbiB0aGF0IG5ldywgbWlzc2luZyBzYW1wbGUgYXJlIGVucXVl dWVkLgorCisgICAgICAgIFRoZSBNU0Ugc3BlYyBpcyBzaWxlbnQgb24gdGhlIGlzc3VlIG9mIG92 ZXJsYXBwaW5nIGRlY29kZSB0aW1lc3RhbXBzLiBIb3dldmVyLCBpdCBndWFyYW50ZWVzIHRoYXQK KyAgICAgICAgcHJlc2VudGF0aW9uIHRpbWVzdGFtcHMgYXJlIG5vbi1vdmVybGFwcGluZy4gU28g aW5zdGVhZCBvZiB1c2luZyBqdXN0IHRoZSBkZWNvZGUgdGltZXN0YW1wIGFzIGEga2V5CisgICAg ICAgIGZvciBzdG9yaW5nIHRoZSBzYW1wbGVzIGluIGRlY29kZSBvcmRlciwgdXNlIGJvdGggdGhl IGRlY29kZSB0aW1lc3RhbXAgYW5kIHRoZSBwcmVzZW50YXRpb24gdGltZXN0YW1wLgorICAgICAg ICBUaGF0IGVuc3VyZXMgdGhhdCBzYW1wbGVzIHdpdGggZGlmZmVyZW50IHByZXNlbnRhdGlvbiB0 aW1lcyBidXQgZXF1YWwgZGVjb2RlIHRpbWVzIGFyZSBib3RoIGluc2VydGVkCisgICAgICAgIGlu dG8gdGhlIGRlY29kZSBxdWV1ZSwgYW5kIGluIHRoZSBjb3JyZWN0IG9yZGVyLgorCisgICAgICAg ICogTW9kdWxlcy9tZWRpYXNvdXJjZS9TYW1wbGVNYXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U2FtcGxlSXNSYW5kb21BY2Nlc3M6Om9wZXJhdG9yKCkpOiBVcGRhdGUgdGhlIHBhcmFtZXRlciB0 eXBlIHRvIG1hdGNoIHRoZSBuZXcgS2V5VHlwZS4KKyAgICAgICAgKFdlYkNvcmU6OlNhbXBsZU1h cDo6YWRkU2FtcGxlKTogUGFzcyBib3RoIGRlY29kZVRpbWUgYW5kIHByZXNlbnRhdGlvblRpbWUg YXMgdGhlIGtleSB0byBkZWNvZGVPcmRlci4KKyAgICAgICAgKFdlYkNvcmU6OlNhbXBsZU1hcDo6 cmVtb3ZlU2FtcGxlKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpEZWNvZGVPcmRlclNhbXBs ZU1hcDo6ZmluZFNhbXBsZVdpdGhEZWNvZGVLZXkpOiBSZW5hbWVkIGZyb20gZmluZFNhbXBsZVdp dGhEZWNvZGVUaW1lLgorICAgICAgICAoV2ViQ29yZTo6RGVjb2RlT3JkZXJTYW1wbGVNYXA6OnJl dmVyc2VGaW5kU2FtcGxlV2l0aERlY29kZUtleSk6IHJlbmFtZWQgZnJvbSByZXZlcnNlRmluZFNh bXBsZVdpdGhEZWNvZGVUaW1lLgorICAgICAgICAoV2ViQ29yZTo6RGVjb2RlT3JkZXJTYW1wbGVN YXA6OmZpbmRTeW5jU2FtcGxlUHJpb3JUb1ByZXNlbnRhdGlvblRpbWUpOiBVc2UgcmVuYW1lZCB2 ZXJzaW9uIG9mIGFib3ZlLgorICAgICAgICAoV2ViQ29yZTo6RGVjb2RlT3JkZXJTYW1wbGVNYXA6 OmZpbmRTeW5jU2FtcGxlQWZ0ZXJQcmVzZW50YXRpb25UaW1lKTogRGl0dG8uCisgICAgICAgIChX ZWJDb3JlOjpEZWNvZGVPcmRlclNhbXBsZU1hcDo6ZmluZERlcGVuZGVudFNhbXBsZXMpOiBEaXR0 by4KKyAgICAgICAgKFdlYkNvcmU6OkRlY29kZU9yZGVyU2FtcGxlTWFwOjpmaW5kU2FtcGxlV2l0 aERlY29kZVRpbWUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RGVjb2RlT3JkZXJTYW1w bGVNYXA6OnJldmVyc2VGaW5kU2FtcGxlV2l0aERlY29kZVRpbWUpOiBEZWxldGVkLgorICAgICAg ICAqIE1vZHVsZXMvbWVkaWFzb3VyY2UvU2FtcGxlTWFwLmg6CisgICAgICAgICogTW9kdWxlcy9t ZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U291cmNlQnVm ZmVyOjpyZW1vdmVDb2RlZEZyYW1lcyk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6U291cmNl QnVmZmVyOjpzb3VyY2VCdWZmZXJQcml2YXRlRGlkUmVjZWl2ZVNhbXBsZSk6IERpdHRvLgorICAg ICAgICAoV2ViQ29yZTo6U291cmNlQnVmZmVyOjpyZWVucXVldWVNZWRpYUZvclRpbWUpOiBEaXR0 by4KKwogMjAxNC0wNy0xNiAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAg ICAgICBFbmFibGUgbGVnYWN5IGZ1bGxzY3JlZW4gQVBJIGluIG1lZGlhIGNvbnRyb2xzCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL1NhbXBsZU1hcC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL1NhbXBsZU1hcC5jcHAKaW5kZXgg NjkyZTEwODliMTE4YTk2ZmE1MjUzNTU1NDRkNTZkNzljMTQ5MmRmMy4uNDU0NDcyZDJhYzgwMTVk ZTg2YzUwYmM1YmZmNmVkNzZhNmVjYTY0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYXNvdXJjZS9TYW1wbGVNYXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFzb3VyY2UvU2FtcGxlTWFwLmNwcApAQCAtNjYsNyArNjYsNyBAQCBwdWJsaWM6CiAK IGNsYXNzIFNhbXBsZUlzUmFuZG9tQWNjZXNzIHsKIHB1YmxpYzoKLSAgICBib29sIG9wZXJhdG9y KCkoc3RkOjpwYWlyPE1lZGlhVGltZSwgUmVmUHRyPE1lZGlhU2FtcGxlPj4gdmFsdWUpCisgICAg Ym9vbCBvcGVyYXRvcigpKERlY29kZU9yZGVyU2FtcGxlTWFwOjpNYXBUeXBlOjp2YWx1ZV90eXBl JiB2YWx1ZSkKICAgICB7CiAgICAgICAgIHJldHVybiB2YWx1ZS5zZWNvbmQtPmZsYWdzKCkgPT0g TWVkaWFTYW1wbGU6OklzU3luYzsKICAgICB9CkBAIC0xMTIsOCArMTEyLDExIEBAIHZvaWQgU2Ft cGxlTWFwOjphZGRTYW1wbGUoUGFzc1JlZlB0cjxNZWRpYVNhbXBsZT4gcHJwU2FtcGxlKQogewog ICAgIFJlZlB0cjxNZWRpYVNhbXBsZT4gc2FtcGxlID0gcHJwU2FtcGxlOwogICAgIEFTU0VSVChz YW1wbGUpOworCiAgICAgcHJlc2VudGF0aW9uT3JkZXIoKS5tX3NhbXBsZXMuaW5zZXJ0KFByZXNl bnRhdGlvbk9yZGVyU2FtcGxlTWFwOjpNYXBUeXBlOjp2YWx1ZV90eXBlKHNhbXBsZS0+cHJlc2Vu dGF0aW9uVGltZSgpLCBzYW1wbGUpKTsKLSAgICBkZWNvZGVPcmRlcigpLm1fc2FtcGxlcy5pbnNl cnQoRGVjb2RlT3JkZXJTYW1wbGVNYXA6Ok1hcFR5cGU6OnZhbHVlX3R5cGUoc2FtcGxlLT5kZWNv ZGVUaW1lKCksIHNhbXBsZSkpOworCisgICAgYXV0byBkZWNvZGVLZXkgPSBEZWNvZGVPcmRlclNh bXBsZU1hcDo6S2V5VHlwZShzYW1wbGUtPmRlY29kZVRpbWUoKSwgc2FtcGxlLT5wcmVzZW50YXRp b25UaW1lKCkpOworICAgIGRlY29kZU9yZGVyKCkubV9zYW1wbGVzLmluc2VydChEZWNvZGVPcmRl clNhbXBsZU1hcDo6TWFwVHlwZTo6dmFsdWVfdHlwZShkZWNvZGVLZXksIHNhbXBsZSkpOwogCiAg ICAgbV90b3RhbFNpemUgKz0gc2FtcGxlLT5zaXplSW5CeXRlcygpOwogfQpAQCAtMTIyLDcgKzEy NSw5IEBAIHZvaWQgU2FtcGxlTWFwOjpyZW1vdmVTYW1wbGUoTWVkaWFTYW1wbGUqIHNhbXBsZSkK IHsKICAgICBBU1NFUlQoc2FtcGxlKTsKICAgICBwcmVzZW50YXRpb25PcmRlcigpLm1fc2FtcGxl cy5lcmFzZShzYW1wbGUtPnByZXNlbnRhdGlvblRpbWUoKSk7Ci0gICAgZGVjb2RlT3JkZXIoKS5t X3NhbXBsZXMuZXJhc2Uoc2FtcGxlLT5kZWNvZGVUaW1lKCkpOworCisgICAgYXV0byBkZWNvZGVL ZXkgPSBEZWNvZGVPcmRlclNhbXBsZU1hcDo6S2V5VHlwZShzYW1wbGUtPmRlY29kZVRpbWUoKSwg c2FtcGxlLT5wcmVzZW50YXRpb25UaW1lKCkpOworICAgIGRlY29kZU9yZGVyKCkubV9zYW1wbGVz LmVyYXNlKGRlY29kZUtleSk7CiAKICAgICBtX3RvdGFsU2l6ZSAtPSBzYW1wbGUtPnNpemVJbkJ5 dGVzKCk7CiB9CkBAIC0xNDgsOSArMTUzLDkgQEAgUHJlc2VudGF0aW9uT3JkZXJTYW1wbGVNYXA6 Oml0ZXJhdG9yIFByZXNlbnRhdGlvbk9yZGVyU2FtcGxlTWFwOjpmaW5kU2FtcGxlT25PckEKICAg ICByZXR1cm4gbV9zYW1wbGVzLmxvd2VyX2JvdW5kKHRpbWUpOwogfQogCi1EZWNvZGVPcmRlclNh bXBsZU1hcDo6aXRlcmF0b3IgRGVjb2RlT3JkZXJTYW1wbGVNYXA6OmZpbmRTYW1wbGVXaXRoRGVj b2RlVGltZShjb25zdCBNZWRpYVRpbWUmIHRpbWUpCitEZWNvZGVPcmRlclNhbXBsZU1hcDo6aXRl cmF0b3IgRGVjb2RlT3JkZXJTYW1wbGVNYXA6OmZpbmRTYW1wbGVXaXRoRGVjb2RlS2V5KGNvbnN0 IEtleVR5cGUmIGtleSkKIHsKLSAgICByZXR1cm4gbV9zYW1wbGVzLmZpbmQodGltZSk7CisgICAg cmV0dXJuIG1fc2FtcGxlcy5maW5kKGtleSk7CiB9CiAKIFByZXNlbnRhdGlvbk9yZGVyU2FtcGxl TWFwOjpyZXZlcnNlX2l0ZXJhdG9yIFByZXNlbnRhdGlvbk9yZGVyU2FtcGxlTWFwOjpyZXZlcnNl RmluZFNhbXBsZUNvbnRhaW5pbmdQcmVzZW50YXRpb25UaW1lKGNvbnN0IE1lZGlhVGltZSYgdGlt ZSkKQEAgLTE2Niw5ICsxNzEsOSBAQCBQcmVzZW50YXRpb25PcmRlclNhbXBsZU1hcDo6cmV2ZXJz ZV9pdGVyYXRvciBQcmVzZW50YXRpb25PcmRlclNhbXBsZU1hcDo6cmV2ZXJzZQogICAgIHJldHVy biBzdGQ6Omxvd2VyX2JvdW5kKHJiZWdpbigpLCByZW5kKCksIHRpbWUsIFNhbXBsZUlzR3JlYXRl clRoYW5NZWRpYVRpbWVDb21wYXJhdG9yPE1hcFR5cGU+KCkpOwogfQogCi1EZWNvZGVPcmRlclNh bXBsZU1hcDo6cmV2ZXJzZV9pdGVyYXRvciBEZWNvZGVPcmRlclNhbXBsZU1hcDo6cmV2ZXJzZUZp bmRTYW1wbGVXaXRoRGVjb2RlVGltZShjb25zdCBNZWRpYVRpbWUmIHRpbWUpCitEZWNvZGVPcmRl clNhbXBsZU1hcDo6cmV2ZXJzZV9pdGVyYXRvciBEZWNvZGVPcmRlclNhbXBsZU1hcDo6cmV2ZXJz ZUZpbmRTYW1wbGVXaXRoRGVjb2RlS2V5KGNvbnN0IEtleVR5cGUmIGtleSkKIHsKLSAgICBEZWNv ZGVPcmRlclNhbXBsZU1hcDo6aXRlcmF0b3IgZm91bmQgPSBmaW5kU2FtcGxlV2l0aERlY29kZVRp bWUodGltZSk7CisgICAgRGVjb2RlT3JkZXJTYW1wbGVNYXA6Oml0ZXJhdG9yIGZvdW5kID0gZmlu ZFNhbXBsZVdpdGhEZWNvZGVLZXkoa2V5KTsKICAgICBpZiAoZm91bmQgPT0gZW5kKCkpCiAgICAg ICAgIHJldHVybiByZW5kKCk7CiAgICAgcmV0dXJuIC0tcmV2ZXJzZV9pdGVyYXRvcihmb3VuZCk7 CkBAIC0xODAsNyArMTg1LDggQEAgRGVjb2RlT3JkZXJTYW1wbGVNYXA6OnJldmVyc2VfaXRlcmF0 b3IgRGVjb2RlT3JkZXJTYW1wbGVNYXA6OmZpbmRTeW5jU2FtcGxlUHJpb3IKICAgICBpZiAocmV2 ZXJzZUN1cnJlbnRTYW1wbGVQVFMgPT0gbV9wcmVzZW50YXRpb25PcmRlci5yZW5kKCkpCiAgICAg ICAgIHJldHVybiByZW5kKCk7CiAKLSAgICByZXZlcnNlX2l0ZXJhdG9yIHJldmVyc2VDdXJyZW50 U2FtcGxlRFRTID0gcmV2ZXJzZUZpbmRTYW1wbGVXaXRoRGVjb2RlVGltZShyZXZlcnNlQ3VycmVu dFNhbXBsZVBUUy0+c2Vjb25kLT5kZWNvZGVUaW1lKCkpOworICAgIGNvbnN0IFJlZlB0cjxNZWRp YVNhbXBsZT4mIHNhbXBsZSA9IHJldmVyc2VDdXJyZW50U2FtcGxlUFRTLT5zZWNvbmQ7CisgICAg cmV2ZXJzZV9pdGVyYXRvciByZXZlcnNlQ3VycmVudFNhbXBsZURUUyA9IHJldmVyc2VGaW5kU2Ft cGxlV2l0aERlY29kZUtleShLZXlUeXBlKHNhbXBsZS0+ZGVjb2RlVGltZSgpLCBzYW1wbGUtPnBy ZXNlbnRhdGlvblRpbWUoKSkpOwogCiAgICAgcmV2ZXJzZV9pdGVyYXRvciBmb3VuZFNhbXBsZSA9 IGZpbmRTeW5jU2FtcGxlUHJpb3JUb0RlY29kZUl0ZXJhdG9yKHJldmVyc2VDdXJyZW50U2FtcGxl RFRTKTsKICAgICBpZiAoZm91bmRTYW1wbGUgPT0gcmVuZCgpKQpAQCAtMjAxLDcgKzIwNyw4IEBA IERlY29kZU9yZGVyU2FtcGxlTWFwOjppdGVyYXRvciBEZWNvZGVPcmRlclNhbXBsZU1hcDo6Zmlu ZFN5bmNTYW1wbGVBZnRlclByZXNlbnRhCiAgICAgaWYgKGN1cnJlbnRTYW1wbGVQVFMgPT0gbV9w cmVzZW50YXRpb25PcmRlci5lbmQoKSkKICAgICAgICAgcmV0dXJuIGVuZCgpOwogCi0gICAgaXRl cmF0b3IgY3VycmVudFNhbXBsZURUUyA9IGZpbmRTYW1wbGVXaXRoRGVjb2RlVGltZShjdXJyZW50 U2FtcGxlUFRTLT5zZWNvbmQtPmRlY29kZVRpbWUoKSk7CisgICAgY29uc3QgUmVmUHRyPE1lZGlh U2FtcGxlPiYgc2FtcGxlID0gY3VycmVudFNhbXBsZVBUUy0+c2Vjb25kOworICAgIGl0ZXJhdG9y IGN1cnJlbnRTYW1wbGVEVFMgPSBmaW5kU2FtcGxlV2l0aERlY29kZUtleShLZXlUeXBlKHNhbXBs ZS0+ZGVjb2RlVGltZSgpLCBzYW1wbGUtPnByZXNlbnRhdGlvblRpbWUoKSkpOwogICAgIAogICAg IE1lZGlhVGltZSB1cHBlckJvdW5kID0gdGltZSArIHRocmVzaG9sZDsKICAgICBpdGVyYXRvciBm b3VuZFNhbXBsZSA9IHN0ZDo6ZmluZF9pZihjdXJyZW50U2FtcGxlRFRTLCBlbmQoKSwgU2FtcGxl SXNSYW5kb21BY2Nlc3MoKSk7CkBAIC0yMzQsNyArMjQxLDcgQEAgUHJlc2VudGF0aW9uT3JkZXJT YW1wbGVNYXA6Oml0ZXJhdG9yX3JhbmdlIFByZXNlbnRhdGlvbk9yZGVyU2FtcGxlTWFwOjpmaW5k U2FtcGwKIERlY29kZU9yZGVyU2FtcGxlTWFwOjpyZXZlcnNlX2l0ZXJhdG9yX3JhbmdlIERlY29k ZU9yZGVyU2FtcGxlTWFwOjpmaW5kRGVwZW5kZW50U2FtcGxlcyhNZWRpYVNhbXBsZSogc2FtcGxl KQogewogICAgIEFTU0VSVChzYW1wbGUpOwotICAgIHJldmVyc2VfaXRlcmF0b3IgY3VycmVudERl Y29kZUl0ZXIgPSByZXZlcnNlRmluZFNhbXBsZVdpdGhEZWNvZGVUaW1lKHNhbXBsZS0+ZGVjb2Rl VGltZSgpKTsKKyAgICByZXZlcnNlX2l0ZXJhdG9yIGN1cnJlbnREZWNvZGVJdGVyID0gcmV2ZXJz ZUZpbmRTYW1wbGVXaXRoRGVjb2RlS2V5KEtleVR5cGUoc2FtcGxlLT5kZWNvZGVUaW1lKCksIHNh bXBsZS0+cHJlc2VudGF0aW9uVGltZSgpKSk7CiAgICAgcmV2ZXJzZV9pdGVyYXRvciBuZXh0U3lu Y1NhbXBsZSA9IGZpbmRTeW5jU2FtcGxlUHJpb3JUb0RlY29kZUl0ZXJhdG9yKGN1cnJlbnREZWNv ZGVJdGVyKTsKICAgICByZXR1cm4gcmV2ZXJzZV9pdGVyYXRvcl9yYW5nZShjdXJyZW50RGVjb2Rl SXRlciwgbmV4dFN5bmNTYW1wbGUpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYXNvdXJjZS9TYW1wbGVNYXAuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVk aWFzb3VyY2UvU2FtcGxlTWFwLmgKaW5kZXggY2U2ODdmMzk5NGUyZTdkM2M4NTZmOTJmODRjZGMw NmEyZTNmNTM5NS4uODA0YWZjYjJkNDdkMjY0NWExMTExMmQwODgzMmFmMDJjOTAwMzA3OSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9TYW1wbGVNYXAuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL1NhbXBsZU1hcC5oCkBAIC02 NSw3ICs2NSw4IEBAIHByaXZhdGU6CiBjbGFzcyBEZWNvZGVPcmRlclNhbXBsZU1hcCB7CiAgICAg ZnJpZW5kIGNsYXNzIFNhbXBsZU1hcDsKIHB1YmxpYzoKLSAgICB0eXBlZGVmIHN0ZDo6bWFwPE1l ZGlhVGltZSwgUmVmUHRyPE1lZGlhU2FtcGxlPj4gTWFwVHlwZTsKKyAgICB0eXBlZGVmIHN0ZDo6 cGFpcjxNZWRpYVRpbWUsIE1lZGlhVGltZT4gS2V5VHlwZTsKKyAgICB0eXBlZGVmIHN0ZDo6bWFw PEtleVR5cGUsIFJlZlB0cjxNZWRpYVNhbXBsZT4+IE1hcFR5cGU7CiAgICAgdHlwZWRlZiBNYXBU eXBlOjppdGVyYXRvciBpdGVyYXRvcjsKICAgICB0eXBlZGVmIE1hcFR5cGU6OnJldmVyc2VfaXRl cmF0b3IgcmV2ZXJzZV9pdGVyYXRvcjsKICAgICB0eXBlZGVmIHN0ZDo6cGFpcjxyZXZlcnNlX2l0 ZXJhdG9yLCByZXZlcnNlX2l0ZXJhdG9yPiByZXZlcnNlX2l0ZXJhdG9yX3JhbmdlOwpAQCAtNzUs OCArNzYsOCBAQCBwdWJsaWM6CiAgICAgcmV2ZXJzZV9pdGVyYXRvciByYmVnaW4oKSB7IHJldHVy biBtX3NhbXBsZXMucmJlZ2luKCk7IH0KICAgICByZXZlcnNlX2l0ZXJhdG9yIHJlbmQoKSB7IHJl dHVybiBtX3NhbXBsZXMucmVuZCgpOyB9CiAKLSAgICBpdGVyYXRvciBmaW5kU2FtcGxlV2l0aERl Y29kZVRpbWUoY29uc3QgTWVkaWFUaW1lJik7Ci0gICAgcmV2ZXJzZV9pdGVyYXRvciByZXZlcnNl RmluZFNhbXBsZVdpdGhEZWNvZGVUaW1lKGNvbnN0IE1lZGlhVGltZSYpOworICAgIGl0ZXJhdG9y IGZpbmRTYW1wbGVXaXRoRGVjb2RlS2V5KGNvbnN0IEtleVR5cGUmKTsKKyAgICByZXZlcnNlX2l0 ZXJhdG9yIHJldmVyc2VGaW5kU2FtcGxlV2l0aERlY29kZUtleShjb25zdCBLZXlUeXBlJik7CiAg ICAgcmV2ZXJzZV9pdGVyYXRvciBmaW5kU3luY1NhbXBsZVByaW9yVG9QcmVzZW50YXRpb25UaW1l KGNvbnN0IE1lZGlhVGltZSYsIGNvbnN0IE1lZGlhVGltZSYgdGhyZXNob2xkID0gTWVkaWFUaW1l Ojpwb3NpdGl2ZUluZmluaXRlVGltZSgpKTsKICAgICByZXZlcnNlX2l0ZXJhdG9yIGZpbmRTeW5j U2FtcGxlUHJpb3JUb0RlY29kZUl0ZXJhdG9yKHJldmVyc2VfaXRlcmF0b3IpOwogICAgIGl0ZXJh dG9yIGZpbmRTeW5jU2FtcGxlQWZ0ZXJQcmVzZW50YXRpb25UaW1lKGNvbnN0IE1lZGlhVGltZSYs IGNvbnN0IE1lZGlhVGltZSYgdGhyZXNob2xkID0gTWVkaWFUaW1lOjpwb3NpdGl2ZUluZmluaXRl VGltZSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2Uv U291cmNlQnVmZmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvU291 cmNlQnVmZmVyLmNwcAppbmRleCBjNjQ1MDIxOTYzYWIzM2YxMmY5YmVhMmI2MjNiZWQxY2RkMWFi ZjYwLi45ODMyYThkNDM3MmY1ZjcxMGZiMzc0MDg4YjQ5NWMyMTEzODU2MDExIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuY3BwCkBA IC01NjIsNyArNTYyLDggQEAgdm9pZCBTb3VyY2VCdWZmZXI6OnJlbW92ZUNvZGVkRnJhbWVzKGNv bnN0IE1lZGlhVGltZSYgc3RhcnQsIGNvbnN0IE1lZGlhVGltZSYgZW4KICAgICAgICAgLy8gYW5k IHRoZSBuZXh0IHN5bmMgc2FtcGxlIGZyYW1lIGFyZSByZW1vdmVkLiBCdXQgd2UgbXVzdCBzdGFy dCBmcm9tIHRoZSBmaXJzdCBzYW1wbGUgaW4gZGVjb2RlIG9yZGVyLCBub3QKICAgICAgICAgLy8g cHJlc2VudGF0aW9uIG9yZGVyLgogICAgICAgICBQcmVzZW50YXRpb25PcmRlclNhbXBsZU1hcDo6 aXRlcmF0b3IgbWluRGVjb2RlVGltZUl0ZXIgPSBzdGQ6Om1pbl9lbGVtZW50KHJlbW92ZVByZXNl bnRhdGlvblN0YXJ0LCByZW1vdmVQcmVzZW50YXRpb25FbmQsIGRlY29kZVRpbWVDb21wYXJhdG9y KTsKLSAgICAgICAgRGVjb2RlT3JkZXJTYW1wbGVNYXA6Oml0ZXJhdG9yIHJlbW92ZURlY29kZVN0 YXJ0ID0gdHJhY2tCdWZmZXIuc2FtcGxlcy5kZWNvZGVPcmRlcigpLmZpbmRTYW1wbGVXaXRoRGVj b2RlVGltZShtaW5EZWNvZGVUaW1lSXRlci0+c2Vjb25kLT5kZWNvZGVUaW1lKCkpOworICAgICAg ICBEZWNvZGVPcmRlclNhbXBsZU1hcDo6S2V5VHlwZSBkZWNvZGVLZXkobWluRGVjb2RlVGltZUl0 ZXItPnNlY29uZC0+ZGVjb2RlVGltZSgpLCBtaW5EZWNvZGVUaW1lSXRlci0+c2Vjb25kLT5wcmVz ZW50YXRpb25UaW1lKCkpOworICAgICAgICBEZWNvZGVPcmRlclNhbXBsZU1hcDo6aXRlcmF0b3Ig cmVtb3ZlRGVjb2RlU3RhcnQgPSB0cmFja0J1ZmZlci5zYW1wbGVzLmRlY29kZU9yZGVyKCkuZmlu ZFNhbXBsZVdpdGhEZWNvZGVLZXkoZGVjb2RlS2V5KTsKIAogICAgICAgICBEZWNvZGVPcmRlclNh bXBsZU1hcDo6TWFwVHlwZSBlcmFzZWRTYW1wbGVzKHJlbW92ZURlY29kZVN0YXJ0LCByZW1vdmVE ZWNvZGVFbmQpOwogCkBAIC0xMTU3LDggKzExNTgsOCBAQCB2b2lkIFNvdXJjZUJ1ZmZlcjo6c291 cmNlQnVmZmVyUHJpdmF0ZURpZFJlY2VpdmVTYW1wbGUoU291cmNlQnVmZmVyUHJpdmF0ZSosIFBh cwogCiAgICAgICAgICAgICAvLyBPdGhlcndpc2U6IFJlbW92ZSBhbGwgY29kZWQgZnJhbWVzIGJl dHdlZW4gdGhlIGNvZGVkIGZyYW1lcyByZW1vdmVkIGluIHRoZSBwcmV2aW91cyBzdGVwCiAgICAg ICAgICAgICAvLyBhbmQgdGhlIG5leHQgcmFuZG9tIGFjY2VzcyBwb2ludCBhZnRlciB0aG9zZSBy ZW1vdmVkIGZyYW1lcy4KLSAgICAgICAgICAgIGF1dG8gZmlyc3REZWNvZGVJdGVyID0gdHJhY2tC dWZmZXIuc2FtcGxlcy5kZWNvZGVPcmRlcigpLmZpbmRTYW1wbGVXaXRoRGVjb2RlVGltZShlcmFz ZWRTYW1wbGVzLmRlY29kZU9yZGVyKCkuYmVnaW4oKS0+Zmlyc3QpOwotICAgICAgICAgICAgYXV0 byBsYXN0RGVjb2RlSXRlciA9IHRyYWNrQnVmZmVyLnNhbXBsZXMuZGVjb2RlT3JkZXIoKS5maW5k U2FtcGxlV2l0aERlY29kZVRpbWUoZXJhc2VkU2FtcGxlcy5kZWNvZGVPcmRlcigpLnJiZWdpbigp LT5maXJzdCk7CisgICAgICAgICAgICBhdXRvIGZpcnN0RGVjb2RlSXRlciA9IHRyYWNrQnVmZmVy LnNhbXBsZXMuZGVjb2RlT3JkZXIoKS5maW5kU2FtcGxlV2l0aERlY29kZUtleShlcmFzZWRTYW1w bGVzLmRlY29kZU9yZGVyKCkuYmVnaW4oKS0+Zmlyc3QpOworICAgICAgICAgICAgYXV0byBsYXN0 RGVjb2RlSXRlciA9IHRyYWNrQnVmZmVyLnNhbXBsZXMuZGVjb2RlT3JkZXIoKS5maW5kU2FtcGxl V2l0aERlY29kZUtleShlcmFzZWRTYW1wbGVzLmRlY29kZU9yZGVyKCkucmJlZ2luKCktPmZpcnN0 KTsKICAgICAgICAgICAgIGF1dG8gbmV4dFN5bmNJdGVyID0gdHJhY2tCdWZmZXIuc2FtcGxlcy5k ZWNvZGVPcmRlcigpLmZpbmRTeW5jU2FtcGxlQWZ0ZXJEZWNvZGVJdGVyYXRvcihsYXN0RGVjb2Rl SXRlcik7CiAgICAgICAgICAgICBkZXBlbmRlbnRTYW1wbGVzLmluc2VydChmaXJzdERlY29kZUl0 ZXIsIG5leHRTeW5jSXRlcik7CiAKQEAgLTExODYsNyArMTE4Nyw5IEBAIHZvaWQgU291cmNlQnVm ZmVyOjpzb3VyY2VCdWZmZXJQcml2YXRlRGlkUmVjZWl2ZVNhbXBsZShTb3VyY2VCdWZmZXJQcml2 YXRlKiwgUGFzCiAgICAgICAgIC8vIE90aGVyd2lzZToKICAgICAgICAgLy8gQWRkIHRoZSBjb2Rl ZCBmcmFtZSB3aXRoIHRoZSBwcmVzZW50YXRpb24gdGltZXN0YW1wLCBkZWNvZGUgdGltZXN0YW1w LCBhbmQgZnJhbWUgZHVyYXRpb24gdG8gdGhlIHRyYWNrIGJ1ZmZlci4KICAgICAgICAgdHJhY2tC dWZmZXIuc2FtcGxlcy5hZGRTYW1wbGUoc2FtcGxlKTsKLSAgICAgICAgdHJhY2tCdWZmZXIuZGVj b2RlUXVldWUuaW5zZXJ0KERlY29kZU9yZGVyU2FtcGxlTWFwOjpNYXBUeXBlOjp2YWx1ZV90eXBl KGRlY29kZVRpbWVzdGFtcCwgc2FtcGxlKSk7CisKKyAgICAgICAgRGVjb2RlT3JkZXJTYW1wbGVN YXA6OktleVR5cGUgZGVjb2RlS2V5KGRlY29kZVRpbWVzdGFtcCwgcHJlc2VudGF0aW9uVGltZXN0 YW1wKTsKKyAgICAgICAgdHJhY2tCdWZmZXIuZGVjb2RlUXVldWUuaW5zZXJ0KERlY29kZU9yZGVy U2FtcGxlTWFwOjpNYXBUeXBlOjp2YWx1ZV90eXBlKGRlY29kZUtleSwgc2FtcGxlKSk7CiAKICAg ICAgICAgLy8gMS4xOCBTZXQgbGFzdCBkZWNvZGUgdGltZXN0YW1wIGZvciB0cmFjayBidWZmZXIg dG8gZGVjb2RlIHRpbWVzdGFtcC4KICAgICAgICAgdHJhY2tCdWZmZXIubGFzdERlY29kZVRpbWVz dGFtcCA9IGRlY29kZVRpbWVzdGFtcDsKQEAgLTEzODAsOCArMTM4Myw4IEBAIHZvaWQgU291cmNl QnVmZmVyOjpyZWVucXVldWVNZWRpYUZvclRpbWUoVHJhY2tCdWZmZXImIHRyYWNrQnVmZmVyLCBB dG9taWNTdHJpbmcKICAgICB9CiAKICAgICAvLyBTZWFjaCBiYWNrd2FyZCBmb3IgdGhlIHByZXZp b3VzIHN5bmMgc2FtcGxlLgotICAgIE1lZGlhVGltZSBjdXJyZW50U2FtcGxlRGVjb2RlVGltZSA9 IGN1cnJlbnRTYW1wbGVQVFNJdGVyYXRvci0+c2Vjb25kLT5kZWNvZGVUaW1lKCk7Ci0gICAgYXV0 byBjdXJyZW50U2FtcGxlRFRTSXRlcmF0b3IgPSB0cmFja0J1ZmZlci5zYW1wbGVzLmRlY29kZU9y ZGVyKCkuZmluZFNhbXBsZVdpdGhEZWNvZGVUaW1lKGN1cnJlbnRTYW1wbGVEZWNvZGVUaW1lKTsK KyAgICBEZWNvZGVPcmRlclNhbXBsZU1hcDo6S2V5VHlwZSBkZWNvZGVLZXkoY3VycmVudFNhbXBs ZVBUU0l0ZXJhdG9yLT5zZWNvbmQtPmRlY29kZVRpbWUoKSwgY3VycmVudFNhbXBsZVBUU0l0ZXJh dG9yLT5zZWNvbmQtPnByZXNlbnRhdGlvblRpbWUoKSk7CisgICAgYXV0byBjdXJyZW50U2FtcGxl RFRTSXRlcmF0b3IgPSB0cmFja0J1ZmZlci5zYW1wbGVzLmRlY29kZU9yZGVyKCkuZmluZFNhbXBs ZVdpdGhEZWNvZGVLZXkoZGVjb2RlS2V5KTsKICAgICBBU1NFUlQoY3VycmVudFNhbXBsZURUU0l0 ZXJhdG9yICE9IHRyYWNrQnVmZmVyLnNhbXBsZXMuZGVjb2RlT3JkZXIoKS5lbmQoKSk7CiAKICAg ICBhdXRvIHJldmVyc2VDdXJyZW50U2FtcGxlSXRlciA9IC0tRGVjb2RlT3JkZXJTYW1wbGVNYXA6 OnJldmVyc2VfaXRlcmF0b3IoY3VycmVudFNhbXBsZURUU0l0ZXJhdG9yKTsKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA5OTI4 YzA4OTYzMTNkNGNkNDI2ODJmMmNiNjE2YjRiYzUzMTA3YWMwLi4yNDFmNDNmYjFkNmY4MjA5Mzg3 ZTA5YTNkZDAwOTIyZWQyMDUwYjcwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK KysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTQtMDctMjEg IEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgW01TRV0gWW91VHVi ZSB2aWRlbyBkZWNvZGUgZXJyb3Igd2hlbiB2YXJpYW50LXN3aXRjaGluZworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1MTI4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBtZWRpYS9tZWRpYS1zb3VyY2Uv bWVkaWEtc291cmNlLW92ZXJsYXBwaW5nLWRlY29kZXRpbWUtZXhwZWN0ZWQudHh0OiBBZGRlZC4K KyAgICAgICAgKiBtZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLW92ZXJsYXBwaW5nLWRl Y29kZXRpbWUuaHRtbDogQWRkZWQuCisKIDIwMTQtMDctMTYgIEplciBOb2JsZSAgPGplci5ub2Js ZUBhcHBsZS5jb20+CiAKICAgICAgICAgRW5hYmxlIGxlZ2FjeSBmdWxsc2NyZWVuIEFQSSBpbiBt ZWRpYSBjb250cm9scwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEtc291cmNl L21lZGlhLXNvdXJjZS1vdmVybGFwcGluZy1kZWNvZGV0aW1lLWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL21lZGlhL21lZGlhLXNvdXJjZS9tZWRpYS1zb3VyY2Utb3ZlcmxhcHBpbmctZGVjb2Rl dGltZS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNTA0NGRhYWEyYjhmYmUwYmY4ODY3MmZmMGUw NzMzYTUyODA5YWM3NgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21lZGlh LXNvdXJjZS9tZWRpYS1zb3VyY2Utb3ZlcmxhcHBpbmctZGVjb2RldGltZS1leHBlY3RlZC50eHQK QEAgLTAsMCArMSwyMCBAQAorCitSVU4odmlkZW8uc3JjID0gVVJMLmNyZWF0ZU9iamVjdFVSTChz b3VyY2UpKQorRVZFTlQoc291cmNlb3BlbikKK1JVTihzb3VyY2VCdWZmZXIgPSBzb3VyY2UuYWRk U291cmNlQnVmZmVyKCJ2aWRlby9tb2NrOyBjb2RlY3M9bW9jayIpKQorUlVOKHNvdXJjZUJ1ZmZl ci5hcHBlbmRCdWZmZXIoaW5pdFNlZ21lbnQpKQorRVZFTlQodXBkYXRlZW5kKQorUlVOKHNvdXJj ZUJ1ZmZlci5hcHBlbmRCdWZmZXIoc2FtcGxlcykpCitFVkVOVCh1cGRhdGVlbmQpCitSVU4oc291 cmNlQnVmZmVyLmFwcGVuZEJ1ZmZlcihzYW1wbGVzKSkKK0VWRU5UKHVwZGF0ZWVuZCkKK0VYUEVD VEVEIChidWZmZXJlZFNhbXBsZXMubGVuZ3RoID09ICc3JykgT0sKK3tQVFMoezAvMTAwMCwgMC4w MDAwMDB9KSwgRFRTKHswLzEwMDAsIDAuMDAwMDAwfSksIGR1cmF0aW9uKHsxMDAwLzEwMDAsIDEu MDAwMDAwfSksIGZsYWdzKDEpLCBnZW5lcmF0aW9uKDApfQore1BUUyh7MTAwMC8xMDAwLCAxLjAw MDAwMH0pLCBEVFMoezEwMDAvMTAwMCwgMS4wMDAwMDB9KSwgZHVyYXRpb24oezEwMDAvMTAwMCwg MS4wMDAwMDB9KSwgZmxhZ3MoMCksIGdlbmVyYXRpb24oMCl9Cit7UFRTKHsyMDAwLzEwMDAsIDIu MDAwMDAwfSksIERUUyh7MjAwMC8xMDAwLCAyLjAwMDAwMH0pLCBkdXJhdGlvbih7MTAwMC8xMDAw LCAxLjAwMDAwMH0pLCBmbGFncygwKSwgZ2VuZXJhdGlvbigwKX0KK3tQVFMoezMwMDAvMTAwMCwg My4wMDAwMDB9KSwgRFRTKHszMDAwLzEwMDAsIDMuMDAwMDAwfSksIGR1cmF0aW9uKHsxMDAwLzEw MDAsIDEuMDAwMDAwfSksIGZsYWdzKDEpLCBnZW5lcmF0aW9uKDApfQore1BUUyh7NDAwMC8xMDAw LCA0LjAwMDAwMH0pLCBEVFMoezMwMDAvMTAwMCwgMy4wMDAwMDB9KSwgZHVyYXRpb24oezEwMDAv MTAwMCwgMS4wMDAwMDB9KSwgZmxhZ3MoMSksIGdlbmVyYXRpb24oMSl9Cit7UFRTKHs1MDAwLzEw MDAsIDUuMDAwMDAwfSksIERUUyh7NDAwMC8xMDAwLCA0LjAwMDAwMH0pLCBkdXJhdGlvbih7MTAw MC8xMDAwLCAxLjAwMDAwMH0pLCBmbGFncygwKSwgZ2VuZXJhdGlvbigxKX0KK3tQVFMoezYwMDAv MTAwMCwgNi4wMDAwMDB9KSwgRFRTKHs1MDAwLzEwMDAsIDUuMDAwMDAwfSksIGR1cmF0aW9uKHsx MDAwLzEwMDAsIDEuMDAwMDAwfSksIGZsYWdzKDApLCBnZW5lcmF0aW9uKDEpfQorRU5EIE9GIFRF U1QKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEtc291cmNlL21lZGlhLXNv dXJjZS1vdmVybGFwcGluZy1kZWNvZGV0aW1lLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS9tZWRp YS1zb3VyY2UvbWVkaWEtc291cmNlLW92ZXJsYXBwaW5nLWRlY29kZXRpbWUuaHRtbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi4yZTkyOGY2MzA0MTA2NDEyM2RhYjgwNTY5ZDE0YTFkMTY0YmQ3NzhiCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEtc291cmNlL21lZGlhLXNvdXJjZS1vdmVy bGFwcGluZy1kZWNvZGV0aW1lLmh0bWwKQEAgLTAsMCArMSw3MSBAQAorPCFET0NUWVBFIGh0bWw+ Cis8aHRtbD4KKzxoZWFkPgorICAgIDx0aXRsZT5tb2NrLW1lZGlhLXNvdXJjZTwvdGl0bGU+Cisg ICAgPHNjcmlwdCBzcmM9Im1vY2stbWVkaWEtc291cmNlLmpzIj48L3NjcmlwdD4KKyAgICA8c2Ny aXB0IHNyYz0iLi4vdmlkZW8tdGVzdC5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdD4KKyAgICB2 YXIgc291cmNlOworICAgIHZhciBzb3VyY2VCdWZmZXI7CisgICAgdmFyIGluaXRTZWdtZW50Owor ICAgIHZhciBzYW1wbGVzOworICAgIHZhciBidWZmZXJlZFNhbXBsZXM7CisKKyAgICBpZiAod2lu ZG93LmludGVybmFscykKKyAgICAgICAgaW50ZXJuYWxzLmluaXRpYWxpemVNb2NrTWVkaWFTb3Vy Y2UoKTsKKworICAgIGZ1bmN0aW9uIHJ1blRlc3QoKQorICAgIHsKKyAgICAgICAgZmluZE1lZGlh RWxlbWVudCgpOworCisgICAgICAgIHNvdXJjZSA9IG5ldyBNZWRpYVNvdXJjZSgpOworICAgICAg ICB3YWl0Rm9yRXZlbnRPbihzb3VyY2UsICdzb3VyY2VvcGVuJywgc291cmNlT3Blbik7CisgICAg ICAgIHJ1bigndmlkZW8uc3JjID0gVVJMLmNyZWF0ZU9iamVjdFVSTChzb3VyY2UpJyk7CisgICAg fQorCisgICAgZnVuY3Rpb24gc291cmNlT3BlbigpCisgICAgeworICAgICAgICBydW4oJ3NvdXJj ZUJ1ZmZlciA9IHNvdXJjZS5hZGRTb3VyY2VCdWZmZXIoInZpZGVvL21vY2s7IGNvZGVjcz1tb2Nr IiknKTsKKyAgICAgICAgd2FpdEZvckV2ZW50T24oc291cmNlQnVmZmVyLCAndXBkYXRlZW5kJywg bG9hZE9yZGVyZWRTYW1wbGVzLCBmYWxzZSwgdHJ1ZSk7CisgICAgICAgIGluaXRTZWdtZW50ID0g bWFrZUFJbml0KDgsIFttYWtlQVRyYWNrKDEsICdtb2NrJywgVFJBQ0tfS0lORC5WSURFTyldKTsK KyAgICAgICAgcnVuKCdzb3VyY2VCdWZmZXIuYXBwZW5kQnVmZmVyKGluaXRTZWdtZW50KScpOwor ICAgIH0KKworICAgIGZ1bmN0aW9uIGxvYWRPcmRlcmVkU2FtcGxlcygpCisgICAgeworICAgICAg IHNhbXBsZXMgPSBjb25jYXRlbmF0ZVNhbXBsZXMoWworICAgICAgICAgICAgbWFrZUFTYW1wbGUo MCwgMCwgMSwgMSwgU0FNUExFX0ZMQUcuU1lOQywgMCksCisgICAgICAgICAgICBtYWtlQVNhbXBs ZSgxLCAxLCAxLCAxLCBTQU1QTEVfRkxBRy5OT05FLCAwKSwKKyAgICAgICAgICAgIG1ha2VBU2Ft cGxlKDIsIDIsIDEsIDEsIFNBTVBMRV9GTEFHLk5PTkUsIDApLAorICAgICAgICAgICAgbWFrZUFT YW1wbGUoMywgMywgMSwgMSwgU0FNUExFX0ZMQUcuU1lOQywgMCksCisgICAgICAgICAgICBtYWtl QVNhbXBsZSg0LCA0LCAxLCAxLCBTQU1QTEVfRkxBRy5OT05FLCAwKSwKKyAgICAgICAgICAgIG1h a2VBU2FtcGxlKDUsIDUsIDEsIDEsIFNBTVBMRV9GTEFHLk5PTkUsIDApLAorICAgICAgICBdKTsK KyAgICAgICAgd2FpdEZvckV2ZW50T24oc291cmNlQnVmZmVyLCAndXBkYXRlZW5kJywgbG9hZE1v cmVPcmRlcmVkU2FtcGxlcywgZmFsc2UsIHRydWUpOworICAgICAgICBydW4oJ3NvdXJjZUJ1ZmZl ci5hcHBlbmRCdWZmZXIoc2FtcGxlcyknKTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBsb2FkTW9y ZU9yZGVyZWRTYW1wbGVzKCkKKyAgICB7CisgICAgICAgIHNhbXBsZXMgPSBjb25jYXRlbmF0ZVNh bXBsZXMoWworICAgICAgICAgICAgbWFrZUFTYW1wbGUoNCwgMywgMSwgMSwgU0FNUExFX0ZMQUcu U1lOQywgMSksCisgICAgICAgICAgICBtYWtlQVNhbXBsZSg1LCA0LCAxLCAxLCBTQU1QTEVfRkxB Ry5OT05FLCAxKSwKKyAgICAgICAgICAgIG1ha2VBU2FtcGxlKDYsIDUsIDEsIDEsIFNBTVBMRV9G TEFHLk5PTkUsIDEpLAorICAgICAgICBdKTsKKyAgICAgICAgd2FpdEZvckV2ZW50T24oc291cmNl QnVmZmVyLCAndXBkYXRlZW5kJywgc2FtcGxlc0FkZGVkLCBmYWxzZSwgdHJ1ZSk7CisgICAgICAg IHJ1bignc291cmNlQnVmZmVyLmFwcGVuZEJ1ZmZlcihzYW1wbGVzKScpOworICAgIH0KKworICAg ICBmdW5jdGlvbiBzYW1wbGVzQWRkZWQoKQorICAgIHsKKyAgICAgICAgYnVmZmVyZWRTYW1wbGVz ID0gaW50ZXJuYWxzLmJ1ZmZlcmVkU2FtcGxlc0ZvclRyYWNrSUQoc291cmNlQnVmZmVyLCAxKTsK KyAgICAgICAgdGVzdEV4cGVjdGVkKCJidWZmZXJlZFNhbXBsZXMubGVuZ3RoIiwgNyk7CisgICAg ICAgIGJ1ZmZlcmVkU2FtcGxlcy5mb3JFYWNoKGNvbnNvbGVXcml0ZSk7CisKKyAgICAgICAgZW5k VGVzdCgpOworICAgIH0KKyAgICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9ubG9hZD0icnVu VGVzdCgpIj4KKyAgICA8dmlkZW8+PC92aWRlbz4KKzwvYm9keT4K