195861 2019-03-17 07:01:14 -0700 Change some logging levels 2019-03-18 09:52:52 -0700 1 1 1 Unclassified WebKit Media Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue jer.noble webkit-bug-importer youennf oldest_to_newest 1517533 0 eric.carlson 2019-03-17 07:01:14 -0700 Make the web inspector's "basic" logging include INFO level logging and change some log messages that currently use DEBUG to INFO. 1517534 1 webkit-bug-importer 2019-03-17 07:02:51 -0700 <rdar://problem/48961669> 1517535 2 364963 eric.carlson 2019-03-17 07:20:23 -0700 Created attachment 364963 Patch 1517730 3 364963 commit-queue 2019-03-18 09:52:51 -0700 Comment on attachment 364963 Patch Clearing flags on attachment: 364963 Committed r243072: <https://trac.webkit.org/changeset/243072> 1517731 4 commit-queue 2019-03-18 09:52:52 -0700 All reviewed patches have been landed. Closing bug. 364963 2019-03-17 07:20:23 -0700 2019-03-18 09:52:51 -0700 Patch bug-195861-20190317072022.patch text/plain 23002 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzMDQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzU3OTdlODJkZjg2MzIz ZGJiYjQwZjVlN2ViYjFjMmY1YTVjNzcyMy4uNzI4YjQ3OTNjN2E5ZTMxZjU4MTM3OGYyODEzMzFh YjFlNjU2YWQ5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU1IEBACisyMDE5LTAzLTE3ICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIENoYW5nZSBzb21l IGxvZ2dpbmcgbGV2ZWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xOTU4NjEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ4OTYxNjY5PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTW9kdWxlcy9tZWRp YXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSVENQZWVy Q29ubmVjdGlvbjo6ZGlzcGF0Y2hFdmVudCk6CisgICAgICAgICogTW9kdWxlcy93ZWJhdWRpby9B dWRpb05vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXVkaW9Ob2RlOjphZGRJbnB1dCk6Cisg ICAgICAgIChXZWJDb3JlOjpBdWRpb05vZGU6OmFkZE91dHB1dCk6CisgICAgICAgIChXZWJDb3Jl OjpBdWRpb05vZGU6OmNvbm5lY3QpOgorICAgICAgICAoV2ViQ29yZTo6QXVkaW9Ob2RlOjpkaXNj b25uZWN0KToKKyAgICAgICAgKiBNb2R1bGVzL3dlYmF1ZGlvL0F1ZGlvUGFyYW0uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6QXVkaW9QYXJhbTo6Y29ubmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpB dWRpb1BhcmFtOjpkaXNjb25uZWN0KToKKyAgICAgICAgKiBNb2R1bGVzL3dlYmF1ZGlvL1dhdmVT aGFwZXJOb2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldhdmVTaGFwZXJOb2RlOjpzZXRPdmVy c2FtcGxlKToKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6Y2FuUGxheVR5cGUgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c2Vla1Rhc2spOgorICAgICAgICAoV2ViQ29yZTo6 SFRNTE1lZGlhRWxlbWVudDo6ZGlzcGF0Y2hFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1M TWVkaWFFbGVtZW50OjplbnN1cmVNZWRpYUNvbnRyb2xzSW5qZWN0ZWRTY3JpcHQpOgorICAgICAg ICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6ZGlkQWRkVXNlckFnZW50U2hhZG93Um9vdCk6 CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpzZXRNZWRpYUNvbnRyb2xzRGVw ZW5kT25QYWdlU2NhbGVGYWN0b3IpOgorICAgICAgICAqIGh0bWwvdHJhY2svSW5iYW5kR2VuZXJp Y1RleHRUcmFjay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbmJhbmRHZW5lcmljVGV4dFRyYWNr OjphZGRHZW5lcmljQ3VlKToKKyAgICAgICAgKFdlYkNvcmU6OkluYmFuZEdlbmVyaWNUZXh0VHJh Y2s6OnJlbW92ZUdlbmVyaWNDdWUpOgorICAgICAgICAoV2ViQ29yZTo6SW5iYW5kR2VuZXJpY1Rl eHRUcmFjazo6bmV3Q3Vlc1BhcnNlZCk6CisgICAgICAgICogaHRtbC90cmFjay9JbmJhbmRXZWJW VFRUZXh0VHJhY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5iYW5kV2ViVlRUVGV4dFRyYWNr OjpuZXdDdWVzUGFyc2VkKToKKyAgICAgICAgKiBodG1sL3RyYWNrL0xvYWRhYmxlVGV4dFRyYWNr LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxvYWRhYmxlVGV4dFRyYWNrOjpuZXdDdWVzQXZhaWxh YmxlKToKKyAgICAgICAgKiBodG1sL3RyYWNrL1RleHRUcmFjay5jcHA6CisgICAgICAgIChXZWJD b3JlOjpUZXh0VHJhY2s6OnJlbW92ZUN1ZSk6CisgICAgICAgICogaW5zcGVjdG9yL2FnZW50cy9X ZWJDb25zb2xlQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViQ29uc29sZUFnZW50Ojpn ZXRMb2dnaW5nQ2hhbm5lbHMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9JbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oklu YmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnByb2Nlc3NBdHRyaWJ1dGVkU3RyaW5ncyk6CisgICAg ICAgIChXZWJDb3JlOjpJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpyZW1vdmVDb21wbGV0ZWRD dWVzKToKKyAgICAgICAgKFdlYkNvcmU6OkluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnByb2Nl c3NOYXRpdmVTYW1wbGVzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp b24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tOgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6Y3JlYXRlSW1hZ2VG b3JUaW1lSW5SZWN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91 bmRhdGlvbk9iakM6OnVwZGF0ZUxhc3RJbWFnZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBs YXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjptZXRhZGF0YURpZEFycml2ZSk6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRl TWVkaWFTb3VyY2VBVkZPYmpDLm1tOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2 YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpzZWVrV2l0aFRvbGVyYW5jZSk6CisgICAgICAgIChXZWJD b3JlOjpNZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakM6OnNlZWtJbnRlcm5hbCk6 CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakM6 OmlzQ3VycmVudFBsYXliYWNrVGFyZ2V0V2lyZWxlc3MgY29uc3QpOgorCiAyMDE5LTAzLTE2ICBT aWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgogCiAgICAgICAgIExheW91dCB0ZXN0cyBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL0luZGV4ZWREQi8qLWV4Y2VwdGlvbi1vcmRl ci5odG1sIGFyZSBmYWlsaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24uY3BwCmluZGV4IDY3OTMxZDUzYjIzNjRhOTk2 NjlhZmRkMmJkZWMwNDA3NmFkOWU2OGUuLmQ2M2Y4MTQ2MzlmNjgyOWIxMDRlMDNkZDM2MzdjN2Vi Y2EwZTJmOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0v UlRDUGVlckNvbm5lY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz dHJlYW0vUlRDUGVlckNvbm5lY3Rpb24uY3BwCkBAIC01ODAsNyArNTgwLDcgQEAgdm9pZCBSVENQ ZWVyQ29ubmVjdGlvbjo6ZmlyZUV2ZW50KEV2ZW50JiBldmVudCkKIAogdm9pZCBSVENQZWVyQ29u bmVjdGlvbjo6ZGlzcGF0Y2hFdmVudChFdmVudCYgZXZlbnQpCiB7Ci0gICAgREVCVUdfTE9HKExP R0lERU5USUZJRVIsICJkaXNwYXRjaGluZyAnIiwgZXZlbnQudHlwZSgpLCAiJyIpOworICAgIElO Rk9fTE9HKExPR0lERU5USUZJRVIsICJkaXNwYXRjaGluZyAnIiwgZXZlbnQudHlwZSgpLCAiJyIp OwogICAgIEV2ZW50VGFyZ2V0OjpkaXNwYXRjaEV2ZW50KGV2ZW50KTsKIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9BdWRpb05vZGUuY3BwIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9BdWRpb05vZGUuY3BwCmluZGV4IGQyY2E5MjljNmU2 ZTNmMDZjZDVlNmM0OTM2MmVjNmE0MzE3Y2YwYzEuLmI1YWIwZDRiODA2MGY4OTZjYTc2ZWZmZDAy ZTM5YjE4YWQ1ZjlkNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVk aW8vQXVkaW9Ob2RlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0F1 ZGlvTm9kZS5jcHAKQEAgLTE2MywxNCArMTYzLDE0IEBAIHZvaWQgQXVkaW9Ob2RlOjpsYXp5SW5p dGlhbGl6ZSgpCiB2b2lkIEF1ZGlvTm9kZTo6YWRkSW5wdXQoc3RkOjp1bmlxdWVfcHRyPEF1ZGlv Tm9kZUlucHV0PiBpbnB1dCkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwotICAgIERF QlVHX0xPRyhMT0dJREVOVElGSUVSLCBpbnB1dC0+bm9kZSgpLT5ub2RlVHlwZSgpKTsKKyAgICBJ TkZPX0xPRyhMT0dJREVOVElGSUVSLCBpbnB1dC0+bm9kZSgpLT5ub2RlVHlwZSgpKTsKICAgICBt X2lucHV0cy5hcHBlbmQoV1RGTW92ZShpbnB1dCkpOwogfQogCiB2b2lkIEF1ZGlvTm9kZTo6YWRk T3V0cHV0KHN0ZDo6dW5pcXVlX3B0cjxBdWRpb05vZGVPdXRwdXQ+IG91dHB1dCkKIHsKICAgICBB U1NFUlQoaXNNYWluVGhyZWFkKCkpOwotICAgIERFQlVHX0xPRyhMT0dJREVOVElGSUVSLCBvdXRw dXQtPm5vZGUoKS0+bm9kZVR5cGUoKSk7CisgICAgSU5GT19MT0coTE9HSURFTlRJRklFUiwgb3V0 cHV0LT5ub2RlKCktPm5vZGVUeXBlKCkpOwogICAgIG1fb3V0cHV0cy5hcHBlbmQoV1RGTW92ZShv dXRwdXQpKTsKIH0KIApAQCAtMjIxLDcgKzIyMSw3IEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IEF1ZGlv Tm9kZTo6Y29ubmVjdChBdWRpb1BhcmFtJiBwYXJhbSwgdW5zaWduZWQgb3V0cHV0SW5kZXgpCiAK ICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogCi0gICAgREVCVUdfTE9HKExPR0lERU5USUZJ RVIsIHBhcmFtLm5hbWUoKSwgIiwgb3V0cHV0ID0gIiwgb3V0cHV0SW5kZXgpOworICAgIElORk9f TE9HKExPR0lERU5USUZJRVIsIHBhcmFtLm5hbWUoKSwgIiwgb3V0cHV0ID0gIiwgb3V0cHV0SW5k ZXgpOwogCiAgICAgaWYgKG91dHB1dEluZGV4ID49IG51bWJlck9mT3V0cHV0cygpKQogICAgICAg ICByZXR1cm4gRXhjZXB0aW9uIHsgSW5kZXhTaXplRXJyb3IgfTsKQEAgLTI0NSw3ICsyNDUsNyBA QCBFeGNlcHRpb25Pcjx2b2lkPiBBdWRpb05vZGU6OmRpc2Nvbm5lY3QodW5zaWduZWQgb3V0cHV0 SW5kZXgpCiAgICAgICAgIHJldHVybiBFeGNlcHRpb24geyBJbmRleFNpemVFcnJvciB9OwogCiAg ICAgYXV0byogb3V0cHV0ID0gdGhpcy0+b3V0cHV0KG91dHB1dEluZGV4KTsKLSAgICBERUJVR19M T0coTE9HSURFTlRJRklFUiwgb3V0cHV0LT5ub2RlKCktPm5vZGVUeXBlKCkpOworICAgIElORk9f TE9HKExPR0lERU5USUZJRVIsIG91dHB1dC0+bm9kZSgpLT5ub2RlVHlwZSgpKTsKIAogICAgIG91 dHB1dC0+ZGlzY29ubmVjdEFsbCgpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL3dlYmF1ZGlvL0F1ZGlvUGFyYW0uY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJh dWRpby9BdWRpb1BhcmFtLmNwcAppbmRleCA3ZTQzZDhjN2ZjNzNiZTUyMWI4ZDRjOWQ1Yjk2MWRl Y2JkMWM5ZWZlLi4yOTM0NTY0NDVjYzBlMWJkYTlkMDBkMmJkOWEyYzBkMTExMDNkY2M5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0F1ZGlvUGFyYW0uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQXVkaW9QYXJhbS5jcHAKQEAgLTE5 NCw3ICsxOTQsNyBAQCB2b2lkIEF1ZGlvUGFyYW06OmNvbm5lY3QoQXVkaW9Ob2RlT3V0cHV0KiBv dXRwdXQpCiAgICAgaWYgKCFtX291dHB1dHMuYWRkKG91dHB1dCkuaXNOZXdFbnRyeSkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgREVCVUdfTE9HKExPR0lERU5USUZJRVIsIG91dHB1dC0+bm9kZSgp LT5ub2RlVHlwZSgpKTsKKyAgICBJTkZPX0xPRyhMT0dJREVOVElGSUVSLCBvdXRwdXQtPm5vZGUo KS0+bm9kZVR5cGUoKSk7CiAKICAgICBvdXRwdXQtPmFkZFBhcmFtKHRoaXMpOwogICAgIGNoYW5n ZWRPdXRwdXRzKCk7CkBAIC0yMDgsNyArMjA4LDcgQEAgdm9pZCBBdWRpb1BhcmFtOjpkaXNjb25u ZWN0KEF1ZGlvTm9kZU91dHB1dCogb3V0cHV0KQogICAgIGlmICghb3V0cHV0KQogICAgICAgICBy ZXR1cm47CiAKLSAgICBERUJVR19MT0coTE9HSURFTlRJRklFUiwgb3V0cHV0LT5ub2RlKCktPm5v ZGVUeXBlKCkpOworICAgIElORk9fTE9HKExPR0lERU5USUZJRVIsIG91dHB1dC0+bm9kZSgpLT5u b2RlVHlwZSgpKTsKIAogICAgIGlmIChtX291dHB1dHMucmVtb3ZlKG91dHB1dCkpIHsKICAgICAg ICAgY2hhbmdlZE91dHB1dHMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv d2ViYXVkaW8vV2F2ZVNoYXBlck5vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJh dWRpby9XYXZlU2hhcGVyTm9kZS5jcHAKaW5kZXggOTE5NzI0ZjBiNjJiNDgxOTE1MTAzZTFiYmJm NjkxYzNmNjBlMjE4Mi4uNjUzNTQ2MDdlMDg3ZTdmNDYyYTJiYmVkYjAzZmQ2OWFlY2ZiMTg0ZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9XYXZlU2hhcGVyTm9k ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9XYXZlU2hhcGVyTm9k ZS5jcHAKQEAgLTcxLDcgKzcxLDcgQEAgc3RhdGljIGlubGluZSBXYXZlU2hhcGVyUHJvY2Vzc29y OjpPdmVyU2FtcGxlVHlwZSBwcm9jZXNzb3JUeXBlKFdhdmVTaGFwZXJOb2RlOjoKIHZvaWQgV2F2 ZVNoYXBlck5vZGU6OnNldE92ZXJzYW1wbGUoT3ZlclNhbXBsZVR5cGUgdHlwZSkKIHsKICAgICBB U1NFUlQoaXNNYWluVGhyZWFkKCkpOwotICAgIERFQlVHX0xPRyhMT0dJREVOVElGSUVSLCB0eXBl KTsKKyAgICBJTkZPX0xPRyhMT0dJREVOVElGSUVSLCB0eXBlKTsKIAogICAgIC8vIFN5bmNocm9u aXplIHdpdGggYW55IGdyYXBoIGNoYW5nZXMgb3IgY2hhbmdlcyB0byBjaGFubmVsIGNvbmZpZ3Vy YXRpb24uCiAgICAgQXVkaW9Db250ZXh0OjpBdXRvTG9ja2VyIGNvbnRleHRMb2NrZXIoY29udGV4 dCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCmluZGV4IDM1ZTg0 NTA0N2IwM2Q2NWVmZDA5YjAyZGE0M2UyMTk0ZjU5MTczYjYuLmZiN2RiNTI3ODUyMDAxYzY1NjA4 MTU1OGExOGVmYjljZGU4OTU1MzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TE1lZGlhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVt ZW50LmNwcApAQCAtMTE1OSw3ICsxMTU5LDcgQEAgU3RyaW5nIEhUTUxNZWRpYUVsZW1lbnQ6OmNh blBsYXlUeXBlKGNvbnN0IFN0cmluZyYgbWltZVR5cGUpIGNvbnN0CiAgICAgICAgICAgICBicmVh azsKICAgICB9CiAKLSAgICBERUJVR19MT0coTE9HSURFTlRJRklFUiwgIlsiLCBtaW1lVHlwZSwg Il0gLT4gIiwgY2FuUGxheSk7CisgICAgSU5GT19MT0coTE9HSURFTlRJRklFUiwgbWltZVR5cGUs ICI6ICIsIGNhblBsYXkpOwogCiAgICAgcmV0dXJuIGNhblBsYXk7CiB9CkBAIC0zMDc4LDcgKzMw NzgsNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnNlZWtUYXNrKCkKICAgICBpZiAod2lsbExv ZyhXVEZMb2dMZXZlbERlYnVnKSkgewogICAgICAgICBNZWRpYVRpbWUgbWVkaWFUaW1lID0gbV9w bGF5ZXItPm1lZGlhVGltZUZvclRpbWVWYWx1ZSh0aW1lKTsKICAgICAgICAgaWYgKHRpbWUgIT0g bWVkaWFUaW1lKQotICAgICAgICAgICAgREVCVUdfTE9HKExPR0lERU5USUZJRVIsIHRpbWUsICIg bWVkaWEgdGltZWxpbmUgZXF1aXZhbGVudCBpcyAiLCBtZWRpYVRpbWUpOworICAgICAgICAgICAg SU5GT19MT0coTE9HSURFTlRJRklFUiwgdGltZSwgIiBtZWRpYSB0aW1lbGluZSBlcXVpdmFsZW50 IGlzICIsIG1lZGlhVGltZSk7CiAgICAgfQogCiAgICAgdGltZSA9IG1fcGxheWVyLT5tZWRpYVRp bWVGb3JUaW1lVmFsdWUodGltZSk7CkBAIC01OTE0LDcgKzU5MTQsNyBAQCB2b2lkIEhUTUxNZWRp YUVsZW1lbnQ6OnNldElzUGxheWluZ1RvV2lyZWxlc3NUYXJnZXQoYm9vbCBpc1BsYXlpbmdUb1dp cmVsZXNzVGFyZwogCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmRpc3BhdGNoRXZlbnQoRXZlbnQm IGV2ZW50KQogewotICAgIERFQlVHX0xPRyhMT0dJREVOVElGSUVSLCAiZGlzcGF0Y2hpbmcgJyIs IGV2ZW50LnR5cGUoKSwgIiciKTsKKyAgICBERUJVR19MT0coTE9HSURFTlRJRklFUiwgZXZlbnQu dHlwZSgpKTsKIAogICAgIEhUTUxFbGVtZW50OjpkaXNwYXRjaEV2ZW50KGV2ZW50KTsKIH0KQEAg LTcyNzAsNyArNzI3MCw3IEBAIERPTVdyYXBwZXJXb3JsZCYgSFRNTE1lZGlhRWxlbWVudDo6ZW5z dXJlSXNvbGF0ZWRXb3JsZCgpCiAKIGJvb2wgSFRNTE1lZGlhRWxlbWVudDo6ZW5zdXJlTWVkaWFD b250cm9sc0luamVjdGVkU2NyaXB0KCkKIHsKLSAgICBERUJVR19MT0coTE9HSURFTlRJRklFUik7 CisgICAgSU5GT19MT0coTE9HSURFTlRJRklFUik7CiAKICAgICBQYWdlKiBwYWdlID0gZG9jdW1l bnQoKS5wYWdlKCk7CiAgICAgaWYgKCFwYWdlKQpAQCAtNzM0NCw3ICs3MzQ0LDcgQEAgdm9pZCBI VE1MTWVkaWFFbGVtZW50OjpzZXRDb250cm9sbGVySlNQcm9wZXJ0eShjb25zdCBjaGFyKiBwcm9w ZXJ0eU5hbWUsIEpTQzo6SlMKIAogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpkaWRBZGRVc2VyQWdl bnRTaGFkb3dSb290KFNoYWRvd1Jvb3QmIHJvb3QpCiB7Ci0gICAgREVCVUdfTE9HKExPR0lERU5U SUZJRVIpOworICAgIElORk9fTE9HKExPR0lERU5USUZJRVIpOwogCiAgICAgaWYgKCFlbnN1cmVN ZWRpYUNvbnRyb2xzSW5qZWN0ZWRTY3JpcHQoKSkKICAgICAgICAgcmV0dXJuOwpAQCAtNzQyMiwx MCArNzQyMiwxMCBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmRpZEFkZFVzZXJBZ2VudFNoYWRv d1Jvb3QoU2hhZG93Um9vdCYgcm9vdCkKIAogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzZXRNZWRp YUNvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0b3IoYm9vbCBkZXBlbmRzT25QYWdlU2NhbGUp CiB7Ci0gICAgREVCVUdfTE9HKExPR0lERU5USUZJRVIsICJNZWRpYUVsZW1lbnQ6OnNldE1lZGlh Q29udHJvbHNEZXBlbmRQYWdlU2NhbGVGYWN0b3IiLCBkZXBlbmRzT25QYWdlU2NhbGUpOworICAg IElORk9fTE9HKExPR0lERU5USUZJRVIsIGRlcGVuZHNPblBhZ2VTY2FsZSk7CiAKICAgICBpZiAo ZG9jdW1lbnQoKS5zZXR0aW5ncygpLm1lZGlhQ29udHJvbHNTY2FsZVdpdGhQYWdlWm9vbSgpKSB7 Ci0gICAgICAgIERFQlVHX0xPRyhMT0dJREVOVElGSUVSLCAiTWVkaWFFbGVtZW50OjpzZXRNZWRp YUNvbnRyb2xzRGVwZW5kUGFnZVNjYWxlRmFjdG9yIiwgImZvcmNlZCB0byBmYWxzZSBieSBTZXR0 aW5ncyB2YWx1ZSIpOworICAgICAgICBJTkZPX0xPRyhMT0dJREVOVElGSUVSLCAiZm9yY2VkIHRv IGZhbHNlIGJ5IFNldHRpbmdzIHZhbHVlIik7CiAgICAgICAgIG1fbWVkaWFDb250cm9sc0RlcGVu ZE9uUGFnZVNjYWxlRmFjdG9yID0gZmFsc2U7CiAgICAgICAgIHJldHVybjsKICAgICB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL0luYmFuZEdlbmVyaWNUZXh0VHJhY2su Y3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9JbmJhbmRHZW5lcmljVGV4dFRyYWNrLmNw cAppbmRleCA5MTQxYWNmNDI1MTI4M2U1ODRmNGYwN2FlNWZkMTA3ZDNiNzk0MjQzLi4yYWE1NDY1 MjNkODQyMzk2NmM2MzFiZjQwNjA3MWRiYTljNTMyMGE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL3RyYWNrL0luYmFuZEdlbmVyaWNUZXh0VHJhY2suY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvdHJhY2svSW5iYW5kR2VuZXJpY1RleHRUcmFjay5jcHAKQEAgLTEyNSwxMSAr MTI1LDExIEBAIHZvaWQgSW5iYW5kR2VuZXJpY1RleHRUcmFjazo6YWRkR2VuZXJpY0N1ZShHZW5l cmljQ3VlRGF0YSYgY3VlRGF0YSkKICAgICBhdXRvIGN1ZSA9IFRleHRUcmFja0N1ZUdlbmVyaWM6 OmNyZWF0ZSgqc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLCBjdWVEYXRhLnN0YXJ0VGltZSgpLCBj dWVEYXRhLmVuZFRpbWUoKSwgY3VlRGF0YS5jb250ZW50KCkpOwogICAgIHVwZGF0ZUN1ZUZyb21D dWVEYXRhKGN1ZS5nZXQoKSwgY3VlRGF0YSk7CiAgICAgaWYgKGhhc0N1ZShjdWUucHRyKCksIFRl eHRUcmFja0N1ZTo6SWdub3JlRHVyYXRpb24pKSB7Ci0gICAgICAgIERFQlVHX0xPRyhMT0dJREVO VElGSUVSLCAiaWdub3JpbmcgYWxyZWFkeSBhZGRlZCBjdWU6ICIsIGN1ZS5nZXQoKSk7CisgICAg ICAgIElORk9fTE9HKExPR0lERU5USUZJRVIsICJpZ25vcmluZyBhbHJlYWR5IGFkZGVkIGN1ZTog IiwgY3VlLmdldCgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIERFQlVHX0xPRyhM T0dJREVOVElGSUVSLCAiYWRkZWQgY3VlOiAiLCBjdWUuZ2V0KCkpOworICAgIElORk9fTE9HKExP R0lERU5USUZJRVIsICJhZGRlZCBjdWU6ICIsIGN1ZS5nZXQoKSk7CiAKICAgICBpZiAoY3VlRGF0 YS5zdGF0dXMoKSAhPSBHZW5lcmljQ3VlRGF0YTo6Q29tcGxldGUpCiAgICAgICAgIG1fY3VlTWFw LmFkZChjdWVEYXRhLCBjdWUpOwpAQCAtMTUzLDEwICsxNTMsMTAgQEAgdm9pZCBJbmJhbmRHZW5l cmljVGV4dFRyYWNrOjpyZW1vdmVHZW5lcmljQ3VlKEdlbmVyaWNDdWVEYXRhJiBjdWVEYXRhKQog ewogICAgIGF1dG8gY3VlID0gbWFrZVJlZlB0cihtX2N1ZU1hcC5maW5kKGN1ZURhdGEpKTsKICAg ICBpZiAoY3VlKSB7Ci0gICAgICAgIERFQlVHX0xPRyhMT0dJREVOVElGSUVSLCAqY3VlKTsKKyAg ICAgICAgSU5GT19MT0coTE9HSURFTlRJRklFUiwgKmN1ZSk7CiAgICAgICAgIHJlbW92ZUN1ZSgq Y3VlKTsKICAgICB9IGVsc2UKLSAgICAgICAgREVCVUdfTE9HKExPR0lERU5USUZJRVIsICJVTkFC TEUgdG8gZmluZCBjdWU6ICIsIGN1ZURhdGEpOworICAgICAgICBJTkZPX0xPRyhMT0dJREVOVElG SUVSLCAiVU5BQkxFIHRvIGZpbmQgY3VlOiAiLCBjdWVEYXRhKTsKIAogfQogCkBAIC0xOTQsMTEg KzE5NCwxMSBAQCB2b2lkIEluYmFuZEdlbmVyaWNUZXh0VHJhY2s6Om5ld0N1ZXNQYXJzZWQoKQog ICAgICAgICBhdXRvIHZ0dEN1ZSA9IFZUVEN1ZTo6Y3JlYXRlKCpzY3JpcHRFeGVjdXRpb25Db250 ZXh0KCksICpjdWVEYXRhKTsKIAogICAgICAgICBpZiAoaGFzQ3VlKHZ0dEN1ZS5wdHIoKSwgVGV4 dFRyYWNrQ3VlOjpJZ25vcmVEdXJhdGlvbikpIHsKLSAgICAgICAgICAgIERFQlVHX0xPRyhMT0dJ REVOVElGSUVSLCAiaWdub3JpbmcgYWxyZWFkeSBhZGRlZCBjdWU6ICIsIHZ0dEN1ZS5nZXQoKSk7 CisgICAgICAgICAgICBJTkZPX0xPRyhMT0dJREVOVElGSUVSLCAiaWdub3JpbmcgYWxyZWFkeSBh ZGRlZCBjdWU6ICIsIHZ0dEN1ZS5nZXQoKSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg IH0KIAotICAgICAgICBERUJVR19MT0coTE9HSURFTlRJRklFUiwgdnR0Q3VlLmdldCgpKTsKKyAg ICAgICAgSU5GT19MT0coTE9HSURFTlRJRklFUiwgdnR0Q3VlLmdldCgpKTsKIAogICAgICAgICBh ZGRDdWUoV1RGTW92ZSh2dHRDdWUpKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL3RyYWNrL0luYmFuZFdlYlZUVFRleHRUcmFjay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL3RyYWNrL0luYmFuZFdlYlZUVFRleHRUcmFjay5jcHAKaW5kZXggNWI4OGZjMzQzZGMwYTFj NjY2NWYxMTBjNzI0ZjMyMDc1MTRlZWUwYi4uMWFkMWM2NzMwNDFhMWViMDJjMTNjNTU2ZWRjYjFm MzdhMjdlMDUwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9JbmJhbmRX ZWJWVFRUZXh0VHJhY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svSW5iYW5k V2ViVlRUVGV4dFRyYWNrLmNwcApAQCAtNzIsMTEgKzcyLDExIEBAIHZvaWQgSW5iYW5kV2ViVlRU VGV4dFRyYWNrOjpuZXdDdWVzUGFyc2VkKCkKICAgICBmb3IgKGF1dG8mIGN1ZURhdGEgOiBjdWVz KSB7CiAgICAgICAgIGF1dG8gdnR0Q3VlID0gVlRUQ3VlOjpjcmVhdGUoKnNjcmlwdEV4ZWN1dGlv bkNvbnRleHQoKSwgKmN1ZURhdGEpOwogICAgICAgICBpZiAoaGFzQ3VlKHZ0dEN1ZS5wdHIoKSwg VGV4dFRyYWNrQ3VlOjpJZ25vcmVEdXJhdGlvbikpIHsKLSAgICAgICAgICAgIERFQlVHX0xPRyhM T0dJREVOVElGSUVSLCAiaWdub3JpbmcgYWxyZWFkeSBhZGRlZCBjdWU6ICIsIHZ0dEN1ZS5nZXQo KSk7CisgICAgICAgICAgICBJTkZPX0xPRyhMT0dJREVOVElGSUVSLCAiaWdub3JpbmcgYWxyZWFk eSBhZGRlZCBjdWU6ICIsIHZ0dEN1ZS5nZXQoKSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAg ICAgIH0KIAotICAgICAgICBERUJVR19MT0coTE9HSURFTlRJRklFUiwgdnR0Q3VlLmdldCgpKTsK KyAgICAgICAgSU5GT19MT0coTE9HSURFTlRJRklFUiwgdnR0Q3VlLmdldCgpKTsKIAogICAgICAg ICBhZGRDdWUoV1RGTW92ZSh2dHRDdWUpKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL3RyYWNrL0xvYWRhYmxlVGV4dFRyYWNrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvdHJhY2svTG9hZGFibGVUZXh0VHJhY2suY3BwCmluZGV4IGYyMjY2NmYzMWY0ZDQ0NDc4MDkz ZDI0NWI1ZWNkZTc4MThiMDA3ODYuLmU5YmUyNTMxMjU3YjczZjVlNWUxMzlkNmI5M2RmMjVmOWYz NTY0YzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svTG9hZGFibGVUZXh0 VHJhY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svTG9hZGFibGVUZXh0VHJh Y2suY3BwCkBAIC05OCw3ICs5OCw3IEBAIHZvaWQgTG9hZGFibGVUZXh0VHJhY2s6Om5ld0N1ZXNB dmFpbGFibGUoVGV4dFRyYWNrTG9hZGVyJiBsb2FkZXIpCiAKICAgICBmb3IgKGF1dG8mIG5ld0N1 ZSA6IG5ld0N1ZXMpIHsKICAgICAgICAgbmV3Q3VlLT5zZXRUcmFjayh0aGlzKTsKLSAgICAgICAg REVCVUdfTE9HKExPR0lERU5USUZJRVIsICp0b1ZUVEN1ZShuZXdDdWUuZ2V0KCkpKTsKKyAgICAg ICAgSU5GT19MT0coTE9HSURFTlRJRklFUiwgKnRvVlRUQ3VlKG5ld0N1ZS5nZXQoKSkpOwogICAg ICAgICBtX2N1ZXMtPmFkZChuZXdDdWUucmVsZWFzZU5vbk51bGwoKSk7CiAgICAgfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFjay5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFjay5jcHAKaW5kZXggYmNjNTk4NzZmNjQ4YWI0NjZi M2M2NGYzN2I5NDI4MWY0YTBjNzE3ZC4uYWI2NTIzNGY2ODM1ZjZjNjYzMDJhZTk2Nzg4ZDRmNzNl MTVkOTRhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2su Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrLmNwcApAQCAtMzM3 LDcgKzMzNyw3IEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IFRleHRUcmFjazo6cmVtb3ZlQ3VlKFRleHRU cmFja0N1ZSYgY3VlKQogICAgIGlmICghbV9jdWVzKQogICAgICAgICByZXR1cm4gRXhjZXB0aW9u IHsgSW52YWxpZFN0YXRlRXJyb3IgfTsKIAotICAgIERFQlVHX0xPRyhMT0dJREVOVElGSUVSLCBj dWUpOworICAgIElORk9fTE9HKExPR0lERU5USUZJRVIsIGN1ZSk7CiAKICAgICAvLyAyLiBSZW1v dmUgY3VlIGZyb20gdGhlIG1ldGhvZCdzIFRleHRUcmFjayBvYmplY3QncyB0ZXh0IHRyYWNrJ3Mg dGV4dCB0cmFjayBsaXN0IG9mIGN1ZXMuCiAgICAgbV9jdWVzLT5yZW1vdmUoY3VlKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvV2ViQ29uc29sZUFnZW50LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvV2ViQ29uc29sZUFnZW50LmNwcApp bmRleCBjOTYzMTM4ZGVjNTQyN2JmYWIzMjdhNTBiZmNmMjVhYmNhMjgyYzI1Li5hYzE4YTY3MzFj NWEzYjhkODNmYjM0NWMxN2ZhYzEwZjU3NmM3MGY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvYWdlbnRzL1dlYkNvbnNvbGVBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2FnZW50cy9XZWJDb25zb2xlQWdlbnQuY3BwCkBAIC03Myw5ICs3Myw5IEBA IHZvaWQgV2ViQ29uc29sZUFnZW50OjpnZXRMb2dnaW5nQ2hhbm5lbHMoRXJyb3JTdHJpbmcmLCBS ZWZQdHI8SlNPTjo6QXJyYXlPZjxJbnNwCiAgICAgICAgICAgICBjYXNlIFdURkxvZ0xldmVsQWx3 YXlzOgogICAgICAgICAgICAgY2FzZSBXVEZMb2dMZXZlbEVycm9yOgogICAgICAgICAgICAgY2Fz ZSBXVEZMb2dMZXZlbFdhcm5pbmc6CisgICAgICAgICAgICBjYXNlIFdURkxvZ0xldmVsSW5mbzoK ICAgICAgICAgICAgICAgICBsZXZlbCA9IEluc3BlY3Rvcjo6UHJvdG9jb2w6OkNvbnNvbGU6OkNo YW5uZWxMZXZlbDo6QmFzaWM7CiAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBj YXNlIFdURkxvZ0xldmVsSW5mbzoKICAgICAgICAgICAgIGNhc2UgV1RGTG9nTGV2ZWxEZWJ1ZzoK ICAgICAgICAgICAgICAgICBsZXZlbCA9IEluc3BlY3Rvcjo6UHJvdG9jb2w6OkNvbnNvbGU6OkNo YW5uZWxMZXZlbDo6VmVyYm9zZTsKICAgICAgICAgICAgICAgICBicmVhazsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9JbmJhbmRUZXh0 VHJhY2tQcml2YXRlQVZGLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2 Zm91bmRhdGlvbi9JbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGLmNwcAppbmRleCBkYzkyODI0NWMy MjU2MDE5MWE0NjNmMmJjNzYyODdiMTg2ZDJjNjI0Li41MDIyNWMzNDg3ZDcyZWQxMzdmYjVhYmMz MzU1YWQwOTk3NDQyMjFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9hdmZvdW5kYXRpb24vSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRi5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL0luYmFuZFRleHRUcmFj a1ByaXZhdGVBVkYuY3BwCkBAIC0zMTgsNyArMzE4LDcgQEAgdm9pZCBJbmJhbmRUZXh0VHJhY2tQ cml2YXRlQVZGOjpwcm9jZXNzQXR0cmlidXRlZFN0cmluZ3MoQ0ZBcnJheVJlZiBhdHRyaWJ1dGVk U3QKICAgICBDRkluZGV4IGNvdW50ID0gYXR0cmlidXRlZFN0cmluZ3MgPyBDRkFycmF5R2V0Q291 bnQoYXR0cmlidXRlZFN0cmluZ3MpIDogMDsKIAogICAgIGlmIChjb3VudCkKLSAgICAgICAgREVC VUdfTE9HKExPR0lERU5USUZJRVIsICJhZGRlZCAiLCBjb3VudCwgY291bnQgPiAxID8gIiBjdWVz IiA6ICIgY3VlIiwgIiBhdCB0aW1lICIsIHRpbWUpOworICAgICAgICBJTkZPX0xPRyhMT0dJREVO VElGSUVSLCAiYWRkZWQgIiwgY291bnQsIGNvdW50ID4gMSA/ICIgY3VlcyIgOiAiIGN1ZSIsICIg YXQgdGltZSAiLCB0aW1lKTsKIAogICAgIFZlY3RvcjxSZWY8R2VuZXJpY0N1ZURhdGE+PiBhcnJp dmluZ0N1ZXM7CiAgICAgaWYgKGNvdW50KSB7CkBAIC0zNTksNyArMzU5LDcgQEAgdm9pZCBJbmJh bmRUZXh0VHJhY2tQcml2YXRlQVZGOjpwcm9jZXNzQXR0cmlidXRlZFN0cmluZ3MoQ0ZBcnJheVJl ZiBhdHRyaWJ1dGVkU3QKICAgICAgICAgICAgICAgICAgICAgaWYgKCFhcnJpdmluZ0N1ZS0+ZG9l c0V4dGVuZEN1ZURhdGEoKmN1ZURhdGEpKQogICAgICAgICAgICAgICAgICAgICAgICAgbm9uRXh0 ZW5zaW9uQ3Vlcy5hcHBlbmQoV1RGTW92ZShhcnJpdmluZ0N1ZSkpOwogICAgICAgICAgICAgICAg ICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgICAgICBERUJVR19MT0coTE9HSURFTlRJRklF UiwgImZvdW5kIGFuIGV4dGVuc2lvbiBjdWUgIiwgKmN1ZURhdGEpOworICAgICAgICAgICAgICAg ICAgICAgICAgSU5GT19MT0coTE9HSURFTlRJRklFUiwgImZvdW5kIGFuIGV4dGVuc2lvbiBjdWUg IiwgKmN1ZURhdGEpOwogICAgICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgICAgIGJvb2wg Y3VycmVudEN1ZUlzRXh0ZW5kZWQgPSAoYXJyaXZpbmdDdWVzLnNpemUoKSAhPSBub25FeHRlbnNp b25DdWVzLnNpemUoKSk7CkBAIC0zNzMsMTMgKzM3MywxMyBAQCB2b2lkIEluYmFuZFRleHRUcmFj a1ByaXZhdGVBVkY6OnByb2Nlc3NBdHRyaWJ1dGVkU3RyaW5ncyhDRkFycmF5UmVmIGF0dHJpYnV0 ZWRTdAogICAgICAgICAgICAgICAgICAgICBjdWVEYXRhLT5zZXRFbmRUaW1lKG1fY3VycmVudEN1 ZUVuZFRpbWUpOwogICAgICAgICAgICAgICAgICAgICBjdWVEYXRhLT5zZXRTdGF0dXMoR2VuZXJp Y0N1ZURhdGE6OkNvbXBsZXRlKTsKIAotICAgICAgICAgICAgICAgICAgICBERUJVR19MT0coTE9H SURFTlRJRklFUiwgInVwZGF0aW5nIGN1ZSAiLCAqY3VlRGF0YSk7CisgICAgICAgICAgICAgICAg ICAgIElORk9fTE9HKExPR0lERU5USUZJRVIsICJ1cGRhdGluZyBjdWUgIiwgKmN1ZURhdGEpOwog CiAgICAgICAgICAgICAgICAgICAgIGNsaWVudCgpLT51cGRhdGVHZW5lcmljQ3VlKCpjdWVEYXRh KTsKICAgICAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgICAgICAvLyBXZSBo YXZlIHRvIGFzc3VtZSB0aGF0IHRoZSBpbXBsaWNpdCBkdXJhdGlvbiBpcyBpbnZhbGlkIGZvciBj dWVzIGRlbGl2ZXJlZCBkdXJpbmcgYSBzZWVrIGJlY2F1c2UgdGhlIEFWRiBkZWNvZGUgcGlwZWxp bmUgbWF5IG5vdAogICAgICAgICAgICAgICAgICAgICAvLyBzZWUgZXZlcnkgY3VlLCBzbyBETyBO T1QgdXBkYXRlIGN1ZSBkdXJhdGlvbiB3aGlsZSBzZWVraW5nLgotICAgICAgICAgICAgICAgICAg ICBERUJVR19MT0coTE9HSURFTlRJRklFUiwgImlnbm9yaW5nIGN1ZSBkZWxpdmVyZWQgZHVyaW5n IHNlZWsgIiwgKmN1ZURhdGEpOworICAgICAgICAgICAgICAgICAgICBJTkZPX0xPRyhMT0dJREVO VElGSUVSLCAiaWdub3JpbmcgY3VlIGRlbGl2ZXJlZCBkdXJpbmcgc2VlayAiLCAqY3VlRGF0YSk7 CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UKQEAgLTM5 NSw3ICszOTUsNyBAQCB2b2lkIEluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnByb2Nlc3NBdHRy aWJ1dGVkU3RyaW5ncyhDRkFycmF5UmVmIGF0dHJpYnV0ZWRTdAogCiAgICAgZm9yIChhdXRvJiBj dWVEYXRhIDogYXJyaXZpbmdDdWVzKSB7CiAgICAgICAgIG1fY3Vlcy5hcHBlbmQoY3VlRGF0YS5w dHIoKSk7Ci0gICAgICAgIERFQlVHX0xPRyhMT0dJREVOVElGSUVSLCAiYWRkaW5nIGN1ZSAiLCBj dWVEYXRhLmdldCgpKTsKKyAgICAgICAgSU5GT19MT0coTE9HSURFTlRJRklFUiwgImFkZGluZyBj dWUgIiwgY3VlRGF0YS5nZXQoKSk7CiAgICAgICAgIGNsaWVudCgpLT5hZGRHZW5lcmljQ3VlKGN1 ZURhdGEpOwogICAgIH0KIApAQCAtNDI2LDcgKzQyNiw3IEBAIHZvaWQgSW5iYW5kVGV4dFRyYWNr UHJpdmF0ZUFWRjo6cmVtb3ZlQ29tcGxldGVkQ3VlcygpCiAgICAgICAgICAgICBpZiAoY3VlLT5z dGF0dXMoKSAhPSBHZW5lcmljQ3VlRGF0YTo6Q29tcGxldGUpCiAgICAgICAgICAgICAgICAgY29u dGludWU7CiAKLSAgICAgICAgICAgIERFQlVHX0xPRyhMT0dJREVOVElGSUVSLCAicmVtb3Zpbmcg Y3VlICIsICpjdWUpOworICAgICAgICAgICAgSU5GT19MT0coTE9HSURFTlRJRklFUiwgInJlbW92 aW5nIGN1ZSAiLCAqY3VlKTsKIAogICAgICAgICAgICAgbV9jdWVzLnJlbW92ZShjdXJyZW50Q3Vl KTsKICAgICAgICAgfQpAQCAtNTAxLDcgKzUwMSw3IEBAIHZvaWQgSW5iYW5kVGV4dFRyYWNrUHJp dmF0ZUFWRjo6cHJvY2Vzc05hdGl2ZVNhbXBsZXMoQ0ZBcnJheVJlZiBuYXRpdmVTYW1wbGVzLCBj CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogCi0gICAgICAgIERFQlVHX0xPRyhM T0dJREVOVElGSUVSLCAiY2h1bmsgIHR5cGUgPSAnIiwgdHlwZS50b1N0cmluZygpLCAiJywgc2l6 ZSA9ICIsIChzaXplX3QpYm94TGVuZ3RoKTsKKyAgICAgICAgSU5GT19MT0coTE9HSURFTlRJRklF UiwgImNodW5rICB0eXBlID0gJyIsIHR5cGUudG9TdHJpbmcoKSwgIicsIHNpemUgPSAiLCAoc2l6 ZV90KWJveExlbmd0aCk7CiAKICAgICAgICAgZG8gewogICAgICAgICAgICAgaWYgKG1faGF2ZVJl cG9ydGVkVlRUSGVhZGVyIHx8ICFmb3JtYXREZXNjcmlwdGlvbikKQEAgLTUyOSw3ICs1MjksNyBA QCB2b2lkIEluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnByb2Nlc3NOYXRpdmVTYW1wbGVzKENG QXJyYXlSZWYgbmF0aXZlU2FtcGxlcywgYwogICAgICAgICAgICAgaGVhZGVyLmFwcGVuZChyZWlu dGVycHJldF9jYXN0PGNvbnN0IHVuc2lnbmVkIGNoYXIqPihDRkRhdGFHZXRCeXRlUHRyKHdlYnZ0 dEhlYWRlckRhdGEpKSwgbGVuZ3RoKTsKICAgICAgICAgICAgIGhlYWRlci5hcHBlbmQoIlxuXG4i KTsKIAotICAgICAgICAgICAgREVCVUdfTE9HKExPR0lERU5USUZJRVIsICJWVFQgaGVhZGVyICIs ICZoZWFkZXIpOworICAgICAgICAgICAgSU5GT19MT0coTE9HSURFTlRJRklFUiwgIlZUVCBoZWFk ZXIgIiwgJmhlYWRlcik7CiAgICAgICAgICAgICBjbGllbnQoKS0+cGFyc2VXZWJWVFRGaWxlSGVh ZGVyKGhlYWRlci50b1N0cmluZygpKTsKICAgICAgICAgICAgIG1faGF2ZVJlcG9ydGVkVlRUSGVh ZGVyID0gdHJ1ZTsKICAgICAgICAgfSB3aGlsZSAoMCk7CkBAIC01MzcsNyArNTM3LDcgQEAgdm9p ZCBJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpwcm9jZXNzTmF0aXZlU2FtcGxlcyhDRkFycmF5 UmVmIG5hdGl2ZVNhbXBsZXMsIGMKICAgICAgICAgaWYgKHR5cGUgPT0gSVNPV2ViVlRUQ3VlOjpi b3hUeXBlTmFtZSgpKSB7CiAgICAgICAgICAgICBJU09XZWJWVFRDdWUgY3VlRGF0YSA9IElTT1dl YlZUVEN1ZShwcmVzZW50YXRpb25UaW1lLCBkdXJhdGlvbik7CiAgICAgICAgICAgICBjdWVEYXRh LnJlYWQodmlldyk7Ci0gICAgICAgICAgICBERUJVR19MT0coTE9HSURFTlRJRklFUiwgIlZUVCBj dWUgZGF0YSAiLCBjdWVEYXRhKTsKKyAgICAgICAgICAgIElORk9fTE9HKExPR0lERU5USUZJRVIs ICJWVFQgY3VlIGRhdGEgIiwgY3VlRGF0YSk7CiAgICAgICAgICAgICBjbGllbnQoKS0+cGFyc2VX ZWJWVFRDdWVEYXRhKGN1ZURhdGEpOwogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJp dmF0ZUFWRm91bmRhdGlvbk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1t CmluZGV4IDNkZjYxNmM4NmQyZmM2MzU3MDQzMGQ1MTQ4NGRjYjU1ZjQxZjQ5YTcuLjAxM2RhZjE5 ZWU3YTZmMjI0YWU5MDBkZmI1NjljZTFjNjBjYjExNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0 ZUFWRm91bmRhdGlvbk9iakMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5t bQpAQCAtMTY3NSw3ICsxNjc1LDcgQEAgUmV0YWluUHRyPENHSW1hZ2VSZWY+IE1lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmNyZWF0ZUltYWdlRm9yVGltZUluUmUKICAgICBSZXRh aW5QdHI8Q0dJbWFnZVJlZj4gaW1hZ2UgPSBhZG9wdENGKENHSW1hZ2VDcmVhdGVDb3B5V2l0aENv bG9yU3BhY2UocmF3SW1hZ2UuZ2V0KCksIHNSR0JDb2xvclNwYWNlUmVmKCkpKTsKIAogI2lmICFS RUxFQVNFX0xPR19ESVNBQkxFRAotICAgIERFQlVHX0xPRyhMT0dJREVOVElGSUVSLCAiY3JlYXRp bmcgaW1hZ2UgdG9vayAiLCAoTW9ub3RvbmljVGltZTo6bm93KCkgLSBzdGFydCkuc2Vjb25kcygp KTsKKyAgICBJTkZPX0xPRyhMT0dJREVOVElGSUVSLCAiY3JlYXRpbmcgaW1hZ2UgdG9vayAiLCAo TW9ub3RvbmljVGltZTo6bm93KCkgLSBzdGFydCkuc2Vjb25kcygpKTsKICNlbmRpZgogCiAgICAg cmV0dXJuIGltYWdlOwpAQCAtMjM1Nyw3ICsyMzU3LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZh dGVBVkZvdW5kYXRpb25PYmpDOjp1cGRhdGVMYXN0SW1hZ2UoVXBkYXRlVHlwZSB0eXBlKQogICAg IG1fbGFzdEltYWdlID0gbV9waXhlbEJ1ZmZlckNvbmZvcm1lci0+Y3JlYXRlSW1hZ2VGcm9tUGl4 ZWxCdWZmZXIobV9sYXN0UGl4ZWxCdWZmZXIuZ2V0KCkpOwogCiAjaWYgIVJFTEVBU0VfTE9HX0RJ U0FCTEVECi0gICAgREVCVUdfTE9HKExPR0lERU5USUZJRVIsICJjcmVhdGluZyBidWZmZXIgdG9v ayAiLCAoTW9ub3RvbmljVGltZTo6bm93KCkgLSBzdGFydCkuc2Vjb25kcygpKTsKKyAgICBJTkZP X0xPRyhMT0dJREVOVElGSUVSLCAiY3JlYXRpbmcgYnVmZmVyIHRvb2sgIiwgKE1vbm90b25pY1Rp bWU6Om5vdygpIC0gc3RhcnQpLnNlY29uZHMoKSk7CiAjZW5kaWYKICNlbmRpZiAvLyBIQVZFKENP UkVfVklERU8pCiB9CkBAIC0zMTU0LDcgKzMxNTQsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZUFWRm91bmRhdGlvbk9iakM6Om1ldGFkYXRhRGlkQXJyaXZlKGNvbnN0IFJldGFpblB0cjxOU0Fy cgogewogICAgIG1fY3VycmVudE1ldGFEYXRhID0gbWV0YWRhdGEgJiYgIVttZXRhZGF0YSBpc0tp bmRPZkNsYXNzOltOU051bGwgY2xhc3NdXSA/IG1ldGFkYXRhIDogbmlsOwogCi0gICAgREVCVUdf TE9HKExPR0lERU5USUZJRVIsICJhZGRpbmcgIiwgbV9jdXJyZW50TWV0YURhdGEgPyBbbV9jdXJy ZW50TWV0YURhdGEuZ2V0KCkgY291bnRdIDogMCwgIiBhdCB0aW1lICIsIG1lZGlhVGltZSk7Cisg ICAgSU5GT19MT0coTE9HSURFTlRJRklFUiwgImFkZGluZyAiLCBtX2N1cnJlbnRNZXRhRGF0YSA/ IFttX2N1cnJlbnRNZXRhRGF0YS5nZXQoKSBjb3VudF0gOiAwLCAiIGF0IHRpbWUgIiwgbWVkaWFU aW1lKTsKIAogI2lmIEVOQUJMRShEQVRBQ1VFX1ZBTFVFKQogICAgIGlmIChzZWVraW5nKCkpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24v b2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMubW0gYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZh dGVNZWRpYVNvdXJjZUFWRk9iakMubW0KaW5kZXggYjY3MDkwZjk5NThmYTcxNGY3ZmFjMDk0MDk1 MTQ4YWUxMmQ2N2QzMy4uZDgzMWIwNWQxODBlYmI3ODgwMWQ2ZWM2Y2YxMjdhNjNhODI1NWQ0ZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9u L29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVy UHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5tbQpAQCAtNDA2LDcgKzQwNiw3IEBAIE1lZGlhVGlt ZSBNZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakM6OmluaXRpYWxUaW1lKCkgY29u c3QKIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakM6OnNlZWtXaXRo VG9sZXJhbmNlKGNvbnN0IE1lZGlhVGltZSYgdGltZSwgY29uc3QgTWVkaWFUaW1lJiBuZWdhdGl2 ZVRocmVzaG9sZCwgY29uc3QgTWVkaWFUaW1lJiBwb3NpdGl2ZVRocmVzaG9sZCkKIHsKLSAgICBE RUJVR19MT0coTE9HSURFTlRJRklFUiwgInRpbWUgPSAiLCB0aW1lLCAiLCBuZWdhdGl2ZVRocmVz aG9sZCA9ICIsIG5lZ2F0aXZlVGhyZXNob2xkLCAiLCBwb3NpdGl2ZVRocmVzaG9sZCA9ICIsIHBv c2l0aXZlVGhyZXNob2xkKTsKKyAgICBJTkZPX0xPRyhMT0dJREVOVElGSUVSLCAidGltZSA9ICIs IHRpbWUsICIsIG5lZ2F0aXZlVGhyZXNob2xkID0gIiwgbmVnYXRpdmVUaHJlc2hvbGQsICIsIHBv c2l0aXZlVGhyZXNob2xkID0gIiwgcG9zaXRpdmVUaHJlc2hvbGQpOwogCiAgICAgbV9zZWVraW5n ID0gdHJ1ZTsKICAgICBhdXRvIHdlYWtUaGlzID0gY3JlYXRlV2Vha1B0cigpOwpAQCAtNDM3LDcg KzQzNyw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpzZWVr SW50ZXJuYWwoKQogICAgICAgICBtX2xhc3RTZWVrVGltZSA9IE1lZGlhVGltZTo6Y3JlYXRlV2l0 aERvdWJsZShtX2xhc3RTZWVrVGltZS50b0RvdWJsZSgpLCBNZWRpYVRpbWU6OkRlZmF1bHRUaW1l U2NhbGUpOwogCiAgICAgTWVkaWFUaW1lIHN5bmNocm9uaXplclRpbWUgPSBQQUw6OnRvTWVkaWFU aW1lKENNVGltZWJhc2VHZXRUaW1lKFttX3N5bmNocm9uaXplciB0aW1lYmFzZV0pKTsKLSAgICBE RUJVR19MT0coTE9HSURFTlRJRklFUiwgInNlZWtUaW1lID0gIiwgbV9sYXN0U2Vla1RpbWUsICIs IHN5bmNocm9uaXplclRpbWUgPSAiLCBzeW5jaHJvbml6ZXJUaW1lKTsKKyAgICBJTkZPX0xPRyhM T0dJREVOVElGSUVSLCAic2Vla1RpbWUgPSAiLCBtX2xhc3RTZWVrVGltZSwgIiwgc3luY2hyb25p emVyVGltZSA9ICIsIHN5bmNocm9uaXplclRpbWUpOwogCiAgICAgYm9vbCBkb2VzTm90UmVxdWly ZVNlZWsgPSBzeW5jaHJvbml6ZXJUaW1lID09IG1fbGFzdFNlZWtUaW1lOwogCkBAIC0xMTYzLDcg KzExNjMsNyBAQCBib29sIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQzo6aXND dXJyZW50UGxheWJhY2tUYXJnZXRXaXJlbGVzcygpIGNvbgogICAgICAgICByZXR1cm4gZmFsc2U7 CiAKICAgICBhdXRvIGhhc1RhcmdldCA9IG1fc2hvdWxkUGxheVRvVGFyZ2V0ICYmIG1fcGxheWJh Y2tUYXJnZXQtPmhhc0FjdGl2ZVJvdXRlKCk7Ci0gICAgREVCVUdfTE9HKExPR0lERU5USUZJRVIs IGhhc1RhcmdldCk7CisgICAgSU5GT19MT0coTE9HSURFTlRJRklFUiwgaGFzVGFyZ2V0KTsKICAg ICByZXR1cm4gaGFzVGFyZ2V0OwogfQogI2VuZGlmCg==