130594 2014-03-21 07:45:37 -0700 AX: Replace DEPRECATED_DEFINE_STATIC_LOCAL by static NeverDestroyed 2014-03-21 10:11:25 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 k.czech k.czech aboxhall andersca apinheiro cfleizach commit-queue darin dmazzoni eric.carlson glenn jcraig jdiggs jer.noble mario philipj samuel_white sergio svillar webkit-bug-importer oldest_to_newest 993093 0 k.czech 2014-03-21 07:45:37 -0700 Replace DEPRECATED_DEFINE_STATIC_LOCAL by static NeverDestroyed. 993094 1 webkit-bug-importer 2014-03-21 07:47:09 -0700 <rdar://problem/16390520> 993099 2 227435 k.czech 2014-03-21 08:09:47 -0700 Created attachment 227435 patch 993168 3 227435 commit-queue 2014-03-21 10:08:41 -0700 Comment on attachment 227435 patch Clearing flags on attachment: 227435 Committed r166069: <http://trac.webkit.org/changeset/166069> 993169 4 commit-queue 2014-03-21 10:08:48 -0700 All reviewed patches have been landed. Closing bug. 993171 5 svillar 2014-03-21 10:11:25 -0700 This is a duplicate of 130256. Please see also concerns raised by andersca in https://bugs.webkit.org/show_bug.cgi?id=130256#c3 227435 2014-03-21 08:09:47 -0700 2014-03-21 10:08:41 -0700 patch a11y-never-destroyed.patch text/plain 17223 k.czech ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxYTBhMWQyLi4yYjU0OTBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTQtMDMtMjEgIEtyenlzenRvZiBDemVjaCAgPGsuY3plY2hAc2Ftc3VuZy5jb20+CisK KyAgICAgICAgQVg6IFJlcGxhY2UgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FMIGJ5IHN0 YXRpYyBOZXZlckRlc3Ryb3llZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTMwNTk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVXNlIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxUPiBpbiBuZXcgY29kZS4KKwor ICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU1lZGlhQ29udHJvbHMuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU1lZGlhQ29udHJvbDo6Y29udHJvbFR5cGVO YW1lKToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlNZWRpYUNvbnRyb2w6OnRpdGxl KToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlNZWRpYUNvbnRyb2xzQ29udGFpbmVy OjplbGVtZW50VHlwZU5hbWUpOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU1lZGlh VGltZWxpbmU6OmhlbHBUZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlNZWRp YVRpbWVEaXNwbGF5OjphY2Nlc3NpYmlsaXR5RGVzY3JpcHRpb24pOgorICAgICAgICAqIGFjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nl c3NpYmlsaXR5T2JqZWN0OjphY3Rpb25WZXJiKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0Fj Y2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJp bGl0eVJlbmRlck9iamVjdDo6aW5oZXJpdHNQcmVzZW50YXRpb25hbFJvbGUpOgorICAgICAgICAo V2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YXJpYUxpdmVSZWdpb25TdGF0dXMp OgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YXJpYUxpdmVS ZWdpb25SZWxldmFudCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2Jq ZWN0OjphY3Rpb25WZXJiKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2F0ay9BWE9iamVjdENh Y2hlQXRrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om5vdGlmeUNoaWxkcmVuU2VsZWN0aW9uQ2hh bmdlKToKKwogMjAxNC0wMy0yMSAgTGFzemxvIFZpZGFjcyAgPGx2aWRhY3MudS1zemVnZWRAcGFy dG5lci5zYW1zdW5nLmNvbT4KIAogICAgICAgICBGaXggdGhlICFFTkFCTEUoRklMVEVSUykgYnVp bGQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0 eU1lZGlhQ29udHJvbHMuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5TWVkaWFDb250cm9scy5jcHAKaW5kZXggZGMwZWI4Ny4uMDQxN2ExMiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5TWVkaWFDb250cm9s cy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5TWVk aWFDb250cm9scy5jcHAKQEAgLTQxLDYgKzQxLDcgQEAKICNpbmNsdWRlICJNZWRpYUNvbnRyb2xF bGVtZW50cy5oIgogI2luY2x1ZGUgIlJlbmRlck9iamVjdC5oIgogI2luY2x1ZGUgIlJlbmRlclNs aWRlci5oIgorI2luY2x1ZGUgPHd0Zi9OZXZlckRlc3Ryb3llZC5oPgogCiBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKQEAgLTgyLDIxICs4MywyMSBAQCBNZWRpYUNvbnRyb2xFbGVtZW50VHlwZSBBY2Nl c3NpYmlsaXR5TWVkaWFDb250cm9sOjpjb250cm9sVHlwZSgpIGNvbnN0CiAKIFN0cmluZyBBY2Nl c3NpYmlsaXR5TWVkaWFDb250cm9sOjpjb250cm9sVHlwZU5hbWUoKSBjb25zdAogewotICAgIERF UFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBTdHJpbmcsIG1lZGlhRW50ZXJGdWxs c2NyZWVuQnV0dG9uTmFtZSwgKEFTQ0lJTGl0ZXJhbCgiRW50ZXJGdWxsc2NyZWVuQnV0dG9uIikp KTsKLSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwoY29uc3QgU3RyaW5nLCBtZWRp YUV4aXRGdWxsc2NyZWVuQnV0dG9uTmFtZSwgKEFTQ0lJTGl0ZXJhbCgiRXhpdEZ1bGxzY3JlZW5C dXR0b24iKSkpOwotICAgIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBTdHJp bmcsIG1lZGlhTXV0ZUJ1dHRvbk5hbWUsIChBU0NJSUxpdGVyYWwoIk11dGVCdXR0b24iKSkpOwot ICAgIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBTdHJpbmcsIG1lZGlhUGxh eUJ1dHRvbk5hbWUsIChBU0NJSUxpdGVyYWwoIlBsYXlCdXR0b24iKSkpOwotICAgIERFUFJFQ0FU RURfREVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBTdHJpbmcsIG1lZGlhU2Vla0JhY2tCdXR0b25O YW1lLCAoQVNDSUlMaXRlcmFsKCJTZWVrQmFja0J1dHRvbiIpKSk7Ci0gICAgREVQUkVDQVRFRF9E RUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0IFN0cmluZywgbWVkaWFTZWVrRm9yd2FyZEJ1dHRvbk5h bWUsIChBU0NJSUxpdGVyYWwoIlNlZWtGb3J3YXJkQnV0dG9uIikpKTsKLSAgICBERVBSRUNBVEVE X0RFRklORV9TVEFUSUNfTE9DQUwoY29uc3QgU3RyaW5nLCBtZWRpYVJld2luZEJ1dHRvbk5hbWUs IChBU0NJSUxpdGVyYWwoIlJld2luZEJ1dHRvbiIpKSk7Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVf U1RBVElDX0xPQ0FMKGNvbnN0IFN0cmluZywgbWVkaWFSZXR1cm5Ub1JlYWx0aW1lQnV0dG9uTmFt ZSwgKEFTQ0lJTGl0ZXJhbCgiUmV0dXJuVG9SZWFsdGltZUJ1dHRvbiIpKSk7Ci0gICAgREVQUkVD QVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0IFN0cmluZywgbWVkaWFVbk11dGVCdXR0b25O YW1lLCAoQVNDSUlMaXRlcmFsKCJVbk11dGVCdXR0b24iKSkpOwotICAgIERFUFJFQ0FURURfREVG SU5FX1NUQVRJQ19MT0NBTChjb25zdCBTdHJpbmcsIG1lZGlhUGF1c2VCdXR0b25OYW1lLCAoQVND SUlMaXRlcmFsKCJQYXVzZUJ1dHRvbiIpKSk7Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElD X0xPQ0FMKGNvbnN0IFN0cmluZywgbWVkaWFTdGF0dXNEaXNwbGF5TmFtZSwgKEFTQ0lJTGl0ZXJh bCgiU3RhdHVzRGlzcGxheSIpKSk7Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FM KGNvbnN0IFN0cmluZywgbWVkaWFDdXJyZW50VGltZURpc3BsYXksIChBU0NJSUxpdGVyYWwoIkN1 cnJlbnRUaW1lRGlzcGxheSIpKSk7Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FM KGNvbnN0IFN0cmluZywgbWVkaWFUaW1lUmVtYWluaW5nRGlzcGxheSwgKEFTQ0lJTGl0ZXJhbCgi VGltZVJlbWFpbmluZ0Rpc3BsYXkiKSkpOwotICAgIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19M T0NBTChjb25zdCBTdHJpbmcsIG1lZGlhU2hvd0Nsb3NlZENhcHRpb25zQnV0dG9uTmFtZSwgKEFT Q0lJTGl0ZXJhbCgiU2hvd0Nsb3NlZENhcHRpb25zQnV0dG9uIikpKTsKLSAgICBERVBSRUNBVEVE X0RFRklORV9TVEFUSUNfTE9DQUwoY29uc3QgU3RyaW5nLCBtZWRpYUhpZGVDbG9zZWRDYXB0aW9u c0J1dHRvbk5hbWUsIChBU0NJSUxpdGVyYWwoIkhpZGVDbG9zZWRDYXB0aW9uc0J1dHRvbiIpKSk7 CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPGNvbnN0IFN0cmluZz4gbWVkaWFFbnRlckZ1bGxz Y3JlZW5CdXR0b25OYW1lKEFTQ0lJTGl0ZXJhbCgiRW50ZXJGdWxsc2NyZWVuQnV0dG9uIikpOwor ICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxjb25zdCBTdHJpbmc+IG1lZGlhRXhpdEZ1bGxzY3Jl ZW5CdXR0b25OYW1lKEFTQ0lJTGl0ZXJhbCgiRXhpdEZ1bGxzY3JlZW5CdXR0b24iKSk7CisgICAg c3RhdGljIE5ldmVyRGVzdHJveWVkPGNvbnN0IFN0cmluZz4gbWVkaWFNdXRlQnV0dG9uTmFtZShB U0NJSUxpdGVyYWwoIk11dGVCdXR0b24iKSk7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPGNv bnN0IFN0cmluZz4gbWVkaWFQbGF5QnV0dG9uTmFtZShBU0NJSUxpdGVyYWwoIlBsYXlCdXR0b24i KSk7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPGNvbnN0IFN0cmluZz4gbWVkaWFTZWVrQmFj a0J1dHRvbk5hbWUoQVNDSUlMaXRlcmFsKCJTZWVrQmFja0J1dHRvbiIpKTsKKyAgICBzdGF0aWMg TmV2ZXJEZXN0cm95ZWQ8Y29uc3QgU3RyaW5nPiBtZWRpYVNlZWtGb3J3YXJkQnV0dG9uTmFtZShB U0NJSUxpdGVyYWwoIlNlZWtGb3J3YXJkQnV0dG9uIikpOworICAgIHN0YXRpYyBOZXZlckRlc3Ry b3llZDxjb25zdCBTdHJpbmc+IG1lZGlhUmV3aW5kQnV0dG9uTmFtZShBU0NJSUxpdGVyYWwoIlJl d2luZEJ1dHRvbiIpKTsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgU3RyaW5nPiBt ZWRpYVJldHVyblRvUmVhbHRpbWVCdXR0b25OYW1lKEFTQ0lJTGl0ZXJhbCgiUmV0dXJuVG9SZWFs dGltZUJ1dHRvbiIpKTsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgU3RyaW5nPiBt ZWRpYVVuTXV0ZUJ1dHRvbk5hbWUoQVNDSUlMaXRlcmFsKCJVbk11dGVCdXR0b24iKSk7CisgICAg c3RhdGljIE5ldmVyRGVzdHJveWVkPGNvbnN0IFN0cmluZz4gbWVkaWFQYXVzZUJ1dHRvbk5hbWUo QVNDSUlMaXRlcmFsKCJQYXVzZUJ1dHRvbiIpKTsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8 Y29uc3QgU3RyaW5nPiBtZWRpYVN0YXR1c0Rpc3BsYXlOYW1lKEFTQ0lJTGl0ZXJhbCgiU3RhdHVz RGlzcGxheSIpKTsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgU3RyaW5nPiBtZWRp YUN1cnJlbnRUaW1lRGlzcGxheShBU0NJSUxpdGVyYWwoIkN1cnJlbnRUaW1lRGlzcGxheSIpKTsK KyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgU3RyaW5nPiBtZWRpYVRpbWVSZW1haW5p bmdEaXNwbGF5KEFTQ0lJTGl0ZXJhbCgiVGltZVJlbWFpbmluZ0Rpc3BsYXkiKSk7CisgICAgc3Rh dGljIE5ldmVyRGVzdHJveWVkPGNvbnN0IFN0cmluZz4gbWVkaWFTaG93Q2xvc2VkQ2FwdGlvbnNC dXR0b25OYW1lKEFTQ0lJTGl0ZXJhbCgiU2hvd0Nsb3NlZENhcHRpb25zQnV0dG9uIikpOworICAg IHN0YXRpYyBOZXZlckRlc3Ryb3llZDxjb25zdCBTdHJpbmc+IG1lZGlhSGlkZUNsb3NlZENhcHRp b25zQnV0dG9uTmFtZShBU0NJSUxpdGVyYWwoIkhpZGVDbG9zZWRDYXB0aW9uc0J1dHRvbiIpKTsK IAogICAgIHN3aXRjaCAoY29udHJvbFR5cGUoKSkgewogICAgIGNhc2UgTWVkaWFFbnRlckZ1bGxz Y3JlZW5CdXR0b246CkBAIC0xNTUsNyArMTU2LDcgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5TWVkaWFD b250cm9sOjphY2Nlc3NpYmlsaXR5VGV4dChWZWN0b3I8QWNjZXNzaWJpbGl0eVRleHQ+JiB0ZXgK IAogU3RyaW5nIEFjY2Vzc2liaWxpdHlNZWRpYUNvbnRyb2w6OnRpdGxlKCkgY29uc3QKIHsKLSAg ICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwoY29uc3QgU3RyaW5nLCBjb250cm9sc1Bh bmVsLCAoQVNDSUlMaXRlcmFsKCJDb250cm9sc1BhbmVsIikpKTsKKyAgICBzdGF0aWMgTmV2ZXJE ZXN0cm95ZWQ8Y29uc3QgU3RyaW5nPiBjb250cm9sc1BhbmVsKEFTQ0lJTGl0ZXJhbCgiQ29udHJv bHNQYW5lbCIpKTsKIAogICAgIGlmIChjb250cm9sVHlwZSgpID09IE1lZGlhQ29udHJvbHNQYW5l bCkKICAgICAgICAgcmV0dXJuIGxvY2FsaXplZE1lZGlhQ29udHJvbEVsZW1lbnRTdHJpbmcoY29u dHJvbHNQYW5lbCk7CkBAIC0yNDQsOCArMjQ1LDggQEAgYm9vbCBBY2Nlc3NpYmlsaXR5TWVkaWFD b250cm9sc0NvbnRhaW5lcjo6Y29udHJvbGxpbmdWaWRlb0VsZW1lbnQoKSBjb25zdAogCiBjb25z dCBTdHJpbmcgQWNjZXNzaWJpbGl0eU1lZGlhQ29udHJvbHNDb250YWluZXI6OmVsZW1lbnRUeXBl TmFtZSgpIGNvbnN0CiB7Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0 IFN0cmluZywgdmlkZW9FbGVtZW50LCAoQVNDSUlMaXRlcmFsKCJWaWRlb0VsZW1lbnQiKSkpOwot ICAgIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBTdHJpbmcsIGF1ZGlvRWxl bWVudCwgKEFTQ0lJTGl0ZXJhbCgiQXVkaW9FbGVtZW50IikpKTsKKyAgICBzdGF0aWMgTmV2ZXJE ZXN0cm95ZWQ8Y29uc3QgU3RyaW5nPiB2aWRlb0VsZW1lbnQoQVNDSUlMaXRlcmFsKCJWaWRlb0Vs ZW1lbnQiKSk7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPGNvbnN0IFN0cmluZz4gYXVkaW9F bGVtZW50KEFTQ0lJTGl0ZXJhbCgiQXVkaW9FbGVtZW50IikpOwogCiAgICAgaWYgKGNvbnRyb2xs aW5nVmlkZW9FbGVtZW50KCkpCiAgICAgICAgIHJldHVybiB2aWRlb0VsZW1lbnQ7CkBAIC0yODIs NyArMjgzLDcgQEAgU3RyaW5nIEFjY2Vzc2liaWxpdHlNZWRpYVRpbWVsaW5lOjp2YWx1ZURlc2Ny aXB0aW9uKCkgY29uc3QKIAogU3RyaW5nIEFjY2Vzc2liaWxpdHlNZWRpYVRpbWVsaW5lOjpoZWxw VGV4dCgpIGNvbnN0CiB7Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0 IFN0cmluZywgc2xpZGVyLCAoQVNDSUlMaXRlcmFsKCJTbGlkZXIiKSkpOworICAgIHN0YXRpYyBO ZXZlckRlc3Ryb3llZDxjb25zdCBTdHJpbmc+IHNsaWRlcihBU0NJSUxpdGVyYWwoIlNsaWRlciIp KTsKICAgICByZXR1cm4gbG9jYWxpemVkTWVkaWFDb250cm9sRWxlbWVudEhlbHBUZXh0KHNsaWRl cik7CiB9CiAKQEAgLTMxMyw4ICszMTQsOCBAQCBib29sIEFjY2Vzc2liaWxpdHlNZWRpYVRpbWVE aXNwbGF5Ojpjb21wdXRlQWNjZXNzaWJpbGl0eUlzSWdub3JlZCgpIGNvbnN0CiAKIFN0cmluZyBB Y2Nlc3NpYmlsaXR5TWVkaWFUaW1lRGlzcGxheTo6YWNjZXNzaWJpbGl0eURlc2NyaXB0aW9uKCkg Y29uc3QKIHsKLSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwoY29uc3QgU3RyaW5n LCBjdXJyZW50VGltZURpc3BsYXksIChBU0NJSUxpdGVyYWwoIkN1cnJlbnRUaW1lRGlzcGxheSIp KSk7Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0IFN0cmluZywgdGlt ZVJlbWFpbmluZ0Rpc3BsYXksIChBU0NJSUxpdGVyYWwoIlRpbWVSZW1haW5pbmdEaXNwbGF5Iikp KTsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgU3RyaW5nPiBjdXJyZW50VGltZURp c3BsYXkoQVNDSUlMaXRlcmFsKCJDdXJyZW50VGltZURpc3BsYXkiKSk7CisgICAgc3RhdGljIE5l dmVyRGVzdHJveWVkPGNvbnN0IFN0cmluZz4gdGltZVJlbWFpbmluZ0Rpc3BsYXkoQVNDSUlMaXRl cmFsKCJUaW1lUmVtYWluaW5nRGlzcGxheSIpKTsKIAogICAgIGlmIChjb250cm9sVHlwZSgpID09 IE1lZGlhQ3VycmVudFRpbWVEaXNwbGF5KQogICAgICAgICByZXR1cm4gbG9jYWxpemVkTWVkaWFD b250cm9sRWxlbWVudFN0cmluZyhjdXJyZW50VGltZURpc3BsYXkpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAKaW5kZXggYjQ4 MDE5ZS4uYmU5ZWUzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCkBAIC02NCw2ICs2NCw3IEBACiAjaW5jbHVkZSAiVXNl ckdlc3R1cmVJbmRpY2F0b3IuaCIKICNpbmNsdWRlICJWaXNpYmxlVW5pdHMuaCIKICNpbmNsdWRl ICJodG1sZWRpdGluZy5oIgorI2luY2x1ZGUgPHd0Zi9OZXZlckRlc3Ryb3llZC5oPgogI2luY2x1 ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVy Lmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CkBAIC0xNDg1LDE1ICsxNDg2LDE1 IEBAIGNvbnN0IFN0cmluZyYgQWNjZXNzaWJpbGl0eU9iamVjdDo6YWN0aW9uVmVyYigpIGNvbnN0 CiB7CiAjaWYgIVBMQVRGT1JNKElPUykKICAgICAvLyBGSVhNRTogTmVlZCB0byBhZGQgdmVyYnMg Zm9yIHNlbGVjdCBlbGVtZW50cy4KLSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwo Y29uc3QgU3RyaW5nLCBidXR0b25BY3Rpb24sIChBWEJ1dHRvbkFjdGlvblZlcmIoKSkpOwotICAg IERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBTdHJpbmcsIHRleHRGaWVsZEFj dGlvbiwgKEFYVGV4dEZpZWxkQWN0aW9uVmVyYigpKSk7Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVf U1RBVElDX0xPQ0FMKGNvbnN0IFN0cmluZywgcmFkaW9CdXR0b25BY3Rpb24sIChBWFJhZGlvQnV0 dG9uQWN0aW9uVmVyYigpKSk7Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FMKGNv bnN0IFN0cmluZywgY2hlY2tlZENoZWNrQm94QWN0aW9uLCAoQVhDaGVja2VkQ2hlY2tCb3hBY3Rp b25WZXJiKCkpKTsKLSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwoY29uc3QgU3Ry aW5nLCB1bmNoZWNrZWRDaGVja0JveEFjdGlvbiwgKEFYVW5jaGVja2VkQ2hlY2tCb3hBY3Rpb25W ZXJiKCkpKTsKLSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwoY29uc3QgU3RyaW5n LCBsaW5rQWN0aW9uLCAoQVhMaW5rQWN0aW9uVmVyYigpKSk7Ci0gICAgREVQUkVDQVRFRF9ERUZJ TkVfU1RBVElDX0xPQ0FMKGNvbnN0IFN0cmluZywgbWVudUxpc3RBY3Rpb24sIChBWE1lbnVMaXN0 QWN0aW9uVmVyYigpKSk7Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0 IFN0cmluZywgbWVudUxpc3RQb3B1cEFjdGlvbiwgKEFYTWVudUxpc3RQb3B1cEFjdGlvblZlcmIo KSkpOwotICAgIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBTdHJpbmcsIGxp c3RJdGVtQWN0aW9uLCAoQVhMaXN0SXRlbUFjdGlvblZlcmIoKSkpOworICAgIHN0YXRpYyBOZXZl ckRlc3Ryb3llZDxjb25zdCBTdHJpbmc+IGJ1dHRvbkFjdGlvbihBWEJ1dHRvbkFjdGlvblZlcmIo KSk7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPGNvbnN0IFN0cmluZz4gdGV4dEZpZWxkQWN0 aW9uKEFYVGV4dEZpZWxkQWN0aW9uVmVyYigpKTsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8 Y29uc3QgU3RyaW5nPiByYWRpb0J1dHRvbkFjdGlvbihBWFJhZGlvQnV0dG9uQWN0aW9uVmVyYigp KTsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgU3RyaW5nPiBjaGVja2VkQ2hlY2tC b3hBY3Rpb24oQVhDaGVja2VkQ2hlY2tCb3hBY3Rpb25WZXJiKCkpOworICAgIHN0YXRpYyBOZXZl ckRlc3Ryb3llZDxjb25zdCBTdHJpbmc+IHVuY2hlY2tlZENoZWNrQm94QWN0aW9uKEFYVW5jaGVj a2VkQ2hlY2tCb3hBY3Rpb25WZXJiKCkpOworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxjb25z dCBTdHJpbmc+IGxpbmtBY3Rpb24oQVhMaW5rQWN0aW9uVmVyYigpKTsKKyAgICBzdGF0aWMgTmV2 ZXJEZXN0cm95ZWQ8Y29uc3QgU3RyaW5nPiBtZW51TGlzdEFjdGlvbihBWE1lbnVMaXN0QWN0aW9u VmVyYigpKTsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgU3RyaW5nPiBtZW51TGlz dFBvcHVwQWN0aW9uKEFYTWVudUxpc3RQb3B1cEFjdGlvblZlcmIoKSk7CisgICAgc3RhdGljIE5l dmVyRGVzdHJveWVkPGNvbnN0IFN0cmluZz4gbGlzdEl0ZW1BY3Rpb24oQVhMaXN0SXRlbUFjdGlv blZlcmIoKSk7CiAKICAgICBzd2l0Y2ggKHJvbGVWYWx1ZSgpKSB7CiAgICAgY2FzZSBCdXR0b25S b2xlOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5UmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz aWJpbGl0eVJlbmRlck9iamVjdC5jcHAKaW5kZXggZWM3OGUxYi4uNTM5N2QxNyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5k ZXJPYmplY3QuY3BwCkBAIC0xMDAsNiArMTAwLDcgQEAKICNpbmNsdWRlICJUZXh0SXRlcmF0b3Iu aCIKICNpbmNsdWRlICJWaXNpYmxlVW5pdHMuaCIKICNpbmNsdWRlICJodG1sZWRpdGluZy5oIgor I2luY2x1ZGUgPHd0Zi9OZXZlckRlc3Ryb3llZC5oPgogI2luY2x1ZGUgPHd0Zi9TdGRMaWJFeHRy YXMuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+CiAjaW5jbHVkZSA8d3Rm L3VuaWNvZGUvQ2hhcmFjdGVyTmFtZXMuaD4KQEAgLTI2NDQsMTggKzI2NDUsMTggQEAgYm9vbCBB Y2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojppbmhlcml0c1ByZXNlbnRhdGlvbmFsUm9sZSgpIGNv bnN0CiAgICAgLy8gQVJJQSBzcGVjIHNheXMgdGhhdCB3aGVuIGEgcGFyZW50IG9iamVjdCBpcyBw cmVzZW50YXRpb25hbCwgYW5kIGl0IGhhcyByZXF1aXJlZCBjaGlsZCBlbGVtZW50cywKICAgICAv LyB0aG9zZSBjaGlsZCBlbGVtZW50cyBhcmUgYWxzbyBwcmVzZW50YXRpb25hbC4gRm9yIGV4YW1w bGUsIDxsaT4gYmVjb21lcyBwcmVzZW50YXRpb25hbCBmcm9tIDx1bD4uCiAgICAgLy8gaHR0cDov L3d3dy53My5vcmcvV0FJL1BGL2FyaWEvY29tcGxldGUjcHJlc2VudGF0aW9uCi0gICAgREVQUkVD QVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FMKEhhc2hTZXQ8UXVhbGlmaWVkTmFtZT4sIGxpc3RJdGVt UGFyZW50cywgKCkpOworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxIYXNoU2V0PFF1YWxpZmll ZE5hbWU+PiBsaXN0SXRlbVBhcmVudHM7CiAKICAgICBIYXNoU2V0PFF1YWxpZmllZE5hbWU+KiBw b3NzaWJsZVBhcmVudFRhZ05hbWVzID0gMDsKICAgICBzd2l0Y2ggKHJvbGVWYWx1ZSgpKSB7CiAg ICAgY2FzZSBMaXN0SXRlbVJvbGU6CiAgICAgY2FzZSBMaXN0TWFya2VyUm9sZToKLSAgICAgICAg aWYgKGxpc3RJdGVtUGFyZW50cy5pc0VtcHR5KCkpIHsKLSAgICAgICAgICAgIGxpc3RJdGVtUGFy ZW50cy5hZGQodWxUYWcpOwotICAgICAgICAgICAgbGlzdEl0ZW1QYXJlbnRzLmFkZChvbFRhZyk7 Ci0gICAgICAgICAgICBsaXN0SXRlbVBhcmVudHMuYWRkKGRsVGFnKTsKKyAgICAgICAgaWYgKGxp c3RJdGVtUGFyZW50cy5nZXQoKS5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgIGxpc3RJdGVtUGFy ZW50cy5nZXQoKS5hZGQodWxUYWcpOworICAgICAgICAgICAgbGlzdEl0ZW1QYXJlbnRzLmdldCgp LmFkZChvbFRhZyk7CisgICAgICAgICAgICBsaXN0SXRlbVBhcmVudHMuZ2V0KCkuYWRkKGRsVGFn KTsKICAgICAgICAgfQotICAgICAgICBwb3NzaWJsZVBhcmVudFRhZ05hbWVzID0gJmxpc3RJdGVt UGFyZW50czsKKyAgICAgICAgcG9zc2libGVQYXJlbnRUYWdOYW1lcyA9ICZsaXN0SXRlbVBhcmVu dHMuZ2V0KCk7CiAgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIGJyZWFrOwpA QCAtMzAyNyw5ICszMDI4LDkgQEAgYm9vbCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpjYW5I YXZlQ2hpbGRyZW4oKSBjb25zdAogCiBjb25zdCBBdG9taWNTdHJpbmcmIEFjY2Vzc2liaWxpdHlS ZW5kZXJPYmplY3Q6OmFyaWFMaXZlUmVnaW9uU3RhdHVzKCkgY29uc3QKIHsKLSAgICBERVBSRUNB VEVEX0RFRklORV9TVEFUSUNfTE9DQUwoY29uc3QgQXRvbWljU3RyaW5nLCBsaXZlUmVnaW9uU3Rh dHVzQXNzZXJ0aXZlLCAoImFzc2VydGl2ZSIsIEF0b21pY1N0cmluZzo6Q29uc3RydWN0RnJvbUxp dGVyYWwpKTsKLSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwoY29uc3QgQXRvbWlj U3RyaW5nLCBsaXZlUmVnaW9uU3RhdHVzUG9saXRlLCAoInBvbGl0ZSIsIEF0b21pY1N0cmluZzo6 Q29uc3RydWN0RnJvbUxpdGVyYWwpKTsKLSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9D QUwoY29uc3QgQXRvbWljU3RyaW5nLCBsaXZlUmVnaW9uU3RhdHVzT2ZmLCAoIm9mZiIsIEF0b21p Y1N0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVyYWwpKTsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95 ZWQ8Y29uc3QgQXRvbWljU3RyaW5nPiBsaXZlUmVnaW9uU3RhdHVzQXNzZXJ0aXZlKCJhc3NlcnRp dmUiLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKTsKKyAgICBzdGF0aWMgTmV2 ZXJEZXN0cm95ZWQ8Y29uc3QgQXRvbWljU3RyaW5nPiBsaXZlUmVnaW9uU3RhdHVzUG9saXRlKCJw b2xpdGUiLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKTsKKyAgICBzdGF0aWMg TmV2ZXJEZXN0cm95ZWQ8Y29uc3QgQXRvbWljU3RyaW5nPiBsaXZlUmVnaW9uU3RhdHVzT2ZmKCJv ZmYiLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKTsKICAgICAKICAgICBjb25z dCBBdG9taWNTdHJpbmcmIGxpdmVSZWdpb25TdGF0dXMgPSBnZXRBdHRyaWJ1dGUoYXJpYV9saXZl QXR0cik7CiAgICAgLy8gVGhlc2Ugcm9sZXMgaGF2ZSBpbXBsaWNpdCBsaXZlIHJlZ2lvbiBzdGF0 dXMuCkBAIC0zMDU0LDcgKzMwNTUsNyBAQCBjb25zdCBBdG9taWNTdHJpbmcmIEFjY2Vzc2liaWxp dHlSZW5kZXJPYmplY3Q6OmFyaWFMaXZlUmVnaW9uU3RhdHVzKCkgY29uc3QKIAogY29uc3QgQXRv bWljU3RyaW5nJiBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjphcmlhTGl2ZVJlZ2lvblJlbGV2 YW50KCkgY29uc3QKIHsKLSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwoY29uc3Qg QXRvbWljU3RyaW5nLCBkZWZhdWx0TGl2ZVJlZ2lvblJlbGV2YW50LCAoImFkZGl0aW9ucyB0ZXh0 IiwgQXRvbWljU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCkpOworICAgIHN0YXRpYyBOZXZl ckRlc3Ryb3llZDxjb25zdCBBdG9taWNTdHJpbmc+IGRlZmF1bHRMaXZlUmVnaW9uUmVsZXZhbnQo ImFkZGl0aW9ucyB0ZXh0IiwgQXRvbWljU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCk7CiAg ICAgY29uc3QgQXRvbWljU3RyaW5nJiByZWxldmFudCA9IGdldEF0dHJpYnV0ZShhcmlhX3JlbGV2 YW50QXR0cik7CiAKICAgICAvLyBEZWZhdWx0IGFyaWEtcmVsZXZhbnQgPSAiYWRkaXRpb25zIHRl eHQiLgpAQCAtMzE2NiwxMiArMzE2NywxMiBAQCBjb25zdCBTdHJpbmcmIEFjY2Vzc2liaWxpdHlS ZW5kZXJPYmplY3Q6OmFjdGlvblZlcmIoKSBjb25zdAogewogI2lmICFQTEFURk9STShJT1MpCiAg ICAgLy8gRklYTUU6IE5lZWQgdG8gYWRkIHZlcmJzIGZvciBzZWxlY3QgZWxlbWVudHMuCi0gICAg REVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0IFN0cmluZywgYnV0dG9uQWN0aW9u LCAoQVhCdXR0b25BY3Rpb25WZXJiKCkpKTsKLSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNf TE9DQUwoY29uc3QgU3RyaW5nLCB0ZXh0RmllbGRBY3Rpb24sIChBWFRleHRGaWVsZEFjdGlvblZl cmIoKSkpOwotICAgIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBTdHJpbmcs IHJhZGlvQnV0dG9uQWN0aW9uLCAoQVhSYWRpb0J1dHRvbkFjdGlvblZlcmIoKSkpOwotICAgIERF UFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBTdHJpbmcsIGNoZWNrZWRDaGVja0Jv eEFjdGlvbiwgKEFYQ2hlY2tlZENoZWNrQm94QWN0aW9uVmVyYigpKSk7Ci0gICAgREVQUkVDQVRF RF9ERUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0IFN0cmluZywgdW5jaGVja2VkQ2hlY2tCb3hBY3Rp b24sIChBWFVuY2hlY2tlZENoZWNrQm94QWN0aW9uVmVyYigpKSk7Ci0gICAgREVQUkVDQVRFRF9E RUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0IFN0cmluZywgbGlua0FjdGlvbiwgKEFYTGlua0FjdGlv blZlcmIoKSkpOworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxjb25zdCBTdHJpbmc+IGJ1dHRv bkFjdGlvbihBWEJ1dHRvbkFjdGlvblZlcmIoKSk7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVk PGNvbnN0IFN0cmluZz4gdGV4dEZpZWxkQWN0aW9uKEFYVGV4dEZpZWxkQWN0aW9uVmVyYigpKTsK KyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgU3RyaW5nPiByYWRpb0J1dHRvbkFjdGlv bihBWFJhZGlvQnV0dG9uQWN0aW9uVmVyYigpKTsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8 Y29uc3QgU3RyaW5nPiBjaGVja2VkQ2hlY2tCb3hBY3Rpb24oQVhVbmNoZWNrZWRDaGVja0JveEFj dGlvblZlcmIoKSk7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPGNvbnN0IFN0cmluZz4gdW5j aGVja2VkQ2hlY2tCb3hBY3Rpb24oQVhVbmNoZWNrZWRDaGVja0JveEFjdGlvblZlcmIoKSk7Cisg ICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPGNvbnN0IFN0cmluZz4gbGlua0FjdGlvbihBWExpbmtB Y3Rpb25WZXJiKCkpOwogCiAgICAgc3dpdGNoIChyb2xlVmFsdWUoKSkgewogICAgIGNhc2UgQnV0 dG9uUm9sZToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRrL0FY T2JqZWN0Q2FjaGVBdGsuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsvQVhP YmplY3RDYWNoZUF0ay5jcHAKaW5kZXggYzU0NDQ3NC4uNWQ2MmE5OCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsvQVhPYmplY3RDYWNoZUF0ay5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsvQVhPYmplY3RDYWNoZUF0ay5jcHAKQEAg LTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJSYW5nZS5oIgogI2luY2x1ZGUgIlRleHRJdGVyYXRv ci5oIgogI2luY2x1ZGUgIldlYktpdEFjY2Vzc2libGVXcmFwcGVyQXRrLmgiCisjaW5jbHVkZSA8 d3RmL05ldmVyRGVzdHJveWVkLmg+CiAjaW5jbHVkZSA8d3RmL2dvYmplY3QvR1JlZlB0ci5oPgog I2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIApAQCAtMTE5LDggKzEyMCw4IEBAIHN0YXRp YyB2b2lkIG5vdGlmeUNoaWxkcmVuU2VsZWN0aW9uQ2hhbmdlKEFjY2Vzc2liaWxpdHlPYmplY3Qq IG9iamVjdCkKICAgICAvLyBmb2N1c2VkIG9iamVjdCBhbmQgaXRzIGFzc29jaWF0ZWQgbGlzdCBv YmplY3QsIGFzIHBlciBwcmV2aW91cwogICAgIC8vIGNhbGxzIHRvIHRoaXMgZnVuY3Rpb24sIGlu IG9yZGVyIHRvIHByb3Blcmx5IGRlY2lkZSB3aGV0aGVyIHRvCiAgICAgLy8gZW1pdCBzb21lIHNp Z25hbHMgb3Igbm90LgotICAgIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChSZWZQdHI8 QWNjZXNzaWJpbGl0eU9iamVjdD4sIG9sZExpc3RPYmplY3QsICgpKTsKLSAgICBERVBSRUNBVEVE X0RFRklORV9TVEFUSUNfTE9DQUwoUmVmUHRyPEFjY2Vzc2liaWxpdHlPYmplY3Q+LCBvbGRGb2N1 c2VkT2JqZWN0LCAoKSk7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFJlZlB0cjxBY2Nlc3Np YmlsaXR5T2JqZWN0Pj4gb2xkTGlzdE9iamVjdDsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8 UmVmUHRyPEFjY2Vzc2liaWxpdHlPYmplY3Q+PiBvbGRGb2N1c2VkT2JqZWN0OwogCiAgICAgLy8g T25seSBsaXN0IGJveGVzIGFuZCBtZW51IGxpc3RzIHN1cHBvcnRlZCBzbyBmYXIuCiAgICAgaWYg KCFvYmplY3QgfHwgIShvYmplY3QtPmlzTGlzdEJveCgpIHx8IG9iamVjdC0+aXNNZW51TGlzdCgp KSkKQEAgLTE0Miw3ICsxNDMsNyBAQCBzdGF0aWMgdm9pZCBub3RpZnlDaGlsZHJlblNlbGVjdGlv bkNoYW5nZShBY2Nlc3NpYmlsaXR5T2JqZWN0KiBvYmplY3QpCiAKICAgICBBY2Nlc3NpYmlsaXR5 T2JqZWN0KiBsaXN0T2JqZWN0ID0gZ2V0TGlzdE9iamVjdChvYmplY3QpOwogICAgIGlmICghbGlz dE9iamVjdCkgewotICAgICAgICBvbGRMaXN0T2JqZWN0ID0gMDsKKyAgICAgICAgb2xkTGlzdE9i amVjdC5nZXQoKSA9IDA7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTE1NCwxMSArMTU1 LDExIEBAIHN0YXRpYyB2b2lkIG5vdGlmeUNoaWxkcmVuU2VsZWN0aW9uQ2hhbmdlKEFjY2Vzc2li aWxpdHlPYmplY3QqIG9iamVjdCkKICAgICAvLyBFbnN1cmUgdGhlIGN1cnJlbnQgbGlzdCBvYmpl Y3QgaXMgdGhlIHNhbWUgdGhhbiB0aGUgb2xkIG9uZSBzbwogICAgIC8vIGZ1cnRoZXIgY29tcGFy aXNvbnMgbWFrZSBzZW5zZS4gT3RoZXJ3aXNlLCBqdXN0IHJlc2V0CiAgICAgLy8gb2xkRm9jdXNl ZE9iamVjdCBzbyBpdCB3b24ndCBiZSB0YWtlbiBpbnRvIGFjY291bnQuCi0gICAgaWYgKG9sZExp c3RPYmplY3QgIT0gbGlzdE9iamVjdCkKLSAgICAgICAgb2xkRm9jdXNlZE9iamVjdCA9IDA7Cisg ICAgaWYgKG9sZExpc3RPYmplY3QuZ2V0KCkgIT0gbGlzdE9iamVjdCkKKyAgICAgICAgb2xkRm9j dXNlZE9iamVjdC5nZXQoKSA9IDA7CiAKICAgICBBdGtPYmplY3QqIGF4SXRlbSA9IGl0ZW0gPyBp dGVtLT53cmFwcGVyKCkgOiAwOwotICAgIEF0a09iamVjdCogYXhPbGRGb2N1c2VkT2JqZWN0ID0g b2xkRm9jdXNlZE9iamVjdCA/IG9sZEZvY3VzZWRPYmplY3QtPndyYXBwZXIoKSA6IDA7CisgICAg QXRrT2JqZWN0KiBheE9sZEZvY3VzZWRPYmplY3QgPSBvbGRGb2N1c2VkT2JqZWN0LmdldCgpID8g b2xkRm9jdXNlZE9iamVjdC5nZXQoKS0+d3JhcHBlcigpIDogMDsKIAogICAgIC8vIE9sZCBmb2N1 c2VkIG9iamVjdCBqdXN0IGxvc3QgZm9jdXMsIHNvIGVtaXQgdGhlIGV2ZW50cy4KICAgICBpZiAo YXhPbGRGb2N1c2VkT2JqZWN0ICYmIGF4SXRlbSAhPSBheE9sZEZvY3VzZWRPYmplY3QpIHsKQEAg LTE3NSw4ICsxNzYsOCBAQCBzdGF0aWMgdm9pZCBub3RpZnlDaGlsZHJlblNlbGVjdGlvbkNoYW5n ZShBY2Nlc3NpYmlsaXR5T2JqZWN0KiBvYmplY3QpCiAgICAgfQogCiAgICAgLy8gVXBkYXRlIHBv aW50ZXJzIHRvIHRoZSBwcmV2aW91c2x5IGludm9sdmVkIG9iamVjdHMuCi0gICAgb2xkTGlzdE9i amVjdCA9IGxpc3RPYmplY3Q7Ci0gICAgb2xkRm9jdXNlZE9iamVjdCA9IGl0ZW07CisgICAgb2xk TGlzdE9iamVjdC5nZXQoKSA9IGxpc3RPYmplY3Q7CisgICAgb2xkRm9jdXNlZE9iamVjdC5nZXQo KSA9IGl0ZW07CiB9CiAKIHZvaWQgQVhPYmplY3RDYWNoZTo6cG9zdFBsYXRmb3JtTm90aWZpY2F0 aW9uKEFjY2Vzc2liaWxpdHlPYmplY3QqIGNvcmVPYmplY3QsIEFYTm90aWZpY2F0aW9uIG5vdGlm aWNhdGlvbikK