194987 2019-02-23 21:36:36 -0800 [ContentChangeObserver] Move observing logic from DOMTimer to ContentChangeObserver 2019-02-26 15:52:47 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue simon.fraser thorton tsavell webkit-bug-importer zalan oldest_to_newest 1509444 0 zalan 2019-02-23 21:36:36 -0800 That's where the logic belongs. 1509445 1 webkit-bug-importer 2019-02-23 21:37:05 -0800 <rdar://problem/48342910> 1509446 2 362852 zalan 2019-02-23 21:41:05 -0800 Created attachment 362852 Patch 1509777 3 362926 zalan 2019-02-25 14:01:56 -0800 Created attachment 362926 Patch 1509778 4 362927 zalan 2019-02-25 14:15:40 -0800 Created attachment 362927 Patch 1509797 5 362931 zalan 2019-02-25 15:06:33 -0800 Created attachment 362931 Patch 1509798 6 zalan 2019-02-25 15:11:25 -0800 Committed r242058: <https://trac.webkit.org/changeset/242058> 1510235 7 tsavell 2019-02-26 15:48:13 -0800 Looks like the changes in https://trac.webkit.org/changeset/242058/webkit caused fast/dom/Window/timer-null-script-execution-context.html to crash constantly on iOS. History: fast/dom/Window/timer-null-script-execution-context.html reproduced with command: run-webkit-tests fast/dom/Window/timer-null-script-execution-context.html --ios-simulator test crashes on r242058 but not on r242057. The test is crashing with no crash log available. 1510237 8 zalan 2019-02-26 15:52:47 -0800 (In reply to Truitt Savell from comment #7) > Looks like the changes in https://trac.webkit.org/changeset/242058/webkit > > caused fast/dom/Window/timer-null-script-execution-context.html to crash > constantly on iOS. > > History: > fast/dom/Window/timer-null-script-execution-context.html > > reproduced with command: > run-webkit-tests fast/dom/Window/timer-null-script-execution-context.html > --ios-simulator > > test crashes on r242058 but not on r242057. > > The test is crashing with no crash log available. Thanks. Looking into it. 362852 2019-02-23 21:41:05 -0800 2019-02-25 14:01:55 -0800 Patch Patch.txt text/plain 14222 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkOGM5OWEwZjI2Yy4uN2VhNGVjMzg3ZTQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMCBAQAorMjAxOS0wMi0yMyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFtDb250ZW50Q2hhbmdlT2JzZXJ2ZXJdIE1vdmUgb2JzZXJ2aW5nIGxvZ2ljIGZy b20gRE9NVGltZXIgdG8gQ29udGVudENoYW5nZU9ic2VydmVyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTQ5ODcKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzQ4MzQyOTEwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIENvbnRlbnQgb2J2c2VydmF0aW9uIGxvZ2ljIHNob3VsZCBhbGwgbW92ZSB0byB0aGUg Q29udGVudENoYW5nZU9ic2VydmVyIGNsYXNzLiAKKworICAgICAgICAqIHBhZ2UvRE9NVGltZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RE9NVGltZXI6Omluc3RhbGwpOgorICAgICAgICAoV2Vi Q29yZTo6RE9NVGltZXI6OmZpcmVkKToKKyAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UGFnZTo6UGFnZSk6CisgICAgICAgICogcGFnZS9QYWdlLmg6CisgICAgICAg IChXZWJDb3JlOjpQYWdlOjpjb250ZW50Q2hhbmdlT2JzZXJ2ZXIpOgorICAgICAgICAqIHBhZ2Uv aW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5oOgorICAgICAgICAqIHBhZ2UvaW9zL0NvbnRlbnRD aGFuZ2VPYnNlcnZlci5tbToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZl cjo6Q29udGVudENoYW5nZU9ic2VydmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFu Z2VPYnNlcnZlcjo6cmVnaXN0ZXJET01UaW1lckZvckNvbnRlbnRPYnNlcnZhdGlvbklmTmVlZGVk KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RhcnRPYnNlcnZp bmdET01UaW1lcik6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnN0 b3BPYnNlcnZpbmdET01UaW1lcik6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2Jz ZXJ2ZXI6OmNvbnRhaW5zT2JzZXJ2ZWRET01UaW1lcik6CisgICAgICAgIChXZWJDb3JlOjpDb250 ZW50Q2hhbmdlT2JzZXJ2ZXI6OmFkZE9ic2VydmVkRE9NVGltZXIpOgorICAgICAgICAoV2ViQ29y ZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjpyZW1vdmVPYnNlcnZlZERPTVRpbWVyKToKKwogMjAx OS0wMi0yMyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIEludHJv ZHVjZSBDb250ZW50Q2hhbmdlT2JzZXJ2ZXIgY2xhc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRE9NVGltZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9ET01UaW1lci5jcHAK aW5kZXggMzQ0Mzc5YTE5YTEuLjNmMWNmMGFlMWMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0RPTVRpbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVRpbWVyLmNw cApAQCAtNDIsMTAgKzQyLDcgQEAKICNpbmNsdWRlIDx3dGYvU3RkTGliRXh0cmFzLmg+CiAKICNp ZiBQTEFURk9STShJT1NfRkFNSUxZKQotI2luY2x1ZGUgIkNocm9tZS5oIgotI2luY2x1ZGUgIkNo cm9tZUNsaWVudC5oIgogI2luY2x1ZGUgIkNvbnRlbnRDaGFuZ2VPYnNlcnZlci5oIgotI2luY2x1 ZGUgIkZyYW1lLmgiCiAjZW5kaWYKIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtMjI2LDIzICsy MjMsOCBAQCBpbnQgRE9NVGltZXI6Omluc3RhbGwoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29u dGV4dCwgc3RkOjp1bmlxdWVfcHRyPFNjaGVkdWxlZAogICAgICAgICBuZXN0ZWRUaW1lcnMtPmFk ZCh0aW1lci0+bV90aW1lb3V0SWQsICp0aW1lcik7CiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZ KQotICAgIGF1dG8gc3RhcnRPYnNlcnZpbmdUaGlzVGltZXJJZk5lZWRlZCA9IFsmXSB7Ci0gICAg ICAgIGlmICghaXM8RG9jdW1lbnQ+KGNvbnRleHQpKQotICAgICAgICAgICAgcmV0dXJuOwotICAg ICAgICBpZiAoY29udGV4dC5hY3RpdmVET01PYmplY3RzQXJlU3VzcGVuZGVkKCkpCi0gICAgICAg ICAgICByZXR1cm47Ci0gICAgICAgIGlmICh0aW1lb3V0ID4gMjUwX21zIHx8ICFzaW5nbGVTaG90 KQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBhdXRvJiBjb250ZW50Q2hhbmdlT2JzZXJ2 ZXIgPSBkb3duY2FzdDxEb2N1bWVudD4oY29udGV4dCkucGFnZSgpLT5jb250ZW50Q2hhbmdlT2Jz ZXJ2ZXIoKTsKLSAgICAgICAgaWYgKCFjb250ZW50Q2hhbmdlT2JzZXJ2ZXIuaXNPYnNlcnZpbmdE T01UaW1lclNjaGVkdWxpbmcoKSkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBjb250 ZW50Q2hhbmdlT2JzZXJ2ZXIuc2V0T2JzZXJ2ZWRDb250ZW50Q2hhbmdlKFdLQ29udGVudEluZGV0 ZXJtaW5hdGVDaGFuZ2UpOwotICAgICAgICBjb250ZW50Q2hhbmdlT2JzZXJ2ZXIuYWRkT2JzZXJ2 ZWRET01UaW1lcigqdGltZXIpOwotICAgICAgICBMT0dfV0lUSF9TVFJFQU0oQ29udGVudE9ic2Vy dmF0aW9uLCBzdHJlYW0gPDwgIkRPTVRpbWVyOjppbnN0YWxsOiByZWdpc3RlZCB0aGlzIHRpbWVy OiAoIiA8PCB0aW1lciA8PCAiKSBhbmQgb2JzZXJ2ZSB3aGVuIGl0IGZpcmVzLiIpOwotICAgIH07 Ci0gICAgCi0gICAgc3RhcnRPYnNlcnZpbmdUaGlzVGltZXJJZk5lZWRlZCgpOworICAgIGlmIChp czxEb2N1bWVudD4oY29udGV4dCkpCisgICAgICAgIGRvd25jYXN0PERvY3VtZW50Pihjb250ZXh0 KS5wYWdlKCktPmNvbnRlbnRDaGFuZ2VPYnNlcnZlcigpLnJlZ2lzdGVyRE9NVGltZXJGb3JDb250 ZW50T2JzZXJ2YXRpb25JZk5lZWRlZCgqdGltZXIsIHRpbWVvdXQsIHNpbmdsZVNob3QpOwogI2Vu ZGlmCiAgICAgcmV0dXJuIHRpbWVyLT5tX3RpbWVvdXRJZDsKIH0KQEAgLTM0OCw1NCArMzMwLDIy IEBAIHZvaWQgRE9NVGltZXI6OmZpcmVkKCkKIAogICAgIGNvbnRleHQucmVtb3ZlVGltZW91dCht X3RpbWVvdXRJZCk7CiAKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotICAgIGF1dG8gaXNPYnNl cnZpbmdMYXN0VGltZXIgPSBmYWxzZTsKLSAgICBhdXRvIHNob3VsZEJlZ2luT2JzZXJ2aW5nQ2hh bmdlcyA9IGZhbHNlOwotICAgIFBhZ2UqIHBhZ2UgPSBudWxscHRyOwotICAgIGlmIChpczxEb2N1 bWVudD4oY29udGV4dCkgJiYgZG93bmNhc3Q8RG9jdW1lbnQ+KGNvbnRleHQpLnBhZ2UoKSkgewot ICAgICAgICBwYWdlID0gZG93bmNhc3Q8RG9jdW1lbnQ+KGNvbnRleHQpLnBhZ2UoKTsKLSAgICAg ICAgYXV0byYgY29udGVudENoYW5nZU9ic2VydmVyID0gcGFnZS0+Y29udGVudENoYW5nZU9ic2Vy dmVyKCk7Ci0gICAgICAgIGlzT2JzZXJ2aW5nTGFzdFRpbWVyID0gY29udGVudENoYW5nZU9ic2Vy dmVyLmNvdW50T2ZPYnNlcnZlZERPTVRpbWVycygpID09IDE7Ci0gICAgICAgIHNob3VsZEJlZ2lu T2JzZXJ2aW5nQ2hhbmdlcyA9IGNvbnRlbnRDaGFuZ2VPYnNlcnZlci5jb250YWluc09ic2VydmVk RE9NVGltZXIoKnRoaXMpOwotICAgIH0KLQotICAgIGlmIChzaG91bGRCZWdpbk9ic2VydmluZ0No YW5nZXMpIHsKLSAgICAgICAgQVNTRVJUKHBhZ2UpOwotICAgICAgICBMT0dfV0lUSF9TVFJFQU0o Q29udGVudE9ic2VydmF0aW9uLCBzdHJlYW0gPDwgIkRPTVRpbWVyOjpmaXJlZDogc3RhcnQgb2Jz ZXJ2aW5nICgiIDw8IHRoaXMgPDwgIikgdGltZXIgY2FsbGJhY2suIik7Ci0gICAgICAgIGF1dG8m IGNvbnRlbnRDaGFuZ2VPYnNlcnZlciA9IHBhZ2UtPmNvbnRlbnRDaGFuZ2VPYnNlcnZlcigpOwot ICAgICAgICBjb250ZW50Q2hhbmdlT2JzZXJ2ZXIuc3RhcnRPYnNlcnZpbmdDb250ZW50Q2hhbmdl cygpOwotICAgICAgICBjb250ZW50Q2hhbmdlT2JzZXJ2ZXIuc3RhcnRPYnNlcnZpbmdTdHlsZVJl Y2FsY1NjaGVkdWxpbmcoKTsKLSAgICAgICAgY29udGVudENoYW5nZU9ic2VydmVyLnJlbW92ZU9i c2VydmVkRE9NVGltZXIoKnRoaXMpOwotICAgIH0KLSNlbmRpZgotCiAgICAgLy8gS2VlcCB0cmFj ayBuZXN0ZWQgdGltZXIgaW5zdGFsbHMuCiAgICAgTmVzdGVkVGltZXJzTWFwKiBuZXN0ZWRUaW1l cnMgPSBOZXN0ZWRUaW1lcnNNYXA6Omluc3RhbmNlRm9yQ29udGV4dChjb250ZXh0KTsKICAgICBp ZiAobmVzdGVkVGltZXJzKQogICAgICAgICBuZXN0ZWRUaW1lcnMtPnN0YXJ0VHJhY2tpbmcoKTsK IAorI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisgICAgUGFnZSogcGFnZSA9IGlzPERvY3VtZW50 Pihjb250ZXh0KSA/IGRvd25jYXN0PERvY3VtZW50Pihjb250ZXh0KS5wYWdlKCkgOiBudWxscHRy OyAKKyAgICBpZiAocGFnZSkKKyAgICAgICAgcGFnZS0+Y29udGVudENoYW5nZU9ic2VydmVyKCku c3RhcnRPYnNlcnZpbmdET01UaW1lcigqdGhpcyk7CisjZW5kaWYKKwogICAgIG1fYWN0aW9uLT5l eGVjdXRlKGNvbnRleHQpOwogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICBpZiAoc2hv dWxkQmVnaW5PYnNlcnZpbmdDaGFuZ2VzKSB7Ci0gICAgICAgIEFTU0VSVChwYWdlKTsKLSAgICAg ICAgTE9HX1dJVEhfU1RSRUFNKENvbnRlbnRPYnNlcnZhdGlvbiwgc3RyZWFtIDw8ICJET01UaW1l cjo6ZmlyZWQ6IHN0b3Agb2JzZXJ2aW5nICgiIDw8IHRoaXMgPDwgIikgdGltZXIgY2FsbGJhY2su Iik7Ci0gICAgICAgIGF1dG8mIGNvbnRlbnRDaGFuZ2VPYnNlcnZlciA9IHBhZ2UtPmNvbnRlbnRD aGFuZ2VPYnNlcnZlcigpOwotICAgICAgICBjb250ZW50Q2hhbmdlT2JzZXJ2ZXIuc3RvcE9ic2Vy dmluZ1N0eWxlUmVjYWxjU2NoZWR1bGluZygpOwotICAgICAgICBjb250ZW50Q2hhbmdlT2JzZXJ2 ZXIuc3RvcE9ic2VydmluZ0NvbnRlbnRDaGFuZ2VzKCk7Ci0KLSAgICAgICAgYXV0byBvYnNlcnZl ZENvbnRlbnRDaGFuZ2UgPSBjb250ZW50Q2hhbmdlT2JzZXJ2ZXIub2JzZXJ2ZWRDb250ZW50Q2hh bmdlKCk7Ci0gICAgICAgIC8vIENoZWNrIGlmIHRoZSB0aW1lciBjYWxsYmFjayB0cmlnZ2VyZWQg ZWl0aGVyIGEgc3luYyBvciBhc3luYyBzdHlsZSB1cGRhdGUuCi0gICAgICAgIGF1dG8gaW5EZXRl cm1pbmVkU3RhdGUgPSBvYnNlcnZlZENvbnRlbnRDaGFuZ2UgPT0gV0tDb250ZW50VmlzaWJpbGl0 eUNoYW5nZSB8fCAoaXNPYnNlcnZpbmdMYXN0VGltZXIgJiYgb2JzZXJ2ZWRDb250ZW50Q2hhbmdl ID09IFdLQ29udGVudE5vQ2hhbmdlKTsgIAotICAgICAgICBpZiAoaW5EZXRlcm1pbmVkU3RhdGUp IHsKLSAgICAgICAgICAgIExPRyhDb250ZW50T2JzZXJ2YXRpb24sICJET01UaW1lcjo6ZmlyZWQ6 IGluIGRldGVybWluZWQgc3RhdGUuIik7Ci0gICAgICAgICAgICBwYWdlLT5jaHJvbWUoKS5jbGll bnQoKS5vYnNlcnZlZENvbnRlbnRDaGFuZ2UoKmRvd25jYXN0PERvY3VtZW50Pihjb250ZXh0KS5m cmFtZSgpKTsKLSAgICAgICAgfSBlbHNlIGlmIChvYnNlcnZlZENvbnRlbnRDaGFuZ2UgPT0gV0tD b250ZW50SW5kZXRlcm1pbmF0ZUNoYW5nZSkgewotICAgICAgICAgICAgLy8gQW4gYXN5bmMgc3R5 bGUgcmVjYWxjIGhhcyBiZWVuIHNjaGVkdWxlZC4gTGV0J3Mgb2JzZXJ2ZSBpdC4KLSAgICAgICAg ICAgIExPRyhDb250ZW50T2JzZXJ2YXRpb24sICJET01UaW1lcjo6ZmlyZWQ6IHdhaXQgdW50aWwg bmV4dCBzdHlsZSByZWNhbGMgZmlyZXMuIik7Ci0gICAgICAgICAgICBjb250ZW50Q2hhbmdlT2Jz ZXJ2ZXIuc2V0U2hvdWxkT2JzZXJ2ZU5leHRTdHlsZVJlY2FsYyh0cnVlKTsKLSAgICAgICAgfQot ICAgIH0KKyAgICBpZiAocGFnZSkKKyAgICAgICAgcGFnZS0+Y29udGVudENoYW5nZU9ic2VydmVy KCkuc3RvcE9ic2VydmluZ0RPTVRpbWVyKCp0aGlzKTsKICNlbmRpZgogCiAgICAgSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uOjpkaWRGaXJlVGltZXIoY29va2llKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCmlu ZGV4IGIwMjY4OGE0YTg0Li4yNTU5YmExMjUzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9QYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCkBAIC0xNTAs NiArMTUwLDEwIEBACiAjaW5jbHVkZSAiU2VsZWN0aW9uUmVjdC5oIgogI2VuZGlmCiAKKyNpZiBQ TEFURk9STShJT1NfRkFNSUxZKQorI2luY2x1ZGUgIkNvbnRlbnRDaGFuZ2VPYnNlcnZlci5oIgor I2VuZGlmCisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogc3RhdGljIEhhc2hTZXQ8UGFnZSo+JiBh bGxQYWdlcygpCkBAIC0yMzIsNiArMjM2LDkgQEAgUGFnZTo6UGFnZShQYWdlQ29uZmlndXJhdGlv biYmIHBhZ2VDb25maWd1cmF0aW9uKQogICAgICwgbV9wZXJmb3JtYW5jZUxvZ2dpbmdDbGllbnQo V1RGTW92ZShwYWdlQ29uZmlndXJhdGlvbi5wZXJmb3JtYW5jZUxvZ2dpbmdDbGllbnQpKQogICAg ICwgbV93ZWJHTFN0YXRlVHJhY2tlcihXVEZNb3ZlKHBhZ2VDb25maWd1cmF0aW9uLndlYkdMU3Rh dGVUcmFja2VyKSkKICAgICAsIG1fbGliV2ViUlRDUHJvdmlkZXIoV1RGTW92ZShwYWdlQ29uZmln dXJhdGlvbi5saWJXZWJSVENQcm92aWRlcikpCisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKyAg ICAsIG1fY29udGVudENoYW5nZU9ic2VydmVyKHN0ZDo6bWFrZV91bmlxdWU8Q29udGVudENoYW5n ZU9ic2VydmVyPigqdGhpcykpCisjZW5kaWYKICAgICAsIG1fdmVydGljYWxTY3JvbGxFbGFzdGlj aXR5KFNjcm9sbEVsYXN0aWNpdHlBbGxvd2VkKQogICAgICwgbV9ob3Jpem9udGFsU2Nyb2xsRWxh c3RpY2l0eShTY3JvbGxFbGFzdGljaXR5QWxsb3dlZCkKICAgICAsIG1fZG9tVGltZXJBbGlnbm1l bnRJbnRlcnZhbChET01UaW1lcjo6ZGVmYXVsdEFsaWdubWVudEludGVydmFsKCkpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFn ZS5oCmluZGV4IDRiM2Q5Zjk2MWVmLi5mNDgzMGI2NjdiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGFnZS9QYWdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKQEAgLTY2 LDEwICs2Niw2IEBACiAjaW5jbHVkZSAiTWVkaWFQbGF5YmFja1RhcmdldENvbnRleHQuaCIKICNl bmRpZgogCi0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSNpbmNsdWRlICJDb250ZW50Q2hhbmdl T2JzZXJ2ZXIuaCIKLSNlbmRpZgotCiBuYW1lc3BhY2UgSlNDIHsKIGNsYXNzIERlYnVnZ2VyOwog fQpAQCAtODksNiArODUsOSBAQCBjbGFzcyBDYWNoZVN0b3JhZ2VQcm92aWRlcjsKIGNsYXNzIENo cm9tZTsKIGNsYXNzIENocm9tZUNsaWVudDsKIGNsYXNzIENvbG9yOworI2lmIFBMQVRGT1JNKElP U19GQU1JTFkpCitjbGFzcyBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI7CisjZW5kaWYKIGNsYXNzIENv bnRleHRNZW51Q2xpZW50OwogY2xhc3MgQ29udGV4dE1lbnVDb250cm9sbGVyOwogY2xhc3MgQ29v a2llSmFyOwpAQCAtMjU2LDcgKzI1NSw3IEBAIHB1YmxpYzoKICAgICBQb2ludGVyTG9ja0NvbnRy b2xsZXImIHBvaW50ZXJMb2NrQ29udHJvbGxlcigpIGNvbnN0IHsgcmV0dXJuICptX3BvaW50ZXJM b2NrQ29udHJvbGxlcjsgfQogI2VuZGlmCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICBD b250ZW50Q2hhbmdlT2JzZXJ2ZXImIGNvbnRlbnRDaGFuZ2VPYnNlcnZlcigpIHsgcmV0dXJuIG1f Y29udGVudENoYW5nZU9ic2VydmVyOyB9CisgICAgQ29udGVudENoYW5nZU9ic2VydmVyJiBjb250 ZW50Q2hhbmdlT2JzZXJ2ZXIoKSB7IHJldHVybiAqbV9jb250ZW50Q2hhbmdlT2JzZXJ2ZXI7IH0K ICNlbmRpZgogICAgIExpYldlYlJUQ1Byb3ZpZGVyJiBsaWJXZWJSVENQcm92aWRlcigpIHsgcmV0 dXJuIG1fbGliV2ViUlRDUHJvdmlkZXIuZ2V0KCk7IH0KICAgICBSVENDb250cm9sbGVyJiBydGND b250cm9sbGVyKCkgeyByZXR1cm4gbV9ydGNDb250cm9sbGVyOyB9CkBAIC04MTcsNyArODE2LDcg QEAgcHJpdmF0ZToKIAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgYm9vbCBtX2VuY2xv c2VkSW5TY3JvbGxhYmxlQW5jZXN0b3JWaWV3IHsgZmFsc2UgfTsKLSAgICBDb250ZW50Q2hhbmdl T2JzZXJ2ZXIgbV9jb250ZW50Q2hhbmdlT2JzZXJ2ZXI7CisgICAgc3RkOjp1bmlxdWVfcHRyPENv bnRlbnRDaGFuZ2VPYnNlcnZlcj4gbV9jb250ZW50Q2hhbmdlT2JzZXJ2ZXI7CiAjZW5kaWYKICAg ICAKICAgICBib29sIG1fdXNlU3lzdGVtQXBwZWFyYW5jZSB7IGZhbHNlIH07CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuaCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5oCmluZGV4IDExODllOTY4 OTJjLi5hNmNlNThhYWE4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29u dGVudENoYW5nZU9ic2VydmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVu dENoYW5nZU9ic2VydmVyLmgKQEAgLTMyLDEwICszMiwxNSBAQAogbmFtZXNwYWNlIFdlYkNvcmUg ewogCiBjbGFzcyBET01UaW1lcjsKK2NsYXNzIFBhZ2U7CiAKIGNsYXNzIENvbnRlbnRDaGFuZ2VP YnNlcnZlciB7CiBwdWJsaWM6Ci0gICAgQ29udGVudENoYW5nZU9ic2VydmVyKCkgPSBkZWZhdWx0 OworICAgIENvbnRlbnRDaGFuZ2VPYnNlcnZlcihQYWdlJik7CisKKyAgICB2b2lkIHJlZ2lzdGVy RE9NVGltZXJGb3JDb250ZW50T2JzZXJ2YXRpb25JZk5lZWRlZChjb25zdCBET01UaW1lciYsIFNl Y29uZHMgdGltZW91dCwgYm9vbCBzaW5nbGVTaG90KTsKKyAgICB2b2lkIHN0YXJ0T2JzZXJ2aW5n RE9NVGltZXIoY29uc3QgRE9NVGltZXImKTsKKyAgICB2b2lkIHN0b3BPYnNlcnZpbmdET01UaW1l cihjb25zdCBET01UaW1lciYpOwogCiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzdGFydE9ic2Vy dmluZ0NvbnRlbnRDaGFuZ2VzKCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzdG9wT2JzZXJ2 aW5nQ29udGVudENoYW5nZXMoKTsKQEAgLTQzLDEwICs0OCw3IEBAIHB1YmxpYzoKIAogICAgIFdF QkNPUkVfRVhQT1JUIHZvaWQgc3RhcnRPYnNlcnZpbmdET01UaW1lclNjaGVkdWxpbmcoKTsKICAg ICBXRUJDT1JFX0VYUE9SVCB2b2lkIHN0b3BPYnNlcnZpbmdET01UaW1lclNjaGVkdWxpbmcoKTsK LSAgICBib29sIGlzT2JzZXJ2aW5nRE9NVGltZXJTY2hlZHVsaW5nKCk7CiAKLSAgICBXRUJDT1JF X0VYUE9SVCB2b2lkIHN0YXJ0T2JzZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5nKCk7Ci0gICAg V0VCQ09SRV9FWFBPUlQgdm9pZCBzdG9wT2JzZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5nKCk7 CiAgICAgYm9vbCBpc09ic2VydmluZ1N0eWxlUmVjYWxjU2NoZWR1bGluZygpOwogCiAgICAgdm9p ZCBzZXRTaG91bGRPYnNlcnZlTmV4dFN0eWxlUmVjYWxjKGJvb2wpOwpAQCAtNTUsMTEgKzU3LDE5 IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldE9ic2VydmVkQ29udGVudENoYW5nZShXS0NvbnRlbnRD aGFuZ2UpOwogICAgIFdFQkNPUkVfRVhQT1JUIFdLQ29udGVudENoYW5nZSBvYnNlcnZlZENvbnRl bnRDaGFuZ2UoKTsKIAotICAgIHZvaWQgYWRkT2JzZXJ2ZWRET01UaW1lcihET01UaW1lciYpOwot ICAgIHZvaWQgcmVtb3ZlT2JzZXJ2ZWRET01UaW1lcihET01UaW1lciYpOwotICAgIGJvb2wgY29u dGFpbnNPYnNlcnZlZERPTVRpbWVyKERPTVRpbWVyJik7CisgICAgdm9pZCByZW1vdmVPYnNlcnZl ZERPTVRpbWVyKGNvbnN0IERPTVRpbWVyJik7CisgICAgYm9vbCBjb250YWluc09ic2VydmVkRE9N VGltZXIoY29uc3QgRE9NVGltZXImKTsKICAgICBXRUJDT1JFX0VYUE9SVCB1bnNpZ25lZCBjb3Vu dE9mT2JzZXJ2ZWRET01UaW1lcnMoKTsKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGNsZWFyT2Jz ZXJ2ZWRET01UaW1lcnMoKTsKKworcHJpdmF0ZToKKyAgICB2b2lkIGFkZE9ic2VydmVkRE9NVGlt ZXIoY29uc3QgRE9NVGltZXImKTsKKyAgICBib29sIGlzT2JzZXJ2aW5nRE9NVGltZXJTY2hlZHVs aW5nKCk7CisKKyAgICB2b2lkIHN0YXJ0T2JzZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5nKCk7 CisgICAgdm9pZCBzdG9wT2JzZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5nKCk7CisKKyAgICBQ YWdlJiBtX3BhZ2U7CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lv cy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIubW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250 ZW50Q2hhbmdlT2JzZXJ2ZXIubW0KaW5kZXggMDliYjM0Y2M3ZjcuLjA5ZDM2ZGEyZmUzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIubW0K KysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLm1tCkBA IC0yNiwxMSArMjYsNzIgQEAKICNpbXBvcnQgIkNvbnRlbnRDaGFuZ2VPYnNlcnZlci5oIgogCiAj aWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKyNpbXBvcnQgIkNocm9tZS5oIgorI2ltcG9ydCAiQ2hy b21lQ2xpZW50LmgiCiAjaW1wb3J0ICJET01UaW1lci5oIgorI2ltcG9ydCAiTG9nZ2luZy5oIgor I2ltcG9ydCAiUGFnZS5oIgogI2ltcG9ydCAiV0tDb250ZW50T2JzZXJ2YXRpb25JbnRlcm5hbC5o IgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK0NvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6Q29udGVu dENoYW5nZU9ic2VydmVyKFBhZ2UmIHBhZ2UpCisgICAgOiBtX3BhZ2UocGFnZSkKK3sKK30KKwor dm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnJlZ2lzdGVyRE9NVGltZXJGb3JDb250ZW50T2Jz ZXJ2YXRpb25JZk5lZWRlZChjb25zdCBET01UaW1lciYgdGltZXIsIFNlY29uZHMgdGltZW91dCwg Ym9vbCBzaW5nbGVTaG90KQoreworICAgIGlmICghbV9wYWdlLm1haW5GcmFtZSgpLmRvY3VtZW50 KCkpCisgICAgICAgIHJldHVybjsKKyAgICBpZiAobV9wYWdlLm1haW5GcmFtZSgpLmRvY3VtZW50 KCktPmFjdGl2ZURPTU9iamVjdHNBcmVTdXNwZW5kZWQoKSkKKyAgICAgICAgcmV0dXJuOworICAg IGlmICh0aW1lb3V0ID4gMjUwX21zIHx8ICFzaW5nbGVTaG90KQorICAgICAgICByZXR1cm47Cisg ICAgaWYgKCFpc09ic2VydmluZ0RPTVRpbWVyU2NoZWR1bGluZygpKQorICAgICAgICByZXR1cm47 CisgICAgc2V0T2JzZXJ2ZWRDb250ZW50Q2hhbmdlKFdLQ29udGVudEluZGV0ZXJtaW5hdGVDaGFu Z2UpOworICAgIGFkZE9ic2VydmVkRE9NVGltZXIodGltZXIpOworICAgIExPR19XSVRIX1NUUkVB TShDb250ZW50T2JzZXJ2YXRpb24sIHN0cmVhbSA8PCAiRE9NVGltZXI6Omluc3RhbGw6IHJlZ2lz dGVkIHRoaXMgdGltZXI6ICgiIDw8ICZ0aW1lciA8PCAiKSBhbmQgb2JzZXJ2ZSB3aGVuIGl0IGZp cmVzLiIpOworfQorCit2b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RhcnRPYnNlcnZpbmdE T01UaW1lcihjb25zdCBET01UaW1lciYgdGltZXIpCit7CisgICAgaWYgKCFtX3BhZ2UubWFpbkZy YW1lKCkuZG9jdW1lbnQoKSkKKyAgICAgICAgcmV0dXJuOworICAgIGlmICghY29udGFpbnNPYnNl cnZlZERPTVRpbWVyKHRpbWVyKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgTE9HX1dJVEhfU1RS RUFNKENvbnRlbnRPYnNlcnZhdGlvbiwgc3RyZWFtIDw8ICJET01UaW1lcjo6ZmlyZWQ6IHN0YXJ0 IG9ic2VydmluZyAoIiA8PCAmdGltZXIgPDwgIikgdGltZXIgY2FsbGJhY2suIik7CisgICAgc3Rh cnRPYnNlcnZpbmdDb250ZW50Q2hhbmdlcygpOworICAgIHN0YXJ0T2JzZXJ2aW5nU3R5bGVSZWNh bGNTY2hlZHVsaW5nKCk7Cit9CisKK3ZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpzdG9wT2Jz ZXJ2aW5nRE9NVGltZXIoY29uc3QgRE9NVGltZXImIHRpbWVyKQoreworICAgIGlmICghbV9wYWdl Lm1haW5GcmFtZSgpLmRvY3VtZW50KCkpCisgICAgICAgIHJldHVybjsKKyAgICBpZiAoIWNvbnRh aW5zT2JzZXJ2ZWRET01UaW1lcih0aW1lcikpCisgICAgICAgIHJldHVybjsKKworICAgIHJlbW92 ZU9ic2VydmVkRE9NVGltZXIodGltZXIpOworICAgIHN0b3BPYnNlcnZpbmdTdHlsZVJlY2FsY1Nj aGVkdWxpbmcoKTsKKyAgICBzdG9wT2JzZXJ2aW5nQ29udGVudENoYW5nZXMoKTsKKyAgICBhdXRv IG9ic2VydmVkQ29udGVudENoYW5nZSA9IHRoaXMtPm9ic2VydmVkQ29udGVudENoYW5nZSgpOwor ICAgIC8vIENoZWNrIGlmIHRoZSB0aW1lciBjYWxsYmFjayB0cmlnZ2VyZWQgZWl0aGVyIGEgc3lu YyBvciBhc3luYyBzdHlsZSB1cGRhdGUuCisgICAgYXV0byBpbkRldGVybWluZWRTdGF0ZSA9IG9i c2VydmVkQ29udGVudENoYW5nZSA9PSBXS0NvbnRlbnRWaXNpYmlsaXR5Q2hhbmdlIHx8ICghY291 bnRPZk9ic2VydmVkRE9NVGltZXJzKCkgJiYgb2JzZXJ2ZWRDb250ZW50Q2hhbmdlID09IFdLQ29u dGVudE5vQ2hhbmdlKTsgIAorICAgIAorICAgIExPR19XSVRIX1NUUkVBTShDb250ZW50T2JzZXJ2 YXRpb24sIHN0cmVhbSA8PCAiRE9NVGltZXI6OmZpcmVkOiBzdG9wIG9ic2VydmluZyAoIiA8PCB0 aGlzIDw8ICIpIHRpbWVyIGNhbGxiYWNrLiIpOworICAgIGlmIChpbkRldGVybWluZWRTdGF0ZSkg eworICAgICAgICBMT0coQ29udGVudE9ic2VydmF0aW9uLCAiRE9NVGltZXI6OmZpcmVkOiBpbiBk ZXRlcm1pbmVkIHN0YXRlLiIpOworICAgICAgICBtX3BhZ2UuY2hyb21lKCkuY2xpZW50KCkub2Jz ZXJ2ZWRDb250ZW50Q2hhbmdlKG1fcGFnZS5tYWluRnJhbWUoKSk7CisgICAgfSBlbHNlIGlmIChv YnNlcnZlZENvbnRlbnRDaGFuZ2UgPT0gV0tDb250ZW50SW5kZXRlcm1pbmF0ZUNoYW5nZSkgewor ICAgICAgICAvLyBBbiBhc3luYyBzdHlsZSByZWNhbGMgaGFzIGJlZW4gc2NoZWR1bGVkLiBMZXQn cyBvYnNlcnZlIGl0LgorICAgICAgICBMT0coQ29udGVudE9ic2VydmF0aW9uLCAiRE9NVGltZXI6 OmZpcmVkOiB3YWl0IHVudGlsIG5leHQgc3R5bGUgcmVjYWxjIGZpcmVzLiIpOworICAgICAgICBz ZXRTaG91bGRPYnNlcnZlTmV4dFN0eWxlUmVjYWxjKHRydWUpOworICAgIH0gCit9CisKIHZvaWQg Q29udGVudENoYW5nZU9ic2VydmVyOjpzdGFydE9ic2VydmluZ0NvbnRlbnRDaGFuZ2VzKCkKIHsK ICAgICBXS1N0YXJ0T2JzZXJ2aW5nQ29udGVudENoYW5nZXMoKTsKQEAgLTEwNiwxOSArMTY3LDE5 IEBAIHZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpzZXRPYnNlcnZlZENvbnRlbnRDaGFuZ2Uo V0tDb250ZW50Q2hhbmdlIGNoYW5nZSkKICAgICBXS1NldE9ic2VydmVkQ29udGVudENoYW5nZShj aGFuZ2UpOwogfQogCi1ib29sIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6Y29udGFpbnNPYnNlcnZl ZERPTVRpbWVyKERPTVRpbWVyJiB0aW1lcikKK2Jvb2wgQ29udGVudENoYW5nZU9ic2VydmVyOjpj b250YWluc09ic2VydmVkRE9NVGltZXIoY29uc3QgRE9NVGltZXImIHRpbWVyKQogewotICAgIHJl dHVybiBXZWJUaHJlYWRDb250YWluc09ic2VydmVkRE9NVGltZXIoJnRpbWVyKTsKKyAgICByZXR1 cm4gV2ViVGhyZWFkQ29udGFpbnNPYnNlcnZlZERPTVRpbWVyKGNvbnN0X2Nhc3Q8RE9NVGltZXIq PigmdGltZXIpKTsKIH0KIAotdm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OmFkZE9ic2VydmVk RE9NVGltZXIoRE9NVGltZXImIHRpbWVyKQordm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OmFk ZE9ic2VydmVkRE9NVGltZXIoY29uc3QgRE9NVGltZXImIHRpbWVyKQogewotICAgIFdlYlRocmVh ZEFkZE9ic2VydmVkRE9NVGltZXIoJnRpbWVyKTsKKyAgICBXZWJUaHJlYWRBZGRPYnNlcnZlZERP TVRpbWVyKGNvbnN0X2Nhc3Q8RE9NVGltZXIqPigmdGltZXIpKTsKIH0KIAotdm9pZCBDb250ZW50 Q2hhbmdlT2JzZXJ2ZXI6OnJlbW92ZU9ic2VydmVkRE9NVGltZXIoRE9NVGltZXImIHRpbWVyKQor dm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnJlbW92ZU9ic2VydmVkRE9NVGltZXIoY29uc3Qg RE9NVGltZXImIHRpbWVyKQogewotICAgIFdlYlRocmVhZFJlbW92ZU9ic2VydmVkRE9NVGltZXIo JnRpbWVyKTsKKyAgICBXZWJUaHJlYWRSZW1vdmVPYnNlcnZlZERPTVRpbWVyKGNvbnN0X2Nhc3Q8 RE9NVGltZXIqPigmdGltZXIpKTsKIH0KIAogfQo= 362926 2019-02-25 14:01:56 -0800 2019-02-25 14:15:39 -0800 Patch bug-194987-20190225140155.patch text/plain 14961 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyMDU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjcxZjc1Nzc2ZjkzYjhi MWY5OWM3NDQ1YjkwZWI0YTRlYzIzYmE0Yi4uZTE1OWExNzY3OTI2NDk5MDEzOTViZjNiYjU3Zjhk NTMzODFlMmFiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTAyLTI1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvbnRlbnRDaGFuZ2VPYnNl cnZlcl0gTW92ZSBvYnNlcnZpbmcgbG9naWMgZnJvbSBET01UaW1lciB0byBDb250ZW50Q2hhbmdl T2JzZXJ2ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5NDk4NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDgzNDI5MTA+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29udGVudCBvYnZzZXJ2YXRpb24g bG9naWMgc2hvdWxkIGFsbCBtb3ZlIHRvIHRoZSBDb250ZW50Q2hhbmdlT2JzZXJ2ZXIgY2xhc3Mu IAorCisgICAgICAgICogcGFnZS9ET01UaW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01U aW1lcjo6aW5zdGFsbCk6CisgICAgICAgIChXZWJDb3JlOjpET01UaW1lcjo6ZmlyZWQpOgorICAg ICAgICAqIHBhZ2UvUGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpQYWdlKToKKyAg ICAgICAgKiBwYWdlL1BhZ2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OmNvbnRlbnRDaGFu Z2VPYnNlcnZlcik6CisgICAgICAgICogcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmg6 CisgICAgICAgICogcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLm1tOgorICAgICAgICAo V2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXIpOgor ICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjpyZWdpc3RlckRPTVRpbWVy Rm9yQ29udGVudE9ic2VydmF0aW9uSWZOZWVkZWQpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVu dENoYW5nZU9ic2VydmVyOjpzdGFydE9ic2VydmluZ0RPTVRpbWVyKToKKyAgICAgICAgKFdlYkNv cmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RvcE9ic2VydmluZ0RPTVRpbWVyKToKKyAgICAg ICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6Y29udGFpbnNPYnNlcnZlZERPTVRp bWVyKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6YWRkT2JzZXJ2 ZWRET01UaW1lcik6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnJl bW92ZU9ic2VydmVkRE9NVGltZXIpOgorCiAyMDE5LTAyLTI1ICBDaHJpcyBGbGVpemFjaCAgPGNm bGVpemFjaEBhcHBsZS5jb20+CiAKICAgICAgICAgQVg6IDxmb290ZXI+IEhUTUw1IHRhZyBub3Qg cmVhZGluZyBhcyBBUklBIExhbmRtYXJrIHRvIFZvaWNlT3ZlcgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGFnZS9ET01UaW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVRpbWVy LmNwcAppbmRleCA4OTUyYjg5NWI0YTNjMTRlNWQzYzgxZWIzZDM3ZWM5OGZhYThkNGU5Li41N2Ri ZmYzMDI5NmIwZjQwMDI3YTkzN2E5NzJiNjBhZDJiZTdmMTIyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0RPTVRpbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVRp bWVyLmNwcApAQCAtNDIsMTAgKzQyLDcgQEAKICNpbmNsdWRlIDx3dGYvU3RkTGliRXh0cmFzLmg+ CiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotI2luY2x1ZGUgIkNocm9tZS5oIgotI2luY2x1 ZGUgIkNocm9tZUNsaWVudC5oIgogI2luY2x1ZGUgIkNvbnRlbnRDaGFuZ2VPYnNlcnZlci5oIgot I2luY2x1ZGUgIkZyYW1lLmgiCiAjZW5kaWYKIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtMjI0 LDI1ICsyMjEsOSBAQCBpbnQgRE9NVGltZXI6Omluc3RhbGwoU2NyaXB0RXhlY3V0aW9uQ29udGV4 dCYgY29udGV4dCwgc3RkOjp1bmlxdWVfcHRyPFNjaGVkdWxlZAogICAgIC8vIEtlZXAgdHJhY2sg b2YgbmVzdGVkIHRpbWVyIGluc3RhbGxzLgogICAgIGlmIChOZXN0ZWRUaW1lcnNNYXAqIG5lc3Rl ZFRpbWVycyA9IE5lc3RlZFRpbWVyc01hcDo6aW5zdGFuY2VGb3JDb250ZXh0KGNvbnRleHQpKQog ICAgICAgICBuZXN0ZWRUaW1lcnMtPmFkZCh0aW1lci0+bV90aW1lb3V0SWQsICp0aW1lcik7Ci0K ICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotICAgIGF1dG8gc3RhcnRPYnNlcnZpbmdUaGlzVGlt ZXJJZk5lZWRlZCA9IFsmXSB7Ci0gICAgICAgIGlmICghaXM8RG9jdW1lbnQ+KGNvbnRleHQpKQot ICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBpZiAoY29udGV4dC5hY3RpdmVET01PYmplY3Rz QXJlU3VzcGVuZGVkKCkpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGlmICh0aW1lb3V0 ID4gMjUwX21zIHx8ICFzaW5nbGVTaG90KQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBh dXRvJiBjb250ZW50Q2hhbmdlT2JzZXJ2ZXIgPSBkb3duY2FzdDxEb2N1bWVudD4oY29udGV4dCku cGFnZSgpLT5jb250ZW50Q2hhbmdlT2JzZXJ2ZXIoKTsKLSAgICAgICAgaWYgKCFjb250ZW50Q2hh bmdlT2JzZXJ2ZXIuaXNPYnNlcnZpbmdET01UaW1lclNjaGVkdWxpbmcoKSkKLSAgICAgICAgICAg IHJldHVybjsKLQotICAgICAgICBjb250ZW50Q2hhbmdlT2JzZXJ2ZXIuc2V0T2JzZXJ2ZWRDb250 ZW50Q2hhbmdlKFdLQ29udGVudEluZGV0ZXJtaW5hdGVDaGFuZ2UpOwotICAgICAgICBjb250ZW50 Q2hhbmdlT2JzZXJ2ZXIuYWRkT2JzZXJ2ZWRET01UaW1lcigqdGltZXIpOwotICAgICAgICBMT0df V0lUSF9TVFJFQU0oQ29udGVudE9ic2VydmF0aW9uLCBzdHJlYW0gPDwgIkRPTVRpbWVyOjppbnN0 YWxsOiByZWdpc3RlciB0aGlzIHRpbWVyOiAoIiA8PCB0aW1lci0+bV90aW1lb3V0SWQgPDwgIikg YW5kIG9ic2VydmUgd2hlbiBpdCBmaXJlcy4iKTsKLSAgICB9OwotCi0gICAgc3RhcnRPYnNlcnZp bmdUaGlzVGltZXJJZk5lZWRlZCgpOworICAgIGlmIChpczxEb2N1bWVudD4oY29udGV4dCkpCisg ICAgICAgIGRvd25jYXN0PERvY3VtZW50Pihjb250ZXh0KS5wYWdlKCktPmNvbnRlbnRDaGFuZ2VP YnNlcnZlcigpLnJlZ2lzdGVyRE9NVGltZXJGb3JDb250ZW50T2JzZXJ2YXRpb25JZk5lZWRlZCgq dGltZXIsIHRpbWVvdXQsIHNpbmdsZVNob3QpOwogI2VuZGlmCiAgICAgcmV0dXJuIHRpbWVyLT5t X3RpbWVvdXRJZDsKIH0KQEAgLTM0OCw1NCArMzI5LDIwIEBAIHZvaWQgRE9NVGltZXI6OmZpcmVk KCkKIAogICAgIGNvbnRleHQucmVtb3ZlVGltZW91dChtX3RpbWVvdXRJZCk7CiAKLSNpZiBQTEFU Rk9STShJT1NfRkFNSUxZKQotICAgIGF1dG8gaXNPYnNlcnZpbmdMYXN0VGltZXIgPSBmYWxzZTsK LSAgICBhdXRvIHNob3VsZEJlZ2luT2JzZXJ2aW5nQ2hhbmdlcyA9IGZhbHNlOwotICAgIFBhZ2Uq IHBhZ2UgPSBudWxscHRyOwotICAgIGlmIChpczxEb2N1bWVudD4oY29udGV4dCkgJiYgZG93bmNh c3Q8RG9jdW1lbnQ+KGNvbnRleHQpLnBhZ2UoKSkgewotICAgICAgICBwYWdlID0gZG93bmNhc3Q8 RG9jdW1lbnQ+KGNvbnRleHQpLnBhZ2UoKTsKLSAgICAgICAgYXV0byYgY29udGVudENoYW5nZU9i c2VydmVyID0gcGFnZS0+Y29udGVudENoYW5nZU9ic2VydmVyKCk7Ci0gICAgICAgIGlzT2JzZXJ2 aW5nTGFzdFRpbWVyID0gY29udGVudENoYW5nZU9ic2VydmVyLmNvdW50T2ZPYnNlcnZlZERPTVRp bWVycygpID09IDE7Ci0gICAgICAgIHNob3VsZEJlZ2luT2JzZXJ2aW5nQ2hhbmdlcyA9IGNvbnRl bnRDaGFuZ2VPYnNlcnZlci5jb250YWluc09ic2VydmVkRE9NVGltZXIoKnRoaXMpOwotICAgIH0K LQotICAgIGlmIChzaG91bGRCZWdpbk9ic2VydmluZ0NoYW5nZXMpIHsKLSAgICAgICAgQVNTRVJU KHBhZ2UpOwotICAgICAgICBMT0dfV0lUSF9TVFJFQU0oQ29udGVudE9ic2VydmF0aW9uLCBzdHJl YW0gPDwgIkRPTVRpbWVyOjpmaXJlZDogc3RhcnQgb2JzZXJ2aW5nICgiIDw8IG1fdGltZW91dElk IDw8ICIpIHRpbWVyIGNhbGxiYWNrLiIpOwotICAgICAgICBhdXRvJiBjb250ZW50Q2hhbmdlT2Jz ZXJ2ZXIgPSBwYWdlLT5jb250ZW50Q2hhbmdlT2JzZXJ2ZXIoKTsKLSAgICAgICAgY29udGVudENo YW5nZU9ic2VydmVyLnN0YXJ0T2JzZXJ2aW5nQ29udGVudENoYW5nZXMoKTsKLSAgICAgICAgY29u dGVudENoYW5nZU9ic2VydmVyLnN0YXJ0T2JzZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5nKCk7 Ci0gICAgICAgIGNvbnRlbnRDaGFuZ2VPYnNlcnZlci5yZW1vdmVPYnNlcnZlZERPTVRpbWVyKCp0 aGlzKTsKLSAgICB9Ci0jZW5kaWYKLQogICAgIC8vIEtlZXAgdHJhY2sgbmVzdGVkIHRpbWVyIGlu c3RhbGxzLgogICAgIE5lc3RlZFRpbWVyc01hcCogbmVzdGVkVGltZXJzID0gTmVzdGVkVGltZXJz TWFwOjppbnN0YW5jZUZvckNvbnRleHQoY29udGV4dCk7CiAgICAgaWYgKG5lc3RlZFRpbWVycykK ICAgICAgICAgbmVzdGVkVGltZXJzLT5zdGFydFRyYWNraW5nKCk7CiAKKyNpZiBQTEFURk9STShJ T1NfRkFNSUxZKQorICAgIFBhZ2UqIHBhZ2UgPSBpczxEb2N1bWVudD4oY29udGV4dCkgPyBkb3du Y2FzdDxEb2N1bWVudD4oY29udGV4dCkucGFnZSgpIDogbnVsbHB0cjsgCisgICAgaWYgKHBhZ2Up CisgICAgICAgIHBhZ2UtPmNvbnRlbnRDaGFuZ2VPYnNlcnZlcigpLnN0YXJ0T2JzZXJ2aW5nRE9N VGltZXJFeGVjdXRlKCp0aGlzKTsKKyNlbmRpZgogICAgIG1fYWN0aW9uLT5leGVjdXRlKGNvbnRl eHQpOwotCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICBpZiAoc2hvdWxkQmVnaW5PYnNl cnZpbmdDaGFuZ2VzKSB7Ci0gICAgICAgIEFTU0VSVChwYWdlKTsKLSAgICAgICAgTE9HX1dJVEhf U1RSRUFNKENvbnRlbnRPYnNlcnZhdGlvbiwgc3RyZWFtIDw8ICJET01UaW1lcjo6ZmlyZWQ6IHN0 b3Agb2JzZXJ2aW5nICgiIDw8IG1fdGltZW91dElkIDw8ICIpIHRpbWVyIGNhbGxiYWNrLiIpOwot ICAgICAgICBhdXRvJiBjb250ZW50Q2hhbmdlT2JzZXJ2ZXIgPSBwYWdlLT5jb250ZW50Q2hhbmdl T2JzZXJ2ZXIoKTsKLSAgICAgICAgY29udGVudENoYW5nZU9ic2VydmVyLnN0b3BPYnNlcnZpbmdT dHlsZVJlY2FsY1NjaGVkdWxpbmcoKTsKLSAgICAgICAgY29udGVudENoYW5nZU9ic2VydmVyLnN0 b3BPYnNlcnZpbmdDb250ZW50Q2hhbmdlcygpOwotCi0gICAgICAgIGF1dG8gb2JzZXJ2ZWRDb250 ZW50Q2hhbmdlID0gY29udGVudENoYW5nZU9ic2VydmVyLm9ic2VydmVkQ29udGVudENoYW5nZSgp OwotICAgICAgICAvLyBDaGVjayBpZiB0aGUgdGltZXIgY2FsbGJhY2sgdHJpZ2dlcmVkIGVpdGhl ciBhIHN5bmMgb3IgYXN5bmMgc3R5bGUgdXBkYXRlLgotICAgICAgICBhdXRvIGluRGV0ZXJtaW5l ZFN0YXRlID0gb2JzZXJ2ZWRDb250ZW50Q2hhbmdlID09IFdLQ29udGVudFZpc2liaWxpdHlDaGFu Z2UgfHwgKGlzT2JzZXJ2aW5nTGFzdFRpbWVyICYmIG9ic2VydmVkQ29udGVudENoYW5nZSA9PSBX S0NvbnRlbnROb0NoYW5nZSk7ICAKLSAgICAgICAgaWYgKGluRGV0ZXJtaW5lZFN0YXRlKSB7Ci0g ICAgICAgICAgICBMT0dfV0lUSF9TVFJFQU0oQ29udGVudE9ic2VydmF0aW9uLCBzdHJlYW0gPDwg IkRPTVRpbWVyOjpmaXJlZCgiIDw8IG1fdGltZW91dElkIDw8ICIpOiBpbiBkZXRlcm1pbmVkIHN0 YXRlLiIpOwotICAgICAgICAgICAgcGFnZS0+Y2hyb21lKCkuY2xpZW50KCkub2JzZXJ2ZWRDb250 ZW50Q2hhbmdlKCpkb3duY2FzdDxEb2N1bWVudD4oY29udGV4dCkuZnJhbWUoKSk7Ci0gICAgICAg IH0gZWxzZSBpZiAob2JzZXJ2ZWRDb250ZW50Q2hhbmdlID09IFdLQ29udGVudEluZGV0ZXJtaW5h dGVDaGFuZ2UpIHsKLSAgICAgICAgICAgIC8vIEFuIGFzeW5jIHN0eWxlIHJlY2FsYyBoYXMgYmVl biBzY2hlZHVsZWQuIExldCdzIG9ic2VydmUgaXQuCi0gICAgICAgICAgICBMT0dfV0lUSF9TVFJF QU0oQ29udGVudE9ic2VydmF0aW9uLCBzdHJlYW0gPDwgIkRPTVRpbWVyOjpmaXJlZCgiIDw8IG1f dGltZW91dElkIDw8ICIpOiB3YWl0IHVudGlsIG5leHQgc3R5bGUgcmVjYWxjIGZpcmVzLiIpOwot ICAgICAgICAgICAgY29udGVudENoYW5nZU9ic2VydmVyLnNldFNob3VsZE9ic2VydmVOZXh0U3R5 bGVSZWNhbGModHJ1ZSk7Ci0gICAgICAgIH0KLSAgICB9CisgICAgaWYgKHBhZ2UpCisgICAgICAg IHBhZ2UtPmNvbnRlbnRDaGFuZ2VPYnNlcnZlcigpLnN0b3BPYnNlcnZpbmdET01UaW1lckV4ZWN1 dGUoKnRoaXMpOwogI2VuZGlmCiAKICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZEZp cmVUaW1lcihjb29raWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKaW5kZXggYzllODdhMmMyMDA4NTFjYmU2 NGNiMmQ1OTQ2NTdiZWQwZTYzYmVkNi4uMmIxMzk4MDRjMjllNTJkOWIwMzExMDkyNTdmNDJmYTc3 NmJhYmRjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCkBAIC0xNTAsNiArMTUwLDEwIEBACiAjaW5jbHVk ZSAiU2VsZWN0aW9uUmVjdC5oIgogI2VuZGlmCiAKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQor I2luY2x1ZGUgIkNvbnRlbnRDaGFuZ2VPYnNlcnZlci5oIgorI2VuZGlmCisKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAogc3RhdGljIEhhc2hTZXQ8UGFnZSo+JiBhbGxQYWdlcygpCkBAIC0yMzIsNiAr MjM2LDkgQEAgUGFnZTo6UGFnZShQYWdlQ29uZmlndXJhdGlvbiYmIHBhZ2VDb25maWd1cmF0aW9u KQogICAgICwgbV9wZXJmb3JtYW5jZUxvZ2dpbmdDbGllbnQoV1RGTW92ZShwYWdlQ29uZmlndXJh dGlvbi5wZXJmb3JtYW5jZUxvZ2dpbmdDbGllbnQpKQogICAgICwgbV93ZWJHTFN0YXRlVHJhY2tl cihXVEZNb3ZlKHBhZ2VDb25maWd1cmF0aW9uLndlYkdMU3RhdGVUcmFja2VyKSkKICAgICAsIG1f bGliV2ViUlRDUHJvdmlkZXIoV1RGTW92ZShwYWdlQ29uZmlndXJhdGlvbi5saWJXZWJSVENQcm92 aWRlcikpCisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKyAgICAsIG1fY29udGVudENoYW5nZU9i c2VydmVyKHN0ZDo6bWFrZV91bmlxdWU8Q29udGVudENoYW5nZU9ic2VydmVyPigqdGhpcykpCisj ZW5kaWYKICAgICAsIG1fdmVydGljYWxTY3JvbGxFbGFzdGljaXR5KFNjcm9sbEVsYXN0aWNpdHlB bGxvd2VkKQogICAgICwgbV9ob3Jpem9udGFsU2Nyb2xsRWxhc3RpY2l0eShTY3JvbGxFbGFzdGlj aXR5QWxsb3dlZCkKICAgICAsIG1fZG9tVGltZXJBbGlnbm1lbnRJbnRlcnZhbChET01UaW1lcjo6 ZGVmYXVsdEFsaWdubWVudEludGVydmFsKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL1BhZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCmluZGV4IDIzZDJjYWY0NWVm MTQwMDcwNDI3OTAwOWFjOGQ2MjAxNWJkZWIwMDIuLjZlNTIxMjA3OGJmYTRjMmNiMzA0ODg0NzU2 YTllNGI5ZjVjOWY5MGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCkBAIC02NiwxMCArNjYsNiBAQAogI2luY2x1 ZGUgIk1lZGlhUGxheWJhY2tUYXJnZXRDb250ZXh0LmgiCiAjZW5kaWYKIAotI2lmIFBMQVRGT1JN KElPU19GQU1JTFkpCi0jaW5jbHVkZSAiQ29udGVudENoYW5nZU9ic2VydmVyLmgiCi0jZW5kaWYK LQogbmFtZXNwYWNlIEpTQyB7CiBjbGFzcyBEZWJ1Z2dlcjsKIH0KQEAgLTg5LDYgKzg1LDkgQEAg Y2xhc3MgQ2FjaGVTdG9yYWdlUHJvdmlkZXI7CiBjbGFzcyBDaHJvbWU7CiBjbGFzcyBDaHJvbWVD bGllbnQ7CiBjbGFzcyBDb2xvcjsKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorY2xhc3MgQ29u dGVudENoYW5nZU9ic2VydmVyOworI2VuZGlmCiBjbGFzcyBDb250ZXh0TWVudUNsaWVudDsKIGNs YXNzIENvbnRleHRNZW51Q29udHJvbGxlcjsKIGNsYXNzIENvb2tpZUphcjsKQEAgLTI1Niw3ICsy NTUsNyBAQCBwdWJsaWM6CiAgICAgUG9pbnRlckxvY2tDb250cm9sbGVyJiBwb2ludGVyTG9ja0Nv bnRyb2xsZXIoKSBjb25zdCB7IHJldHVybiAqbV9wb2ludGVyTG9ja0NvbnRyb2xsZXI7IH0KICNl bmRpZgogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAgQ29udGVudENoYW5nZU9ic2VydmVy JiBjb250ZW50Q2hhbmdlT2JzZXJ2ZXIoKSB7IHJldHVybiBtX2NvbnRlbnRDaGFuZ2VPYnNlcnZl cjsgfQorICAgIENvbnRlbnRDaGFuZ2VPYnNlcnZlciYgY29udGVudENoYW5nZU9ic2VydmVyKCkg eyByZXR1cm4gKm1fY29udGVudENoYW5nZU9ic2VydmVyOyB9CiAjZW5kaWYKICAgICBMaWJXZWJS VENQcm92aWRlciYgbGliV2ViUlRDUHJvdmlkZXIoKSB7IHJldHVybiBtX2xpYldlYlJUQ1Byb3Zp ZGVyLmdldCgpOyB9CiAgICAgUlRDQ29udHJvbGxlciYgcnRjQ29udHJvbGxlcigpIHsgcmV0dXJu IG1fcnRjQ29udHJvbGxlcjsgfQpAQCAtODE1LDcgKzgxNCw3IEBAIHByaXZhdGU6CiAKICNpZiBQ TEFURk9STShJT1NfRkFNSUxZKQogICAgIGJvb2wgbV9lbmNsb3NlZEluU2Nyb2xsYWJsZUFuY2Vz dG9yVmlldyB7IGZhbHNlIH07Ci0gICAgQ29udGVudENoYW5nZU9ic2VydmVyIG1fY29udGVudENo YW5nZU9ic2VydmVyOworICAgIHN0ZDo6dW5pcXVlX3B0cjxDb250ZW50Q2hhbmdlT2JzZXJ2ZXI+ IG1fY29udGVudENoYW5nZU9ic2VydmVyOwogI2VuZGlmCiAgICAgCiAgICAgYm9vbCBtX3VzZVN5 c3RlbUFwcGVhcmFuY2UgeyBmYWxzZSB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9D b250ZW50Q2hhbmdlT2JzZXJ2ZXIuaAppbmRleCAxMTg5ZTk2ODkyY2Y0YjUzZmU2Y2ZiNjgzOWEy Njc3NDk0ZTM2ZmNlLi43ODIzMmI0MWE4NmRiMTBjMThjM2ZiMTNhYmNlMjc3MzY2ODRmNDEwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuaApA QCAtMzIsMTAgKzMyLDE1IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIERPTVRpbWVy OworY2xhc3MgUGFnZTsKIAogY2xhc3MgQ29udGVudENoYW5nZU9ic2VydmVyIHsKIHB1YmxpYzoK LSAgICBDb250ZW50Q2hhbmdlT2JzZXJ2ZXIoKSA9IGRlZmF1bHQ7CisgICAgQ29udGVudENoYW5n ZU9ic2VydmVyKFBhZ2UmKTsKKworICAgIHZvaWQgcmVnaXN0ZXJET01UaW1lckZvckNvbnRlbnRP YnNlcnZhdGlvbklmTmVlZGVkKGNvbnN0IERPTVRpbWVyJiwgU2Vjb25kcyB0aW1lb3V0LCBib29s IHNpbmdsZVNob3QpOworICAgIHZvaWQgc3RhcnRPYnNlcnZpbmdET01UaW1lckV4ZWN1dGUoY29u c3QgRE9NVGltZXImKTsKKyAgICB2b2lkIHN0b3BPYnNlcnZpbmdET01UaW1lckV4ZWN1dGUoY29u c3QgRE9NVGltZXImKTsKIAogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc3RhcnRPYnNlcnZpbmdD b250ZW50Q2hhbmdlcygpOwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc3RvcE9ic2VydmluZ0Nv bnRlbnRDaGFuZ2VzKCk7CkBAIC00MywxMCArNDgsNyBAQCBwdWJsaWM6CiAKICAgICBXRUJDT1JF X0VYUE9SVCB2b2lkIHN0YXJ0T2JzZXJ2aW5nRE9NVGltZXJTY2hlZHVsaW5nKCk7CiAgICAgV0VC Q09SRV9FWFBPUlQgdm9pZCBzdG9wT2JzZXJ2aW5nRE9NVGltZXJTY2hlZHVsaW5nKCk7Ci0gICAg Ym9vbCBpc09ic2VydmluZ0RPTVRpbWVyU2NoZWR1bGluZygpOwogCi0gICAgV0VCQ09SRV9FWFBP UlQgdm9pZCBzdGFydE9ic2VydmluZ1N0eWxlUmVjYWxjU2NoZWR1bGluZygpOwotICAgIFdFQkNP UkVfRVhQT1JUIHZvaWQgc3RvcE9ic2VydmluZ1N0eWxlUmVjYWxjU2NoZWR1bGluZygpOwogICAg IGJvb2wgaXNPYnNlcnZpbmdTdHlsZVJlY2FsY1NjaGVkdWxpbmcoKTsKIAogICAgIHZvaWQgc2V0 U2hvdWxkT2JzZXJ2ZU5leHRTdHlsZVJlY2FsYyhib29sKTsKQEAgLTU1LDExICs1NywxOSBAQCBw dWJsaWM6CiAgICAgdm9pZCBzZXRPYnNlcnZlZENvbnRlbnRDaGFuZ2UoV0tDb250ZW50Q2hhbmdl KTsKICAgICBXRUJDT1JFX0VYUE9SVCBXS0NvbnRlbnRDaGFuZ2Ugb2JzZXJ2ZWRDb250ZW50Q2hh bmdlKCk7CiAKLSAgICB2b2lkIGFkZE9ic2VydmVkRE9NVGltZXIoRE9NVGltZXImKTsKLSAgICB2 b2lkIHJlbW92ZU9ic2VydmVkRE9NVGltZXIoRE9NVGltZXImKTsKLSAgICBib29sIGNvbnRhaW5z T2JzZXJ2ZWRET01UaW1lcihET01UaW1lciYpOworICAgIHZvaWQgcmVtb3ZlT2JzZXJ2ZWRET01U aW1lcihjb25zdCBET01UaW1lciYpOworICAgIGJvb2wgY29udGFpbnNPYnNlcnZlZERPTVRpbWVy KGNvbnN0IERPTVRpbWVyJik7CiAgICAgV0VCQ09SRV9FWFBPUlQgdW5zaWduZWQgY291bnRPZk9i c2VydmVkRE9NVGltZXJzKCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBjbGVhck9ic2VydmVk RE9NVGltZXJzKCk7CisKK3ByaXZhdGU6CisgICAgdm9pZCBhZGRPYnNlcnZlZERPTVRpbWVyKGNv bnN0IERPTVRpbWVyJik7CisgICAgYm9vbCBpc09ic2VydmluZ0RPTVRpbWVyU2NoZWR1bGluZygp OworCisgICAgdm9pZCBzdGFydE9ic2VydmluZ1N0eWxlUmVjYWxjU2NoZWR1bGluZygpOworICAg IHZvaWQgc3RvcE9ic2VydmluZ1N0eWxlUmVjYWxjU2NoZWR1bGluZygpOworCisgICAgUGFnZSYg bV9wYWdlOwogfTsKIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29u dGVudENoYW5nZU9ic2VydmVyLm1tIGIvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENo YW5nZU9ic2VydmVyLm1tCmluZGV4IDA5YmIzNGNjN2Y3MTY3OWM2NzUyNGJhY2U1NWZkODMwNzdk NDM5ZmEuLjIwMDkxMjNkNmQ4MmQwZmQ5ZTQ0ZGRiOTljOTA3NWU4Y2YzNDVkZmYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5tbQorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIubW0KQEAgLTI2 LDExICsyNiw2NiBAQAogI2ltcG9ydCAiQ29udGVudENoYW5nZU9ic2VydmVyLmgiCiAKICNpZiBQ TEFURk9STShJT1NfRkFNSUxZKQorI2ltcG9ydCAiQ2hyb21lLmgiCisjaW1wb3J0ICJDaHJvbWVD bGllbnQuaCIKICNpbXBvcnQgIkRPTVRpbWVyLmgiCisjaW1wb3J0ICJMb2dnaW5nLmgiCisjaW1w b3J0ICJQYWdlLmgiCiAjaW1wb3J0ICJXS0NvbnRlbnRPYnNlcnZhdGlvbkludGVybmFsLmgiCiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorQ29udGVudENoYW5nZU9ic2VydmVyOjpDb250ZW50Q2hh bmdlT2JzZXJ2ZXIoUGFnZSYgcGFnZSkKKyAgICA6IG1fcGFnZShwYWdlKQoreworfQorCit2b2lk IENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6cmVnaXN0ZXJET01UaW1lckZvckNvbnRlbnRPYnNlcnZh dGlvbklmTmVlZGVkKGNvbnN0IERPTVRpbWVyJiB0aW1lciwgU2Vjb25kcyB0aW1lb3V0LCBib29s IHNpbmdsZVNob3QpCit7CisgICAgaWYgKCFtX3BhZ2UubWFpbkZyYW1lKCkuZG9jdW1lbnQoKSkK KyAgICAgICAgcmV0dXJuOworICAgIGlmIChtX3BhZ2UubWFpbkZyYW1lKCkuZG9jdW1lbnQoKS0+ YWN0aXZlRE9NT2JqZWN0c0FyZVN1c3BlbmRlZCgpKQorICAgICAgICByZXR1cm47CisgICAgaWYg KHRpbWVvdXQgPiAyNTBfbXMgfHwgIXNpbmdsZVNob3QpCisgICAgICAgIHJldHVybjsKKyAgICBp ZiAoIWlzT2JzZXJ2aW5nRE9NVGltZXJTY2hlZHVsaW5nKCkpCisgICAgICAgIHJldHVybjsKKyAg ICBzZXRPYnNlcnZlZENvbnRlbnRDaGFuZ2UoV0tDb250ZW50SW5kZXRlcm1pbmF0ZUNoYW5nZSk7 CisgICAgYWRkT2JzZXJ2ZWRET01UaW1lcih0aW1lcik7CisgICAgTE9HX1dJVEhfU1RSRUFNKENv bnRlbnRPYnNlcnZhdGlvbiwgc3RyZWFtIDw8ICJyZWdpc3RlckRPTVRpbWVyRm9yQ29udGVudE9i c2VydmF0aW9uSWZOZWVkZWQ6IHJlZ2lzdGVkIHRoaXMgdGltZXI6ICgiIDw8ICZ0aW1lciA8PCAi KSBhbmQgb2JzZXJ2ZSB3aGVuIGl0IGZpcmVzLiIpOworfQorCit2b2lkIENvbnRlbnRDaGFuZ2VP YnNlcnZlcjo6c3RhcnRPYnNlcnZpbmdET01UaW1lckV4ZWN1dGUoY29uc3QgRE9NVGltZXImIHRp bWVyKQoreworICAgIGlmICghY29udGFpbnNPYnNlcnZlZERPTVRpbWVyKHRpbWVyKSkKKyAgICAg ICAgcmV0dXJuOworICAgIExPR19XSVRIX1NUUkVBTShDb250ZW50T2JzZXJ2YXRpb24sIHN0cmVh bSA8PCAic3RhcnRPYnNlcnZpbmdET01UaW1lckV4ZWN1dGU6IHN0YXJ0IG9ic2VydmluZyAoIiA8 PCAmdGltZXIgPDwgIikgdGltZXIgY2FsbGJhY2suIik7CisgICAgc3RhcnRPYnNlcnZpbmdDb250 ZW50Q2hhbmdlcygpOworICAgIHN0YXJ0T2JzZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5nKCk7 Cit9CisKK3ZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpzdG9wT2JzZXJ2aW5nRE9NVGltZXJF eGVjdXRlKGNvbnN0IERPTVRpbWVyJiB0aW1lcikKK3sKKyAgICBpZiAoIWNvbnRhaW5zT2JzZXJ2 ZWRET01UaW1lcih0aW1lcikpCisgICAgICAgIHJldHVybjsKKyAgICByZW1vdmVPYnNlcnZlZERP TVRpbWVyKHRpbWVyKTsKKyAgICBzdG9wT2JzZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5nKCk7 CisgICAgc3RvcE9ic2VydmluZ0NvbnRlbnRDaGFuZ2VzKCk7CisgICAgYXV0byBvYnNlcnZlZENv bnRlbnRDaGFuZ2UgPSB0aGlzLT5vYnNlcnZlZENvbnRlbnRDaGFuZ2UoKTsKKyAgICAvLyBDaGVj ayBpZiB0aGUgdGltZXIgY2FsbGJhY2sgdHJpZ2dlcmVkIGVpdGhlciBhIHN5bmMgb3IgYXN5bmMg c3R5bGUgdXBkYXRlLgorICAgIGF1dG8gaW5EZXRlcm1pbmVkU3RhdGUgPSBvYnNlcnZlZENvbnRl bnRDaGFuZ2UgPT0gV0tDb250ZW50VmlzaWJpbGl0eUNoYW5nZSB8fCAoIWNvdW50T2ZPYnNlcnZl ZERPTVRpbWVycygpICYmIG9ic2VydmVkQ29udGVudENoYW5nZSA9PSBXS0NvbnRlbnROb0NoYW5n ZSk7ICAKKyAgICAKKyAgICBMT0dfV0lUSF9TVFJFQU0oQ29udGVudE9ic2VydmF0aW9uLCBzdHJl YW0gPDwgInN0b3BPYnNlcnZpbmdET01UaW1lckV4ZWN1dGU6IHN0b3Agb2JzZXJ2aW5nICgiIDw8 ICZ0aW1lciA8PCAiKSB0aW1lciBjYWxsYmFjay4iKTsKKyAgICBpZiAoaW5EZXRlcm1pbmVkU3Rh dGUpIHsKKyAgICAgICAgTE9HX1dJVEhfU1RSRUFNKENvbnRlbnRPYnNlcnZhdGlvbiwgc3RyZWFt IDw8ICJzdG9wT2JzZXJ2aW5nRE9NVGltZXJFeGVjdXRlOiAoIiA8PCAmdGltZXIgPDwgIikgaW4g ZGV0ZXJtaW5lZCBzdGF0ZS4iKTsKKyAgICAgICAgbV9wYWdlLmNocm9tZSgpLmNsaWVudCgpLm9i c2VydmVkQ29udGVudENoYW5nZShtX3BhZ2UubWFpbkZyYW1lKCkpOworICAgIH0gZWxzZSBpZiAo b2JzZXJ2ZWRDb250ZW50Q2hhbmdlID09IFdLQ29udGVudEluZGV0ZXJtaW5hdGVDaGFuZ2UpIHsK KyAgICAgICAgLy8gQW4gYXN5bmMgc3R5bGUgcmVjYWxjIGhhcyBiZWVuIHNjaGVkdWxlZC4gTGV0 J3Mgb2JzZXJ2ZSBpdC4KKyAgICAgICAgTE9HX1dJVEhfU1RSRUFNKENvbnRlbnRPYnNlcnZhdGlv biwgc3RyZWFtIDw8ICJzdG9wT2JzZXJ2aW5nRE9NVGltZXJFeGVjdXRlOiAoIiA8PCAmdGltZXIg PDwgIikgd2FpdCB1bnRpbCBuZXh0IHN0eWxlIHJlY2FsYyBmaXJlcy4iKTsKKyAgICAgICAgc2V0 U2hvdWxkT2JzZXJ2ZU5leHRTdHlsZVJlY2FsYyh0cnVlKTsKKyAgICB9IAorfQorCiB2b2lkIENv bnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RhcnRPYnNlcnZpbmdDb250ZW50Q2hhbmdlcygpCiB7CiAg ICAgV0tTdGFydE9ic2VydmluZ0NvbnRlbnRDaGFuZ2VzKCk7CkBAIC0xMDYsMTkgKzE2MSwxOSBA QCB2b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c2V0T2JzZXJ2ZWRDb250ZW50Q2hhbmdlKFdL Q29udGVudENoYW5nZSBjaGFuZ2UpCiAgICAgV0tTZXRPYnNlcnZlZENvbnRlbnRDaGFuZ2UoY2hh bmdlKTsKIH0KIAotYm9vbCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OmNvbnRhaW5zT2JzZXJ2ZWRE T01UaW1lcihET01UaW1lciYgdGltZXIpCitib29sIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6Y29u dGFpbnNPYnNlcnZlZERPTVRpbWVyKGNvbnN0IERPTVRpbWVyJiB0aW1lcikKIHsKLSAgICByZXR1 cm4gV2ViVGhyZWFkQ29udGFpbnNPYnNlcnZlZERPTVRpbWVyKCZ0aW1lcik7CisgICAgcmV0dXJu IFdlYlRocmVhZENvbnRhaW5zT2JzZXJ2ZWRET01UaW1lcihjb25zdF9jYXN0PERPTVRpbWVyKj4o JnRpbWVyKSk7CiB9CiAKLXZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjphZGRPYnNlcnZlZERP TVRpbWVyKERPTVRpbWVyJiB0aW1lcikKK3ZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjphZGRP YnNlcnZlZERPTVRpbWVyKGNvbnN0IERPTVRpbWVyJiB0aW1lcikKIHsKLSAgICBXZWJUaHJlYWRB ZGRPYnNlcnZlZERPTVRpbWVyKCZ0aW1lcik7CisgICAgV2ViVGhyZWFkQWRkT2JzZXJ2ZWRET01U aW1lcihjb25zdF9jYXN0PERPTVRpbWVyKj4oJnRpbWVyKSk7CiB9CiAKLXZvaWQgQ29udGVudENo YW5nZU9ic2VydmVyOjpyZW1vdmVPYnNlcnZlZERPTVRpbWVyKERPTVRpbWVyJiB0aW1lcikKK3Zv aWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpyZW1vdmVPYnNlcnZlZERPTVRpbWVyKGNvbnN0IERP TVRpbWVyJiB0aW1lcikKIHsKLSAgICBXZWJUaHJlYWRSZW1vdmVPYnNlcnZlZERPTVRpbWVyKCZ0 aW1lcik7CisgICAgV2ViVGhyZWFkUmVtb3ZlT2JzZXJ2ZWRET01UaW1lcihjb25zdF9jYXN0PERP TVRpbWVyKj4oJnRpbWVyKSk7CiB9CiAKIH0K 362927 2019-02-25 14:15:40 -0800 2019-02-25 15:06:32 -0800 Patch bug-194987-20190225141540.patch text/plain 15402 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyMDU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjcxZjc1Nzc2ZjkzYjhi MWY5OWM3NDQ1YjkwZWI0YTRlYzIzYmE0Yi4uZTE1OWExNzY3OTI2NDk5MDEzOTViZjNiYjU3Zjhk NTMzODFlMmFiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTAyLTI1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvbnRlbnRDaGFuZ2VPYnNl cnZlcl0gTW92ZSBvYnNlcnZpbmcgbG9naWMgZnJvbSBET01UaW1lciB0byBDb250ZW50Q2hhbmdl T2JzZXJ2ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5NDk4NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDgzNDI5MTA+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29udGVudCBvYnZzZXJ2YXRpb24g bG9naWMgc2hvdWxkIGFsbCBtb3ZlIHRvIHRoZSBDb250ZW50Q2hhbmdlT2JzZXJ2ZXIgY2xhc3Mu IAorCisgICAgICAgICogcGFnZS9ET01UaW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01U aW1lcjo6aW5zdGFsbCk6CisgICAgICAgIChXZWJDb3JlOjpET01UaW1lcjo6ZmlyZWQpOgorICAg ICAgICAqIHBhZ2UvUGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpQYWdlKToKKyAg ICAgICAgKiBwYWdlL1BhZ2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OmNvbnRlbnRDaGFu Z2VPYnNlcnZlcik6CisgICAgICAgICogcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmg6 CisgICAgICAgICogcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLm1tOgorICAgICAgICAo V2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXIpOgor ICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjpyZWdpc3RlckRPTVRpbWVy Rm9yQ29udGVudE9ic2VydmF0aW9uSWZOZWVkZWQpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVu dENoYW5nZU9ic2VydmVyOjpzdGFydE9ic2VydmluZ0RPTVRpbWVyKToKKyAgICAgICAgKFdlYkNv cmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RvcE9ic2VydmluZ0RPTVRpbWVyKToKKyAgICAg ICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6Y29udGFpbnNPYnNlcnZlZERPTVRp bWVyKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6YWRkT2JzZXJ2 ZWRET01UaW1lcik6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnJl bW92ZU9ic2VydmVkRE9NVGltZXIpOgorCiAyMDE5LTAyLTI1ICBDaHJpcyBGbGVpemFjaCAgPGNm bGVpemFjaEBhcHBsZS5jb20+CiAKICAgICAgICAgQVg6IDxmb290ZXI+IEhUTUw1IHRhZyBub3Qg cmVhZGluZyBhcyBBUklBIExhbmRtYXJrIHRvIFZvaWNlT3ZlcgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGFnZS9ET01UaW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVRpbWVy LmNwcAppbmRleCA4OTUyYjg5NWI0YTNjMTRlNWQzYzgxZWIzZDM3ZWM5OGZhYThkNGU5Li41N2Ri ZmYzMDI5NmIwZjQwMDI3YTkzN2E5NzJiNjBhZDJiZTdmMTIyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0RPTVRpbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVRp bWVyLmNwcApAQCAtNDIsMTAgKzQyLDcgQEAKICNpbmNsdWRlIDx3dGYvU3RkTGliRXh0cmFzLmg+ CiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotI2luY2x1ZGUgIkNocm9tZS5oIgotI2luY2x1 ZGUgIkNocm9tZUNsaWVudC5oIgogI2luY2x1ZGUgIkNvbnRlbnRDaGFuZ2VPYnNlcnZlci5oIgot I2luY2x1ZGUgIkZyYW1lLmgiCiAjZW5kaWYKIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtMjI0 LDI1ICsyMjEsOSBAQCBpbnQgRE9NVGltZXI6Omluc3RhbGwoU2NyaXB0RXhlY3V0aW9uQ29udGV4 dCYgY29udGV4dCwgc3RkOjp1bmlxdWVfcHRyPFNjaGVkdWxlZAogICAgIC8vIEtlZXAgdHJhY2sg b2YgbmVzdGVkIHRpbWVyIGluc3RhbGxzLgogICAgIGlmIChOZXN0ZWRUaW1lcnNNYXAqIG5lc3Rl ZFRpbWVycyA9IE5lc3RlZFRpbWVyc01hcDo6aW5zdGFuY2VGb3JDb250ZXh0KGNvbnRleHQpKQog ICAgICAgICBuZXN0ZWRUaW1lcnMtPmFkZCh0aW1lci0+bV90aW1lb3V0SWQsICp0aW1lcik7Ci0K ICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotICAgIGF1dG8gc3RhcnRPYnNlcnZpbmdUaGlzVGlt ZXJJZk5lZWRlZCA9IFsmXSB7Ci0gICAgICAgIGlmICghaXM8RG9jdW1lbnQ+KGNvbnRleHQpKQot ICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBpZiAoY29udGV4dC5hY3RpdmVET01PYmplY3Rz QXJlU3VzcGVuZGVkKCkpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGlmICh0aW1lb3V0 ID4gMjUwX21zIHx8ICFzaW5nbGVTaG90KQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBh dXRvJiBjb250ZW50Q2hhbmdlT2JzZXJ2ZXIgPSBkb3duY2FzdDxEb2N1bWVudD4oY29udGV4dCku cGFnZSgpLT5jb250ZW50Q2hhbmdlT2JzZXJ2ZXIoKTsKLSAgICAgICAgaWYgKCFjb250ZW50Q2hh bmdlT2JzZXJ2ZXIuaXNPYnNlcnZpbmdET01UaW1lclNjaGVkdWxpbmcoKSkKLSAgICAgICAgICAg IHJldHVybjsKLQotICAgICAgICBjb250ZW50Q2hhbmdlT2JzZXJ2ZXIuc2V0T2JzZXJ2ZWRDb250 ZW50Q2hhbmdlKFdLQ29udGVudEluZGV0ZXJtaW5hdGVDaGFuZ2UpOwotICAgICAgICBjb250ZW50 Q2hhbmdlT2JzZXJ2ZXIuYWRkT2JzZXJ2ZWRET01UaW1lcigqdGltZXIpOwotICAgICAgICBMT0df V0lUSF9TVFJFQU0oQ29udGVudE9ic2VydmF0aW9uLCBzdHJlYW0gPDwgIkRPTVRpbWVyOjppbnN0 YWxsOiByZWdpc3RlciB0aGlzIHRpbWVyOiAoIiA8PCB0aW1lci0+bV90aW1lb3V0SWQgPDwgIikg YW5kIG9ic2VydmUgd2hlbiBpdCBmaXJlcy4iKTsKLSAgICB9OwotCi0gICAgc3RhcnRPYnNlcnZp bmdUaGlzVGltZXJJZk5lZWRlZCgpOworICAgIGlmIChpczxEb2N1bWVudD4oY29udGV4dCkpCisg ICAgICAgIGRvd25jYXN0PERvY3VtZW50Pihjb250ZXh0KS5wYWdlKCktPmNvbnRlbnRDaGFuZ2VP YnNlcnZlcigpLnJlZ2lzdGVyRE9NVGltZXJGb3JDb250ZW50T2JzZXJ2YXRpb25JZk5lZWRlZCgq dGltZXIsIHRpbWVvdXQsIHNpbmdsZVNob3QpOwogI2VuZGlmCiAgICAgcmV0dXJuIHRpbWVyLT5t X3RpbWVvdXRJZDsKIH0KQEAgLTM0OCw1NCArMzI5LDIwIEBAIHZvaWQgRE9NVGltZXI6OmZpcmVk KCkKIAogICAgIGNvbnRleHQucmVtb3ZlVGltZW91dChtX3RpbWVvdXRJZCk7CiAKLSNpZiBQTEFU Rk9STShJT1NfRkFNSUxZKQotICAgIGF1dG8gaXNPYnNlcnZpbmdMYXN0VGltZXIgPSBmYWxzZTsK LSAgICBhdXRvIHNob3VsZEJlZ2luT2JzZXJ2aW5nQ2hhbmdlcyA9IGZhbHNlOwotICAgIFBhZ2Uq IHBhZ2UgPSBudWxscHRyOwotICAgIGlmIChpczxEb2N1bWVudD4oY29udGV4dCkgJiYgZG93bmNh c3Q8RG9jdW1lbnQ+KGNvbnRleHQpLnBhZ2UoKSkgewotICAgICAgICBwYWdlID0gZG93bmNhc3Q8 RG9jdW1lbnQ+KGNvbnRleHQpLnBhZ2UoKTsKLSAgICAgICAgYXV0byYgY29udGVudENoYW5nZU9i c2VydmVyID0gcGFnZS0+Y29udGVudENoYW5nZU9ic2VydmVyKCk7Ci0gICAgICAgIGlzT2JzZXJ2 aW5nTGFzdFRpbWVyID0gY29udGVudENoYW5nZU9ic2VydmVyLmNvdW50T2ZPYnNlcnZlZERPTVRp bWVycygpID09IDE7Ci0gICAgICAgIHNob3VsZEJlZ2luT2JzZXJ2aW5nQ2hhbmdlcyA9IGNvbnRl bnRDaGFuZ2VPYnNlcnZlci5jb250YWluc09ic2VydmVkRE9NVGltZXIoKnRoaXMpOwotICAgIH0K LQotICAgIGlmIChzaG91bGRCZWdpbk9ic2VydmluZ0NoYW5nZXMpIHsKLSAgICAgICAgQVNTRVJU KHBhZ2UpOwotICAgICAgICBMT0dfV0lUSF9TVFJFQU0oQ29udGVudE9ic2VydmF0aW9uLCBzdHJl YW0gPDwgIkRPTVRpbWVyOjpmaXJlZDogc3RhcnQgb2JzZXJ2aW5nICgiIDw8IG1fdGltZW91dElk IDw8ICIpIHRpbWVyIGNhbGxiYWNrLiIpOwotICAgICAgICBhdXRvJiBjb250ZW50Q2hhbmdlT2Jz ZXJ2ZXIgPSBwYWdlLT5jb250ZW50Q2hhbmdlT2JzZXJ2ZXIoKTsKLSAgICAgICAgY29udGVudENo YW5nZU9ic2VydmVyLnN0YXJ0T2JzZXJ2aW5nQ29udGVudENoYW5nZXMoKTsKLSAgICAgICAgY29u dGVudENoYW5nZU9ic2VydmVyLnN0YXJ0T2JzZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5nKCk7 Ci0gICAgICAgIGNvbnRlbnRDaGFuZ2VPYnNlcnZlci5yZW1vdmVPYnNlcnZlZERPTVRpbWVyKCp0 aGlzKTsKLSAgICB9Ci0jZW5kaWYKLQogICAgIC8vIEtlZXAgdHJhY2sgbmVzdGVkIHRpbWVyIGlu c3RhbGxzLgogICAgIE5lc3RlZFRpbWVyc01hcCogbmVzdGVkVGltZXJzID0gTmVzdGVkVGltZXJz TWFwOjppbnN0YW5jZUZvckNvbnRleHQoY29udGV4dCk7CiAgICAgaWYgKG5lc3RlZFRpbWVycykK ICAgICAgICAgbmVzdGVkVGltZXJzLT5zdGFydFRyYWNraW5nKCk7CiAKKyNpZiBQTEFURk9STShJ T1NfRkFNSUxZKQorICAgIFBhZ2UqIHBhZ2UgPSBpczxEb2N1bWVudD4oY29udGV4dCkgPyBkb3du Y2FzdDxEb2N1bWVudD4oY29udGV4dCkucGFnZSgpIDogbnVsbHB0cjsgCisgICAgaWYgKHBhZ2Up CisgICAgICAgIHBhZ2UtPmNvbnRlbnRDaGFuZ2VPYnNlcnZlcigpLnN0YXJ0T2JzZXJ2aW5nRE9N VGltZXJFeGVjdXRlKCp0aGlzKTsKKyNlbmRpZgogICAgIG1fYWN0aW9uLT5leGVjdXRlKGNvbnRl eHQpOwotCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICBpZiAoc2hvdWxkQmVnaW5PYnNl cnZpbmdDaGFuZ2VzKSB7Ci0gICAgICAgIEFTU0VSVChwYWdlKTsKLSAgICAgICAgTE9HX1dJVEhf U1RSRUFNKENvbnRlbnRPYnNlcnZhdGlvbiwgc3RyZWFtIDw8ICJET01UaW1lcjo6ZmlyZWQ6IHN0 b3Agb2JzZXJ2aW5nICgiIDw8IG1fdGltZW91dElkIDw8ICIpIHRpbWVyIGNhbGxiYWNrLiIpOwot ICAgICAgICBhdXRvJiBjb250ZW50Q2hhbmdlT2JzZXJ2ZXIgPSBwYWdlLT5jb250ZW50Q2hhbmdl T2JzZXJ2ZXIoKTsKLSAgICAgICAgY29udGVudENoYW5nZU9ic2VydmVyLnN0b3BPYnNlcnZpbmdT dHlsZVJlY2FsY1NjaGVkdWxpbmcoKTsKLSAgICAgICAgY29udGVudENoYW5nZU9ic2VydmVyLnN0 b3BPYnNlcnZpbmdDb250ZW50Q2hhbmdlcygpOwotCi0gICAgICAgIGF1dG8gb2JzZXJ2ZWRDb250 ZW50Q2hhbmdlID0gY29udGVudENoYW5nZU9ic2VydmVyLm9ic2VydmVkQ29udGVudENoYW5nZSgp OwotICAgICAgICAvLyBDaGVjayBpZiB0aGUgdGltZXIgY2FsbGJhY2sgdHJpZ2dlcmVkIGVpdGhl ciBhIHN5bmMgb3IgYXN5bmMgc3R5bGUgdXBkYXRlLgotICAgICAgICBhdXRvIGluRGV0ZXJtaW5l ZFN0YXRlID0gb2JzZXJ2ZWRDb250ZW50Q2hhbmdlID09IFdLQ29udGVudFZpc2liaWxpdHlDaGFu Z2UgfHwgKGlzT2JzZXJ2aW5nTGFzdFRpbWVyICYmIG9ic2VydmVkQ29udGVudENoYW5nZSA9PSBX S0NvbnRlbnROb0NoYW5nZSk7ICAKLSAgICAgICAgaWYgKGluRGV0ZXJtaW5lZFN0YXRlKSB7Ci0g ICAgICAgICAgICBMT0dfV0lUSF9TVFJFQU0oQ29udGVudE9ic2VydmF0aW9uLCBzdHJlYW0gPDwg IkRPTVRpbWVyOjpmaXJlZCgiIDw8IG1fdGltZW91dElkIDw8ICIpOiBpbiBkZXRlcm1pbmVkIHN0 YXRlLiIpOwotICAgICAgICAgICAgcGFnZS0+Y2hyb21lKCkuY2xpZW50KCkub2JzZXJ2ZWRDb250 ZW50Q2hhbmdlKCpkb3duY2FzdDxEb2N1bWVudD4oY29udGV4dCkuZnJhbWUoKSk7Ci0gICAgICAg IH0gZWxzZSBpZiAob2JzZXJ2ZWRDb250ZW50Q2hhbmdlID09IFdLQ29udGVudEluZGV0ZXJtaW5h dGVDaGFuZ2UpIHsKLSAgICAgICAgICAgIC8vIEFuIGFzeW5jIHN0eWxlIHJlY2FsYyBoYXMgYmVl biBzY2hlZHVsZWQuIExldCdzIG9ic2VydmUgaXQuCi0gICAgICAgICAgICBMT0dfV0lUSF9TVFJF QU0oQ29udGVudE9ic2VydmF0aW9uLCBzdHJlYW0gPDwgIkRPTVRpbWVyOjpmaXJlZCgiIDw8IG1f dGltZW91dElkIDw8ICIpOiB3YWl0IHVudGlsIG5leHQgc3R5bGUgcmVjYWxjIGZpcmVzLiIpOwot ICAgICAgICAgICAgY29udGVudENoYW5nZU9ic2VydmVyLnNldFNob3VsZE9ic2VydmVOZXh0U3R5 bGVSZWNhbGModHJ1ZSk7Ci0gICAgICAgIH0KLSAgICB9CisgICAgaWYgKHBhZ2UpCisgICAgICAg IHBhZ2UtPmNvbnRlbnRDaGFuZ2VPYnNlcnZlcigpLnN0b3BPYnNlcnZpbmdET01UaW1lckV4ZWN1 dGUoKnRoaXMpOwogI2VuZGlmCiAKICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZEZp cmVUaW1lcihjb29raWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKaW5kZXggYzllODdhMmMyMDA4NTFjYmU2 NGNiMmQ1OTQ2NTdiZWQwZTYzYmVkNi4uMmIxMzk4MDRjMjllNTJkOWIwMzExMDkyNTdmNDJmYTc3 NmJhYmRjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCkBAIC0xNTAsNiArMTUwLDEwIEBACiAjaW5jbHVk ZSAiU2VsZWN0aW9uUmVjdC5oIgogI2VuZGlmCiAKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQor I2luY2x1ZGUgIkNvbnRlbnRDaGFuZ2VPYnNlcnZlci5oIgorI2VuZGlmCisKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAogc3RhdGljIEhhc2hTZXQ8UGFnZSo+JiBhbGxQYWdlcygpCkBAIC0yMzIsNiAr MjM2LDkgQEAgUGFnZTo6UGFnZShQYWdlQ29uZmlndXJhdGlvbiYmIHBhZ2VDb25maWd1cmF0aW9u KQogICAgICwgbV9wZXJmb3JtYW5jZUxvZ2dpbmdDbGllbnQoV1RGTW92ZShwYWdlQ29uZmlndXJh dGlvbi5wZXJmb3JtYW5jZUxvZ2dpbmdDbGllbnQpKQogICAgICwgbV93ZWJHTFN0YXRlVHJhY2tl cihXVEZNb3ZlKHBhZ2VDb25maWd1cmF0aW9uLndlYkdMU3RhdGVUcmFja2VyKSkKICAgICAsIG1f bGliV2ViUlRDUHJvdmlkZXIoV1RGTW92ZShwYWdlQ29uZmlndXJhdGlvbi5saWJXZWJSVENQcm92 aWRlcikpCisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKyAgICAsIG1fY29udGVudENoYW5nZU9i c2VydmVyKHN0ZDo6bWFrZV91bmlxdWU8Q29udGVudENoYW5nZU9ic2VydmVyPigqdGhpcykpCisj ZW5kaWYKICAgICAsIG1fdmVydGljYWxTY3JvbGxFbGFzdGljaXR5KFNjcm9sbEVsYXN0aWNpdHlB bGxvd2VkKQogICAgICwgbV9ob3Jpem9udGFsU2Nyb2xsRWxhc3RpY2l0eShTY3JvbGxFbGFzdGlj aXR5QWxsb3dlZCkKICAgICAsIG1fZG9tVGltZXJBbGlnbm1lbnRJbnRlcnZhbChET01UaW1lcjo6 ZGVmYXVsdEFsaWdubWVudEludGVydmFsKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL1BhZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCmluZGV4IDIzZDJjYWY0NWVm MTQwMDcwNDI3OTAwOWFjOGQ2MjAxNWJkZWIwMDIuLjZlNTIxMjA3OGJmYTRjMmNiMzA0ODg0NzU2 YTllNGI5ZjVjOWY5MGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCkBAIC02NiwxMCArNjYsNiBAQAogI2luY2x1 ZGUgIk1lZGlhUGxheWJhY2tUYXJnZXRDb250ZXh0LmgiCiAjZW5kaWYKIAotI2lmIFBMQVRGT1JN KElPU19GQU1JTFkpCi0jaW5jbHVkZSAiQ29udGVudENoYW5nZU9ic2VydmVyLmgiCi0jZW5kaWYK LQogbmFtZXNwYWNlIEpTQyB7CiBjbGFzcyBEZWJ1Z2dlcjsKIH0KQEAgLTg5LDYgKzg1LDkgQEAg Y2xhc3MgQ2FjaGVTdG9yYWdlUHJvdmlkZXI7CiBjbGFzcyBDaHJvbWU7CiBjbGFzcyBDaHJvbWVD bGllbnQ7CiBjbGFzcyBDb2xvcjsKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorY2xhc3MgQ29u dGVudENoYW5nZU9ic2VydmVyOworI2VuZGlmCiBjbGFzcyBDb250ZXh0TWVudUNsaWVudDsKIGNs YXNzIENvbnRleHRNZW51Q29udHJvbGxlcjsKIGNsYXNzIENvb2tpZUphcjsKQEAgLTI1Niw3ICsy NTUsNyBAQCBwdWJsaWM6CiAgICAgUG9pbnRlckxvY2tDb250cm9sbGVyJiBwb2ludGVyTG9ja0Nv bnRyb2xsZXIoKSBjb25zdCB7IHJldHVybiAqbV9wb2ludGVyTG9ja0NvbnRyb2xsZXI7IH0KICNl bmRpZgogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAgQ29udGVudENoYW5nZU9ic2VydmVy JiBjb250ZW50Q2hhbmdlT2JzZXJ2ZXIoKSB7IHJldHVybiBtX2NvbnRlbnRDaGFuZ2VPYnNlcnZl cjsgfQorICAgIENvbnRlbnRDaGFuZ2VPYnNlcnZlciYgY29udGVudENoYW5nZU9ic2VydmVyKCkg eyByZXR1cm4gKm1fY29udGVudENoYW5nZU9ic2VydmVyOyB9CiAjZW5kaWYKICAgICBMaWJXZWJS VENQcm92aWRlciYgbGliV2ViUlRDUHJvdmlkZXIoKSB7IHJldHVybiBtX2xpYldlYlJUQ1Byb3Zp ZGVyLmdldCgpOyB9CiAgICAgUlRDQ29udHJvbGxlciYgcnRjQ29udHJvbGxlcigpIHsgcmV0dXJu IG1fcnRjQ29udHJvbGxlcjsgfQpAQCAtODE1LDcgKzgxNCw3IEBAIHByaXZhdGU6CiAKICNpZiBQ TEFURk9STShJT1NfRkFNSUxZKQogICAgIGJvb2wgbV9lbmNsb3NlZEluU2Nyb2xsYWJsZUFuY2Vz dG9yVmlldyB7IGZhbHNlIH07Ci0gICAgQ29udGVudENoYW5nZU9ic2VydmVyIG1fY29udGVudENo YW5nZU9ic2VydmVyOworICAgIHN0ZDo6dW5pcXVlX3B0cjxDb250ZW50Q2hhbmdlT2JzZXJ2ZXI+ IG1fY29udGVudENoYW5nZU9ic2VydmVyOwogI2VuZGlmCiAgICAgCiAgICAgYm9vbCBtX3VzZVN5 c3RlbUFwcGVhcmFuY2UgeyBmYWxzZSB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9D b250ZW50Q2hhbmdlT2JzZXJ2ZXIuaAppbmRleCAxMTg5ZTk2ODkyY2Y0YjUzZmU2Y2ZiNjgzOWEy Njc3NDk0ZTM2ZmNlLi43ODIzMmI0MWE4NmRiMTBjMThjM2ZiMTNhYmNlMjc3MzY2ODRmNDEwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuaApA QCAtMzIsMTAgKzMyLDE1IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIERPTVRpbWVy OworY2xhc3MgUGFnZTsKIAogY2xhc3MgQ29udGVudENoYW5nZU9ic2VydmVyIHsKIHB1YmxpYzoK LSAgICBDb250ZW50Q2hhbmdlT2JzZXJ2ZXIoKSA9IGRlZmF1bHQ7CisgICAgQ29udGVudENoYW5n ZU9ic2VydmVyKFBhZ2UmKTsKKworICAgIHZvaWQgcmVnaXN0ZXJET01UaW1lckZvckNvbnRlbnRP YnNlcnZhdGlvbklmTmVlZGVkKGNvbnN0IERPTVRpbWVyJiwgU2Vjb25kcyB0aW1lb3V0LCBib29s IHNpbmdsZVNob3QpOworICAgIHZvaWQgc3RhcnRPYnNlcnZpbmdET01UaW1lckV4ZWN1dGUoY29u c3QgRE9NVGltZXImKTsKKyAgICB2b2lkIHN0b3BPYnNlcnZpbmdET01UaW1lckV4ZWN1dGUoY29u c3QgRE9NVGltZXImKTsKIAogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc3RhcnRPYnNlcnZpbmdD b250ZW50Q2hhbmdlcygpOwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc3RvcE9ic2VydmluZ0Nv bnRlbnRDaGFuZ2VzKCk7CkBAIC00MywxMCArNDgsNyBAQCBwdWJsaWM6CiAKICAgICBXRUJDT1JF X0VYUE9SVCB2b2lkIHN0YXJ0T2JzZXJ2aW5nRE9NVGltZXJTY2hlZHVsaW5nKCk7CiAgICAgV0VC Q09SRV9FWFBPUlQgdm9pZCBzdG9wT2JzZXJ2aW5nRE9NVGltZXJTY2hlZHVsaW5nKCk7Ci0gICAg Ym9vbCBpc09ic2VydmluZ0RPTVRpbWVyU2NoZWR1bGluZygpOwogCi0gICAgV0VCQ09SRV9FWFBP UlQgdm9pZCBzdGFydE9ic2VydmluZ1N0eWxlUmVjYWxjU2NoZWR1bGluZygpOwotICAgIFdFQkNP UkVfRVhQT1JUIHZvaWQgc3RvcE9ic2VydmluZ1N0eWxlUmVjYWxjU2NoZWR1bGluZygpOwogICAg IGJvb2wgaXNPYnNlcnZpbmdTdHlsZVJlY2FsY1NjaGVkdWxpbmcoKTsKIAogICAgIHZvaWQgc2V0 U2hvdWxkT2JzZXJ2ZU5leHRTdHlsZVJlY2FsYyhib29sKTsKQEAgLTU1LDExICs1NywxOSBAQCBw dWJsaWM6CiAgICAgdm9pZCBzZXRPYnNlcnZlZENvbnRlbnRDaGFuZ2UoV0tDb250ZW50Q2hhbmdl KTsKICAgICBXRUJDT1JFX0VYUE9SVCBXS0NvbnRlbnRDaGFuZ2Ugb2JzZXJ2ZWRDb250ZW50Q2hh bmdlKCk7CiAKLSAgICB2b2lkIGFkZE9ic2VydmVkRE9NVGltZXIoRE9NVGltZXImKTsKLSAgICB2 b2lkIHJlbW92ZU9ic2VydmVkRE9NVGltZXIoRE9NVGltZXImKTsKLSAgICBib29sIGNvbnRhaW5z T2JzZXJ2ZWRET01UaW1lcihET01UaW1lciYpOworICAgIHZvaWQgcmVtb3ZlT2JzZXJ2ZWRET01U aW1lcihjb25zdCBET01UaW1lciYpOworICAgIGJvb2wgY29udGFpbnNPYnNlcnZlZERPTVRpbWVy KGNvbnN0IERPTVRpbWVyJik7CiAgICAgV0VCQ09SRV9FWFBPUlQgdW5zaWduZWQgY291bnRPZk9i c2VydmVkRE9NVGltZXJzKCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBjbGVhck9ic2VydmVk RE9NVGltZXJzKCk7CisKK3ByaXZhdGU6CisgICAgdm9pZCBhZGRPYnNlcnZlZERPTVRpbWVyKGNv bnN0IERPTVRpbWVyJik7CisgICAgYm9vbCBpc09ic2VydmluZ0RPTVRpbWVyU2NoZWR1bGluZygp OworCisgICAgdm9pZCBzdGFydE9ic2VydmluZ1N0eWxlUmVjYWxjU2NoZWR1bGluZygpOworICAg IHZvaWQgc3RvcE9ic2VydmluZ1N0eWxlUmVjYWxjU2NoZWR1bGluZygpOworCisgICAgUGFnZSYg bV9wYWdlOwogfTsKIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29u dGVudENoYW5nZU9ic2VydmVyLm1tIGIvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENo YW5nZU9ic2VydmVyLm1tCmluZGV4IDA5YmIzNGNjN2Y3MTY3OWM2NzUyNGJhY2U1NWZkODMwNzdk NDM5ZmEuLmQ4M2ZiOTY2YThlMTBmYWNiZjNkMTI2MDNkMDE2YjMyYmE1ODJhZjIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5tbQorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIubW0KQEAgLTI2 LDExICsyNiw2NiBAQAogI2ltcG9ydCAiQ29udGVudENoYW5nZU9ic2VydmVyLmgiCiAKICNpZiBQ TEFURk9STShJT1NfRkFNSUxZKQorI2ltcG9ydCAiQ2hyb21lLmgiCisjaW1wb3J0ICJDaHJvbWVD bGllbnQuaCIKICNpbXBvcnQgIkRPTVRpbWVyLmgiCisjaW1wb3J0ICJMb2dnaW5nLmgiCisjaW1w b3J0ICJQYWdlLmgiCiAjaW1wb3J0ICJXS0NvbnRlbnRPYnNlcnZhdGlvbkludGVybmFsLmgiCiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorQ29udGVudENoYW5nZU9ic2VydmVyOjpDb250ZW50Q2hh bmdlT2JzZXJ2ZXIoUGFnZSYgcGFnZSkKKyAgICA6IG1fcGFnZShwYWdlKQoreworfQorCit2b2lk IENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6cmVnaXN0ZXJET01UaW1lckZvckNvbnRlbnRPYnNlcnZh dGlvbklmTmVlZGVkKGNvbnN0IERPTVRpbWVyJiB0aW1lciwgU2Vjb25kcyB0aW1lb3V0LCBib29s IHNpbmdsZVNob3QpCit7CisgICAgaWYgKCFtX3BhZ2UubWFpbkZyYW1lKCkuZG9jdW1lbnQoKSkK KyAgICAgICAgcmV0dXJuOworICAgIGlmIChtX3BhZ2UubWFpbkZyYW1lKCkuZG9jdW1lbnQoKS0+ YWN0aXZlRE9NT2JqZWN0c0FyZVN1c3BlbmRlZCgpKQorICAgICAgICByZXR1cm47CisgICAgaWYg KHRpbWVvdXQgPiAyNTBfbXMgfHwgIXNpbmdsZVNob3QpCisgICAgICAgIHJldHVybjsKKyAgICBp ZiAoIWlzT2JzZXJ2aW5nRE9NVGltZXJTY2hlZHVsaW5nKCkpCisgICAgICAgIHJldHVybjsKKyAg ICBzZXRPYnNlcnZlZENvbnRlbnRDaGFuZ2UoV0tDb250ZW50SW5kZXRlcm1pbmF0ZUNoYW5nZSk7 CisgICAgYWRkT2JzZXJ2ZWRET01UaW1lcih0aW1lcik7CisgICAgTE9HX1dJVEhfU1RSRUFNKENv bnRlbnRPYnNlcnZhdGlvbiwgc3RyZWFtIDw8ICJyZWdpc3RlckRPTVRpbWVyRm9yQ29udGVudE9i c2VydmF0aW9uSWZOZWVkZWQ6IHJlZ2lzdGVkIHRoaXMgdGltZXI6ICgiIDw8ICZ0aW1lciA8PCAi KSBhbmQgb2JzZXJ2ZSB3aGVuIGl0IGZpcmVzLiIpOworfQorCit2b2lkIENvbnRlbnRDaGFuZ2VP YnNlcnZlcjo6c3RhcnRPYnNlcnZpbmdET01UaW1lckV4ZWN1dGUoY29uc3QgRE9NVGltZXImIHRp bWVyKQoreworICAgIGlmICghY29udGFpbnNPYnNlcnZlZERPTVRpbWVyKHRpbWVyKSkKKyAgICAg ICAgcmV0dXJuOworICAgIExPR19XSVRIX1NUUkVBTShDb250ZW50T2JzZXJ2YXRpb24sIHN0cmVh bSA8PCAic3RhcnRPYnNlcnZpbmdET01UaW1lckV4ZWN1dGU6IHN0YXJ0IG9ic2VydmluZyAoIiA8 PCAmdGltZXIgPDwgIikgdGltZXIgY2FsbGJhY2suIik7CisgICAgc3RhcnRPYnNlcnZpbmdDb250 ZW50Q2hhbmdlcygpOworICAgIHN0YXJ0T2JzZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5nKCk7 Cit9CisKK3ZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpzdG9wT2JzZXJ2aW5nRE9NVGltZXJF eGVjdXRlKGNvbnN0IERPTVRpbWVyJiB0aW1lcikKK3sKKyAgICBpZiAoIWNvbnRhaW5zT2JzZXJ2 ZWRET01UaW1lcih0aW1lcikpCisgICAgICAgIHJldHVybjsKKyAgICByZW1vdmVPYnNlcnZlZERP TVRpbWVyKHRpbWVyKTsKKyAgICBzdG9wT2JzZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5nKCk7 CisgICAgc3RvcE9ic2VydmluZ0NvbnRlbnRDaGFuZ2VzKCk7CisgICAgYXV0byBvYnNlcnZlZENv bnRlbnRDaGFuZ2UgPSB0aGlzLT5vYnNlcnZlZENvbnRlbnRDaGFuZ2UoKTsKKyAgICAvLyBDaGVj ayBpZiB0aGUgdGltZXIgY2FsbGJhY2sgdHJpZ2dlcmVkIGVpdGhlciBhIHN5bmMgb3IgYXN5bmMg c3R5bGUgdXBkYXRlLgorICAgIGF1dG8gaW5EZXRlcm1pbmVkU3RhdGUgPSBvYnNlcnZlZENvbnRl bnRDaGFuZ2UgPT0gV0tDb250ZW50VmlzaWJpbGl0eUNoYW5nZSB8fCAoIWNvdW50T2ZPYnNlcnZl ZERPTVRpbWVycygpICYmIG9ic2VydmVkQ29udGVudENoYW5nZSA9PSBXS0NvbnRlbnROb0NoYW5n ZSk7ICAKKyAgICAKKyAgICBMT0dfV0lUSF9TVFJFQU0oQ29udGVudE9ic2VydmF0aW9uLCBzdHJl YW0gPDwgInN0b3BPYnNlcnZpbmdET01UaW1lckV4ZWN1dGU6IHN0b3Agb2JzZXJ2aW5nICgiIDw8 ICZ0aW1lciA8PCAiKSB0aW1lciBjYWxsYmFjay4iKTsKKyAgICBpZiAoaW5EZXRlcm1pbmVkU3Rh dGUpIHsKKyAgICAgICAgTE9HX1dJVEhfU1RSRUFNKENvbnRlbnRPYnNlcnZhdGlvbiwgc3RyZWFt IDw8ICJzdG9wT2JzZXJ2aW5nRE9NVGltZXJFeGVjdXRlOiAoIiA8PCAmdGltZXIgPDwgIikgaW4g ZGV0ZXJtaW5lZCBzdGF0ZS4iKTsKKyAgICAgICAgbV9wYWdlLmNocm9tZSgpLmNsaWVudCgpLm9i c2VydmVkQ29udGVudENoYW5nZShtX3BhZ2UubWFpbkZyYW1lKCkpOworICAgIH0gZWxzZSBpZiAo b2JzZXJ2ZWRDb250ZW50Q2hhbmdlID09IFdLQ29udGVudEluZGV0ZXJtaW5hdGVDaGFuZ2UpIHsK KyAgICAgICAgLy8gQW4gYXN5bmMgc3R5bGUgcmVjYWxjIGhhcyBiZWVuIHNjaGVkdWxlZC4gTGV0 J3Mgb2JzZXJ2ZSBpdC4KKyAgICAgICAgTE9HX1dJVEhfU1RSRUFNKENvbnRlbnRPYnNlcnZhdGlv biwgc3RyZWFtIDw8ICJzdG9wT2JzZXJ2aW5nRE9NVGltZXJFeGVjdXRlOiAoIiA8PCAmdGltZXIg PDwgIikgd2FpdCB1bnRpbCBuZXh0IHN0eWxlIHJlY2FsYyBmaXJlcy4iKTsKKyAgICAgICAgc2V0 U2hvdWxkT2JzZXJ2ZU5leHRTdHlsZVJlY2FsYyh0cnVlKTsKKyAgICB9IAorfQorCiB2b2lkIENv bnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RhcnRPYnNlcnZpbmdDb250ZW50Q2hhbmdlcygpCiB7CiAg ICAgV0tTdGFydE9ic2VydmluZ0NvbnRlbnRDaGFuZ2VzKCk7CkBAIC0zOCwxMiArOTMsMTIgQEAg dm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnN0YXJ0T2JzZXJ2aW5nQ29udGVudENoYW5nZXMo KQogCiB2b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RvcE9ic2VydmluZ0NvbnRlbnRDaGFu Z2VzKCkKIHsKLSAgICBXS1N0b3BPYnNlcnZpbmdDb250ZW50Q2hhbmdlcygpOyAgIAorICAgIFdL U3RvcE9ic2VydmluZ0NvbnRlbnRDaGFuZ2VzKCk7CiB9CiAKIGJvb2wgQ29udGVudENoYW5nZU9i c2VydmVyOjppc09ic2VydmluZ0NvbnRlbnRDaGFuZ2VzKCkKIHsKLSAgICByZXR1cm4gV0tPYnNl cnZpbmdDb250ZW50Q2hhbmdlcygpOyAgIAorICAgIHJldHVybiBXS09ic2VydmluZ0NvbnRlbnRD aGFuZ2VzKCk7CiB9CiAKIHZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpzdGFydE9ic2Vydmlu Z0RPTVRpbWVyU2NoZWR1bGluZygpCkBAIC0xMDYsMTkgKzE2MSwxOSBAQCB2b2lkIENvbnRlbnRD aGFuZ2VPYnNlcnZlcjo6c2V0T2JzZXJ2ZWRDb250ZW50Q2hhbmdlKFdLQ29udGVudENoYW5nZSBj aGFuZ2UpCiAgICAgV0tTZXRPYnNlcnZlZENvbnRlbnRDaGFuZ2UoY2hhbmdlKTsKIH0KIAotYm9v bCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OmNvbnRhaW5zT2JzZXJ2ZWRET01UaW1lcihET01UaW1l ciYgdGltZXIpCitib29sIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6Y29udGFpbnNPYnNlcnZlZERP TVRpbWVyKGNvbnN0IERPTVRpbWVyJiB0aW1lcikKIHsKLSAgICByZXR1cm4gV2ViVGhyZWFkQ29u dGFpbnNPYnNlcnZlZERPTVRpbWVyKCZ0aW1lcik7CisgICAgcmV0dXJuIFdlYlRocmVhZENvbnRh aW5zT2JzZXJ2ZWRET01UaW1lcihjb25zdF9jYXN0PERPTVRpbWVyKj4oJnRpbWVyKSk7CiB9CiAK LXZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjphZGRPYnNlcnZlZERPTVRpbWVyKERPTVRpbWVy JiB0aW1lcikKK3ZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjphZGRPYnNlcnZlZERPTVRpbWVy KGNvbnN0IERPTVRpbWVyJiB0aW1lcikKIHsKLSAgICBXZWJUaHJlYWRBZGRPYnNlcnZlZERPTVRp bWVyKCZ0aW1lcik7CisgICAgV2ViVGhyZWFkQWRkT2JzZXJ2ZWRET01UaW1lcihjb25zdF9jYXN0 PERPTVRpbWVyKj4oJnRpbWVyKSk7CiB9CiAKLXZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpy ZW1vdmVPYnNlcnZlZERPTVRpbWVyKERPTVRpbWVyJiB0aW1lcikKK3ZvaWQgQ29udGVudENoYW5n ZU9ic2VydmVyOjpyZW1vdmVPYnNlcnZlZERPTVRpbWVyKGNvbnN0IERPTVRpbWVyJiB0aW1lcikK IHsKLSAgICBXZWJUaHJlYWRSZW1vdmVPYnNlcnZlZERPTVRpbWVyKCZ0aW1lcik7CisgICAgV2Vi VGhyZWFkUmVtb3ZlT2JzZXJ2ZWRET01UaW1lcihjb25zdF9jYXN0PERPTVRpbWVyKj4oJnRpbWVy KSk7CiB9CiAKIH0K 362931 2019-02-25 15:06:33 -0800 2019-02-25 15:12:02 -0800 Patch bug-194987-20190225150632.patch text/plain 15383 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyMDU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjNmYmQxZDk3YjM2YmZl MDAzMGM2OTY3MDM2Y2EzZDJkOWVhZWFjOC4uOTU5MjBmOWQwZjA4NTVmMTBhNzA0MWJiM2Q2NWYy NmQyM2JiYTAzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTAyLTI1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvbnRlbnRDaGFuZ2VPYnNl cnZlcl0gTW92ZSBvYnNlcnZpbmcgbG9naWMgZnJvbSBET01UaW1lciB0byBDb250ZW50Q2hhbmdl T2JzZXJ2ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5NDk4NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDgzNDI5MTA+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICBDb250ZW50IG9idnNlcnZhdGlvbiBsb2dp YyBzaG91bGQgYWxsIG1vdmUgdG8gdGhlIENvbnRlbnRDaGFuZ2VPYnNlcnZlciBjbGFzcy4KKwor ICAgICAgICAqIHBhZ2UvRE9NVGltZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RE9NVGltZXI6 Omluc3RhbGwpOgorICAgICAgICAoV2ViQ29yZTo6RE9NVGltZXI6OmZpcmVkKToKKyAgICAgICAg KiBwYWdlL1BhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6UGFnZSk6CisgICAgICAg ICogcGFnZS9QYWdlLmg6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpjb250ZW50Q2hhbmdlT2Jz ZXJ2ZXIpOgorICAgICAgICAqIHBhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5oOgorICAg ICAgICAqIHBhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5tbToKKyAgICAgICAgKFdlYkNv cmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6Q29udGVudENoYW5nZU9ic2VydmVyKToKKyAgICAg ICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6cmVnaXN0ZXJET01UaW1lckZvckNv bnRlbnRPYnNlcnZhdGlvbklmTmVlZGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFu Z2VPYnNlcnZlcjo6c3RhcnRPYnNlcnZpbmdET01UaW1lcik6CisgICAgICAgIChXZWJDb3JlOjpD b250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnN0b3BPYnNlcnZpbmdET01UaW1lcik6CisgICAgICAgIChX ZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OmNvbnRhaW5zT2JzZXJ2ZWRET01UaW1lcik6 CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OmFkZE9ic2VydmVkRE9N VGltZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjpyZW1vdmVP YnNlcnZlZERPTVRpbWVyKToKKwogMjAxOS0wMi0yNSAgSm9obiBXaWxhbmRlciAgPHdpbGFuZGVy QGFwcGxlLmNvbT4KIAogICAgICAgICBJbnRyb2R1Y2UgYW5kIGFkb3B0IG5ldyBjbGFzcyBSZWdp c3RyYWJsZURvbWFpbiBmb3IgZVRMRCsxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0RPTVRpbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NVGltZXIuY3BwCmluZGV4IDg5 NTJiODk1YjRhM2MxNGU1ZDNjODFlYjNkMzdlYzk4ZmFhOGQ0ZTkuLjU1NTg5MGZlMTFmM2FmNjgy M2YxNTU5OTEzMTFjN2RlOTE5NTQ4YmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RE9NVGltZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NVGltZXIuY3BwCkBAIC00 MiwxMCArNDIsNyBAQAogI2luY2x1ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KIAogI2lmIFBMQVRG T1JNKElPU19GQU1JTFkpCi0jaW5jbHVkZSAiQ2hyb21lLmgiCi0jaW5jbHVkZSAiQ2hyb21lQ2xp ZW50LmgiCiAjaW5jbHVkZSAiQ29udGVudENoYW5nZU9ic2VydmVyLmgiCi0jaW5jbHVkZSAiRnJh bWUuaCIKICNlbmRpZgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC0yMjQsMjUgKzIyMSw5IEBA IGludCBET01UaW1lcjo6aW5zdGFsbChTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0LCBz dGQ6OnVuaXF1ZV9wdHI8U2NoZWR1bGVkCiAgICAgLy8gS2VlcCB0cmFjayBvZiBuZXN0ZWQgdGlt ZXIgaW5zdGFsbHMuCiAgICAgaWYgKE5lc3RlZFRpbWVyc01hcCogbmVzdGVkVGltZXJzID0gTmVz dGVkVGltZXJzTWFwOjppbnN0YW5jZUZvckNvbnRleHQoY29udGV4dCkpCiAgICAgICAgIG5lc3Rl ZFRpbWVycy0+YWRkKHRpbWVyLT5tX3RpbWVvdXRJZCwgKnRpbWVyKTsKLQogI2lmIFBMQVRGT1JN KElPU19GQU1JTFkpCi0gICAgYXV0byBzdGFydE9ic2VydmluZ1RoaXNUaW1lcklmTmVlZGVkID0g WyZdIHsKLSAgICAgICAgaWYgKCFpczxEb2N1bWVudD4oY29udGV4dCkpCi0gICAgICAgICAgICBy ZXR1cm47Ci0gICAgICAgIGlmIChjb250ZXh0LmFjdGl2ZURPTU9iamVjdHNBcmVTdXNwZW5kZWQo KSkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgaWYgKHRpbWVvdXQgPiAyNTBfbXMgfHwg IXNpbmdsZVNob3QpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGF1dG8mIGNvbnRlbnRD aGFuZ2VPYnNlcnZlciA9IGRvd25jYXN0PERvY3VtZW50Pihjb250ZXh0KS5wYWdlKCktPmNvbnRl bnRDaGFuZ2VPYnNlcnZlcigpOwotICAgICAgICBpZiAoIWNvbnRlbnRDaGFuZ2VPYnNlcnZlci5p c09ic2VydmluZ0RPTVRpbWVyU2NoZWR1bGluZygpKQotICAgICAgICAgICAgcmV0dXJuOwotCi0g ICAgICAgIGNvbnRlbnRDaGFuZ2VPYnNlcnZlci5zZXRPYnNlcnZlZENvbnRlbnRDaGFuZ2UoV0tD b250ZW50SW5kZXRlcm1pbmF0ZUNoYW5nZSk7Ci0gICAgICAgIGNvbnRlbnRDaGFuZ2VPYnNlcnZl ci5hZGRPYnNlcnZlZERPTVRpbWVyKCp0aW1lcik7Ci0gICAgICAgIExPR19XSVRIX1NUUkVBTShD b250ZW50T2JzZXJ2YXRpb24sIHN0cmVhbSA8PCAiRE9NVGltZXI6Omluc3RhbGw6IHJlZ2lzdGVy IHRoaXMgdGltZXI6ICgiIDw8IHRpbWVyLT5tX3RpbWVvdXRJZCA8PCAiKSBhbmQgb2JzZXJ2ZSB3 aGVuIGl0IGZpcmVzLiIpOwotICAgIH07Ci0KLSAgICBzdGFydE9ic2VydmluZ1RoaXNUaW1lcklm TmVlZGVkKCk7CisgICAgaWYgKGlzPERvY3VtZW50Pihjb250ZXh0KSkKKyAgICAgICAgZG93bmNh c3Q8RG9jdW1lbnQ+KGNvbnRleHQpLnBhZ2UoKS0+Y29udGVudENoYW5nZU9ic2VydmVyKCkucmVn aXN0ZXJET01UaW1lckZvckNvbnRlbnRPYnNlcnZhdGlvbklmTmVlZGVkKCp0aW1lciwgdGltZW91 dCwgc2luZ2xlU2hvdCk7CiAjZW5kaWYKICAgICByZXR1cm4gdGltZXItPm1fdGltZW91dElkOwog fQpAQCAtMzQ4LDU0ICszMjksMjAgQEAgdm9pZCBET01UaW1lcjo6ZmlyZWQoKQogCiAgICAgY29u dGV4dC5yZW1vdmVUaW1lb3V0KG1fdGltZW91dElkKTsKIAotI2lmIFBMQVRGT1JNKElPU19GQU1J TFkpCi0gICAgYXV0byBpc09ic2VydmluZ0xhc3RUaW1lciA9IGZhbHNlOwotICAgIGF1dG8gc2hv dWxkQmVnaW5PYnNlcnZpbmdDaGFuZ2VzID0gZmFsc2U7Ci0gICAgUGFnZSogcGFnZSA9IG51bGxw dHI7Ci0gICAgaWYgKGlzPERvY3VtZW50Pihjb250ZXh0KSAmJiBkb3duY2FzdDxEb2N1bWVudD4o Y29udGV4dCkucGFnZSgpKSB7Ci0gICAgICAgIHBhZ2UgPSBkb3duY2FzdDxEb2N1bWVudD4oY29u dGV4dCkucGFnZSgpOwotICAgICAgICBhdXRvJiBjb250ZW50Q2hhbmdlT2JzZXJ2ZXIgPSBwYWdl LT5jb250ZW50Q2hhbmdlT2JzZXJ2ZXIoKTsKLSAgICAgICAgaXNPYnNlcnZpbmdMYXN0VGltZXIg PSBjb250ZW50Q2hhbmdlT2JzZXJ2ZXIuY291bnRPZk9ic2VydmVkRE9NVGltZXJzKCkgPT0gMTsK LSAgICAgICAgc2hvdWxkQmVnaW5PYnNlcnZpbmdDaGFuZ2VzID0gY29udGVudENoYW5nZU9ic2Vy dmVyLmNvbnRhaW5zT2JzZXJ2ZWRET01UaW1lcigqdGhpcyk7Ci0gICAgfQotCi0gICAgaWYgKHNo b3VsZEJlZ2luT2JzZXJ2aW5nQ2hhbmdlcykgewotICAgICAgICBBU1NFUlQocGFnZSk7Ci0gICAg ICAgIExPR19XSVRIX1NUUkVBTShDb250ZW50T2JzZXJ2YXRpb24sIHN0cmVhbSA8PCAiRE9NVGlt ZXI6OmZpcmVkOiBzdGFydCBvYnNlcnZpbmcgKCIgPDwgbV90aW1lb3V0SWQgPDwgIikgdGltZXIg Y2FsbGJhY2suIik7Ci0gICAgICAgIGF1dG8mIGNvbnRlbnRDaGFuZ2VPYnNlcnZlciA9IHBhZ2Ut PmNvbnRlbnRDaGFuZ2VPYnNlcnZlcigpOwotICAgICAgICBjb250ZW50Q2hhbmdlT2JzZXJ2ZXIu c3RhcnRPYnNlcnZpbmdDb250ZW50Q2hhbmdlcygpOwotICAgICAgICBjb250ZW50Q2hhbmdlT2Jz ZXJ2ZXIuc3RhcnRPYnNlcnZpbmdTdHlsZVJlY2FsY1NjaGVkdWxpbmcoKTsKLSAgICAgICAgY29u dGVudENoYW5nZU9ic2VydmVyLnJlbW92ZU9ic2VydmVkRE9NVGltZXIoKnRoaXMpOwotICAgIH0K LSNlbmRpZgotCiAgICAgLy8gS2VlcCB0cmFjayBuZXN0ZWQgdGltZXIgaW5zdGFsbHMuCiAgICAg TmVzdGVkVGltZXJzTWFwKiBuZXN0ZWRUaW1lcnMgPSBOZXN0ZWRUaW1lcnNNYXA6Omluc3RhbmNl Rm9yQ29udGV4dChjb250ZXh0KTsKICAgICBpZiAobmVzdGVkVGltZXJzKQogICAgICAgICBuZXN0 ZWRUaW1lcnMtPnN0YXJ0VHJhY2tpbmcoKTsKIAorI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisg ICAgUGFnZSogcGFnZSA9IGlzPERvY3VtZW50Pihjb250ZXh0KSA/IGRvd25jYXN0PERvY3VtZW50 Pihjb250ZXh0KS5wYWdlKCkgOiBudWxscHRyOworICAgIGlmIChwYWdlKQorICAgICAgICBwYWdl LT5jb250ZW50Q2hhbmdlT2JzZXJ2ZXIoKS5zdGFydE9ic2VydmluZ0RPTVRpbWVyRXhlY3V0ZSgq dGhpcyk7CisjZW5kaWYKICAgICBtX2FjdGlvbi0+ZXhlY3V0ZShjb250ZXh0KTsKLQogI2lmIFBM QVRGT1JNKElPU19GQU1JTFkpCi0gICAgaWYgKHNob3VsZEJlZ2luT2JzZXJ2aW5nQ2hhbmdlcykg ewotICAgICAgICBBU1NFUlQocGFnZSk7Ci0gICAgICAgIExPR19XSVRIX1NUUkVBTShDb250ZW50 T2JzZXJ2YXRpb24sIHN0cmVhbSA8PCAiRE9NVGltZXI6OmZpcmVkOiBzdG9wIG9ic2VydmluZyAo IiA8PCBtX3RpbWVvdXRJZCA8PCAiKSB0aW1lciBjYWxsYmFjay4iKTsKLSAgICAgICAgYXV0byYg Y29udGVudENoYW5nZU9ic2VydmVyID0gcGFnZS0+Y29udGVudENoYW5nZU9ic2VydmVyKCk7Ci0g ICAgICAgIGNvbnRlbnRDaGFuZ2VPYnNlcnZlci5zdG9wT2JzZXJ2aW5nU3R5bGVSZWNhbGNTY2hl ZHVsaW5nKCk7Ci0gICAgICAgIGNvbnRlbnRDaGFuZ2VPYnNlcnZlci5zdG9wT2JzZXJ2aW5nQ29u dGVudENoYW5nZXMoKTsKLQotICAgICAgICBhdXRvIG9ic2VydmVkQ29udGVudENoYW5nZSA9IGNv bnRlbnRDaGFuZ2VPYnNlcnZlci5vYnNlcnZlZENvbnRlbnRDaGFuZ2UoKTsKLSAgICAgICAgLy8g Q2hlY2sgaWYgdGhlIHRpbWVyIGNhbGxiYWNrIHRyaWdnZXJlZCBlaXRoZXIgYSBzeW5jIG9yIGFz eW5jIHN0eWxlIHVwZGF0ZS4KLSAgICAgICAgYXV0byBpbkRldGVybWluZWRTdGF0ZSA9IG9ic2Vy dmVkQ29udGVudENoYW5nZSA9PSBXS0NvbnRlbnRWaXNpYmlsaXR5Q2hhbmdlIHx8IChpc09ic2Vy dmluZ0xhc3RUaW1lciAmJiBvYnNlcnZlZENvbnRlbnRDaGFuZ2UgPT0gV0tDb250ZW50Tm9DaGFu Z2UpOyAgCi0gICAgICAgIGlmIChpbkRldGVybWluZWRTdGF0ZSkgewotICAgICAgICAgICAgTE9H X1dJVEhfU1RSRUFNKENvbnRlbnRPYnNlcnZhdGlvbiwgc3RyZWFtIDw8ICJET01UaW1lcjo6Zmly ZWQoIiA8PCBtX3RpbWVvdXRJZCA8PCAiKTogaW4gZGV0ZXJtaW5lZCBzdGF0ZS4iKTsKLSAgICAg ICAgICAgIHBhZ2UtPmNocm9tZSgpLmNsaWVudCgpLm9ic2VydmVkQ29udGVudENoYW5nZSgqZG93 bmNhc3Q8RG9jdW1lbnQ+KGNvbnRleHQpLmZyYW1lKCkpOwotICAgICAgICB9IGVsc2UgaWYgKG9i c2VydmVkQ29udGVudENoYW5nZSA9PSBXS0NvbnRlbnRJbmRldGVybWluYXRlQ2hhbmdlKSB7Ci0g ICAgICAgICAgICAvLyBBbiBhc3luYyBzdHlsZSByZWNhbGMgaGFzIGJlZW4gc2NoZWR1bGVkLiBM ZXQncyBvYnNlcnZlIGl0LgotICAgICAgICAgICAgTE9HX1dJVEhfU1RSRUFNKENvbnRlbnRPYnNl cnZhdGlvbiwgc3RyZWFtIDw8ICJET01UaW1lcjo6ZmlyZWQoIiA8PCBtX3RpbWVvdXRJZCA8PCAi KTogd2FpdCB1bnRpbCBuZXh0IHN0eWxlIHJlY2FsYyBmaXJlcy4iKTsKLSAgICAgICAgICAgIGNv bnRlbnRDaGFuZ2VPYnNlcnZlci5zZXRTaG91bGRPYnNlcnZlTmV4dFN0eWxlUmVjYWxjKHRydWUp OwotICAgICAgICB9Ci0gICAgfQorICAgIGlmIChwYWdlKQorICAgICAgICBwYWdlLT5jb250ZW50 Q2hhbmdlT2JzZXJ2ZXIoKS5zdG9wT2JzZXJ2aW5nRE9NVGltZXJFeGVjdXRlKCp0aGlzKTsKICNl bmRpZgogCiAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRGaXJlVGltZXIoY29va2ll KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1BhZ2UuY3BwCmluZGV4IDBlODc1Njk2NDVjN2EwYzUwYTVjYjI0Y2IzOGU3NmFh N2E5ZWFiYmMuLmRiNjYzOGY1NzJjYTJkZDRmMjIxYjhjYzViZWRlMjU2ODcwYjNlYmUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9QYWdlLmNwcApAQCAtMTQ5LDYgKzE0OSwxMCBAQAogI2luY2x1ZGUgIlNlbGVjdGlvblJl Y3QuaCIKICNlbmRpZgogCisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKyNpbmNsdWRlICJDb250 ZW50Q2hhbmdlT2JzZXJ2ZXIuaCIKKyNlbmRpZgorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHN0 YXRpYyBIYXNoU2V0PFBhZ2UqPiYgYWxsUGFnZXMoKQpAQCAtMjMxLDYgKzIzNSw5IEBAIFBhZ2U6 OlBhZ2UoUGFnZUNvbmZpZ3VyYXRpb24mJiBwYWdlQ29uZmlndXJhdGlvbikKICAgICAsIG1fcGVy Zm9ybWFuY2VMb2dnaW5nQ2xpZW50KFdURk1vdmUocGFnZUNvbmZpZ3VyYXRpb24ucGVyZm9ybWFu Y2VMb2dnaW5nQ2xpZW50KSkKICAgICAsIG1fd2ViR0xTdGF0ZVRyYWNrZXIoV1RGTW92ZShwYWdl Q29uZmlndXJhdGlvbi53ZWJHTFN0YXRlVHJhY2tlcikpCiAgICAgLCBtX2xpYldlYlJUQ1Byb3Zp ZGVyKFdURk1vdmUocGFnZUNvbmZpZ3VyYXRpb24ubGliV2ViUlRDUHJvdmlkZXIpKQorI2lmIFBM QVRGT1JNKElPU19GQU1JTFkpCisgICAgLCBtX2NvbnRlbnRDaGFuZ2VPYnNlcnZlcihzdGQ6Om1h a2VfdW5pcXVlPENvbnRlbnRDaGFuZ2VPYnNlcnZlcj4oKnRoaXMpKQorI2VuZGlmCiAgICAgLCBt X3ZlcnRpY2FsU2Nyb2xsRWxhc3RpY2l0eShTY3JvbGxFbGFzdGljaXR5QWxsb3dlZCkKICAgICAs IG1faG9yaXpvbnRhbFNjcm9sbEVsYXN0aWNpdHkoU2Nyb2xsRWxhc3RpY2l0eUFsbG93ZWQpCiAg ICAgLCBtX2RvbVRpbWVyQWxpZ25tZW50SW50ZXJ2YWwoRE9NVGltZXI6OmRlZmF1bHRBbGlnbm1l bnRJbnRlcnZhbCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmggYi9T b3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAppbmRleCBmNDNkNDU0MDM1NTdmMzExYWI5MWVmN2Jm NTE5MWRkOTc0ZGI2ZjRjLi41ZTI4NWFkYzU1M2Q0YzY3ZDA1OTFjYmZhZmU0ZmE1ZmNiMzhlZGI5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1BhZ2UuaApAQCAtNjcsMTAgKzY3LDYgQEAKICNpbmNsdWRlICJNZWRpYVBsYXli YWNrVGFyZ2V0Q29udGV4dC5oIgogI2VuZGlmCiAKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQot I2luY2x1ZGUgIkNvbnRlbnRDaGFuZ2VPYnNlcnZlci5oIgotI2VuZGlmCi0KIG5hbWVzcGFjZSBK U0MgewogY2xhc3MgRGVidWdnZXI7CiB9CkBAIC05MCw2ICs4Niw5IEBAIGNsYXNzIENhY2hlU3Rv cmFnZVByb3ZpZGVyOwogY2xhc3MgQ2hyb21lOwogY2xhc3MgQ2hyb21lQ2xpZW50OwogY2xhc3Mg Q29sb3I7CisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKK2NsYXNzIENvbnRlbnRDaGFuZ2VPYnNl cnZlcjsKKyNlbmRpZgogY2xhc3MgQ29udGV4dE1lbnVDbGllbnQ7CiBjbGFzcyBDb250ZXh0TWVu dUNvbnRyb2xsZXI7CiBjbGFzcyBDb29raWVKYXI7CkBAIC0yNTcsNyArMjU2LDcgQEAgcHVibGlj OgogICAgIFBvaW50ZXJMb2NrQ29udHJvbGxlciYgcG9pbnRlckxvY2tDb250cm9sbGVyKCkgY29u c3QgeyByZXR1cm4gKm1fcG9pbnRlckxvY2tDb250cm9sbGVyOyB9CiAjZW5kaWYKICNpZiBQTEFU Rk9STShJT1NfRkFNSUxZKQotICAgIENvbnRlbnRDaGFuZ2VPYnNlcnZlciYgY29udGVudENoYW5n ZU9ic2VydmVyKCkgeyByZXR1cm4gbV9jb250ZW50Q2hhbmdlT2JzZXJ2ZXI7IH0KKyAgICBDb250 ZW50Q2hhbmdlT2JzZXJ2ZXImIGNvbnRlbnRDaGFuZ2VPYnNlcnZlcigpIHsgcmV0dXJuICptX2Nv bnRlbnRDaGFuZ2VPYnNlcnZlcjsgfQogI2VuZGlmCiAgICAgTGliV2ViUlRDUHJvdmlkZXImIGxp YldlYlJUQ1Byb3ZpZGVyKCkgeyByZXR1cm4gbV9saWJXZWJSVENQcm92aWRlci5nZXQoKTsgfQog ICAgIFJUQ0NvbnRyb2xsZXImIHJ0Y0NvbnRyb2xsZXIoKSB7IHJldHVybiBtX3J0Y0NvbnRyb2xs ZXI7IH0KQEAgLTgxNiw3ICs4MTUsNyBAQCBwcml2YXRlOgogCiAjaWYgUExBVEZPUk0oSU9TX0ZB TUlMWSkKICAgICBib29sIG1fZW5jbG9zZWRJblNjcm9sbGFibGVBbmNlc3RvclZpZXcgeyBmYWxz ZSB9OwotICAgIENvbnRlbnRDaGFuZ2VPYnNlcnZlciBtX2NvbnRlbnRDaGFuZ2VPYnNlcnZlcjsK KyAgICBzdGQ6OnVuaXF1ZV9wdHI8Q29udGVudENoYW5nZU9ic2VydmVyPiBtX2NvbnRlbnRDaGFu Z2VPYnNlcnZlcjsKICNlbmRpZgogICAgIAogICAgIGJvb2wgbV91c2VTeXN0ZW1BcHBlYXJhbmNl IHsgZmFsc2UgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRD aGFuZ2VPYnNlcnZlci5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9i c2VydmVyLmgKaW5kZXggMTE4OWU5Njg5MmNmNGI1M2ZlNmNmYjY4MzlhMjY3NzQ5NGUzNmZjZS4u NzgyMzJiNDFhODZkYjEwYzE4YzNmYjEzYWJjZTI3NzM2Njg0ZjQxMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmgKQEAgLTMyLDEwICszMiwx NSBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBET01UaW1lcjsKK2NsYXNzIFBhZ2U7 CiAKIGNsYXNzIENvbnRlbnRDaGFuZ2VPYnNlcnZlciB7CiBwdWJsaWM6Ci0gICAgQ29udGVudENo YW5nZU9ic2VydmVyKCkgPSBkZWZhdWx0OworICAgIENvbnRlbnRDaGFuZ2VPYnNlcnZlcihQYWdl Jik7CisKKyAgICB2b2lkIHJlZ2lzdGVyRE9NVGltZXJGb3JDb250ZW50T2JzZXJ2YXRpb25JZk5l ZWRlZChjb25zdCBET01UaW1lciYsIFNlY29uZHMgdGltZW91dCwgYm9vbCBzaW5nbGVTaG90KTsK KyAgICB2b2lkIHN0YXJ0T2JzZXJ2aW5nRE9NVGltZXJFeGVjdXRlKGNvbnN0IERPTVRpbWVyJik7 CisgICAgdm9pZCBzdG9wT2JzZXJ2aW5nRE9NVGltZXJFeGVjdXRlKGNvbnN0IERPTVRpbWVyJik7 CiAKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHN0YXJ0T2JzZXJ2aW5nQ29udGVudENoYW5nZXMo KTsKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHN0b3BPYnNlcnZpbmdDb250ZW50Q2hhbmdlcygp OwpAQCAtNDMsMTAgKzQ4LDcgQEAgcHVibGljOgogCiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBz dGFydE9ic2VydmluZ0RPTVRpbWVyU2NoZWR1bGluZygpOwogICAgIFdFQkNPUkVfRVhQT1JUIHZv aWQgc3RvcE9ic2VydmluZ0RPTVRpbWVyU2NoZWR1bGluZygpOwotICAgIGJvb2wgaXNPYnNlcnZp bmdET01UaW1lclNjaGVkdWxpbmcoKTsKIAotICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc3RhcnRP YnNlcnZpbmdTdHlsZVJlY2FsY1NjaGVkdWxpbmcoKTsKLSAgICBXRUJDT1JFX0VYUE9SVCB2b2lk IHN0b3BPYnNlcnZpbmdTdHlsZVJlY2FsY1NjaGVkdWxpbmcoKTsKICAgICBib29sIGlzT2JzZXJ2 aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5nKCk7CiAKICAgICB2b2lkIHNldFNob3VsZE9ic2VydmVO ZXh0U3R5bGVSZWNhbGMoYm9vbCk7CkBAIC01NSwxMSArNTcsMTkgQEAgcHVibGljOgogICAgIHZv aWQgc2V0T2JzZXJ2ZWRDb250ZW50Q2hhbmdlKFdLQ29udGVudENoYW5nZSk7CiAgICAgV0VCQ09S RV9FWFBPUlQgV0tDb250ZW50Q2hhbmdlIG9ic2VydmVkQ29udGVudENoYW5nZSgpOwogCi0gICAg dm9pZCBhZGRPYnNlcnZlZERPTVRpbWVyKERPTVRpbWVyJik7Ci0gICAgdm9pZCByZW1vdmVPYnNl cnZlZERPTVRpbWVyKERPTVRpbWVyJik7Ci0gICAgYm9vbCBjb250YWluc09ic2VydmVkRE9NVGlt ZXIoRE9NVGltZXImKTsKKyAgICB2b2lkIHJlbW92ZU9ic2VydmVkRE9NVGltZXIoY29uc3QgRE9N VGltZXImKTsKKyAgICBib29sIGNvbnRhaW5zT2JzZXJ2ZWRET01UaW1lcihjb25zdCBET01UaW1l ciYpOwogICAgIFdFQkNPUkVfRVhQT1JUIHVuc2lnbmVkIGNvdW50T2ZPYnNlcnZlZERPTVRpbWVy cygpOwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgY2xlYXJPYnNlcnZlZERPTVRpbWVycygpOwor Citwcml2YXRlOgorICAgIHZvaWQgYWRkT2JzZXJ2ZWRET01UaW1lcihjb25zdCBET01UaW1lciYp OworICAgIGJvb2wgaXNPYnNlcnZpbmdET01UaW1lclNjaGVkdWxpbmcoKTsKKworICAgIHZvaWQg c3RhcnRPYnNlcnZpbmdTdHlsZVJlY2FsY1NjaGVkdWxpbmcoKTsKKyAgICB2b2lkIHN0b3BPYnNl cnZpbmdTdHlsZVJlY2FsY1NjaGVkdWxpbmcoKTsKKworICAgIFBhZ2UmIG1fcGFnZTsKIH07CiAK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNl cnZlci5tbSBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5t bQppbmRleCAwOWJiMzRjYzdmNzE2NzljNjc1MjRiYWNlNTVmZDgzMDc3ZDQzOWZhLi43MDBhNmQx YjZiMTkxOGFiNzIxYjc0Njg5ODk4ZjY0N2Y1Yjk5MmMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIubW0KKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLm1tCkBAIC0yNiwxMSArMjYsNjYgQEAK ICNpbXBvcnQgIkNvbnRlbnRDaGFuZ2VPYnNlcnZlci5oIgogCiAjaWYgUExBVEZPUk0oSU9TX0ZB TUlMWSkKKyNpbXBvcnQgIkNocm9tZS5oIgorI2ltcG9ydCAiQ2hyb21lQ2xpZW50LmgiCiAjaW1w b3J0ICJET01UaW1lci5oIgorI2ltcG9ydCAiTG9nZ2luZy5oIgorI2ltcG9ydCAiUGFnZS5oIgog I2ltcG9ydCAiV0tDb250ZW50T2JzZXJ2YXRpb25JbnRlcm5hbC5oIgogCiBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKK0NvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6Q29udGVudENoYW5nZU9ic2VydmVyKFBh Z2UmIHBhZ2UpCisgICAgOiBtX3BhZ2UocGFnZSkKK3sKK30KKwordm9pZCBDb250ZW50Q2hhbmdl T2JzZXJ2ZXI6OnJlZ2lzdGVyRE9NVGltZXJGb3JDb250ZW50T2JzZXJ2YXRpb25JZk5lZWRlZChj b25zdCBET01UaW1lciYgdGltZXIsIFNlY29uZHMgdGltZW91dCwgYm9vbCBzaW5nbGVTaG90KQor eworICAgIGlmICghbV9wYWdlLm1haW5GcmFtZSgpLmRvY3VtZW50KCkpCisgICAgICAgIHJldHVy bjsKKyAgICBpZiAobV9wYWdlLm1haW5GcmFtZSgpLmRvY3VtZW50KCktPmFjdGl2ZURPTU9iamVj dHNBcmVTdXNwZW5kZWQoKSkKKyAgICAgICAgcmV0dXJuOworICAgIGlmICh0aW1lb3V0ID4gMjUw X21zIHx8ICFzaW5nbGVTaG90KQorICAgICAgICByZXR1cm47CisgICAgaWYgKCFpc09ic2Vydmlu Z0RPTVRpbWVyU2NoZWR1bGluZygpKQorICAgICAgICByZXR1cm47CisgICAgc2V0T2JzZXJ2ZWRD b250ZW50Q2hhbmdlKFdLQ29udGVudEluZGV0ZXJtaW5hdGVDaGFuZ2UpOworICAgIGFkZE9ic2Vy dmVkRE9NVGltZXIodGltZXIpOworICAgIExPR19XSVRIX1NUUkVBTShDb250ZW50T2JzZXJ2YXRp b24sIHN0cmVhbSA8PCAicmVnaXN0ZXJET01UaW1lckZvckNvbnRlbnRPYnNlcnZhdGlvbklmTmVl ZGVkOiByZWdpc3RlZCB0aGlzIHRpbWVyOiAoIiA8PCAmdGltZXIgPDwgIikgYW5kIG9ic2VydmUg d2hlbiBpdCBmaXJlcy4iKTsKK30KKwordm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnN0YXJ0 T2JzZXJ2aW5nRE9NVGltZXJFeGVjdXRlKGNvbnN0IERPTVRpbWVyJiB0aW1lcikKK3sKKyAgICBp ZiAoIWNvbnRhaW5zT2JzZXJ2ZWRET01UaW1lcih0aW1lcikpCisgICAgICAgIHJldHVybjsKKyAg ICBMT0dfV0lUSF9TVFJFQU0oQ29udGVudE9ic2VydmF0aW9uLCBzdHJlYW0gPDwgInN0YXJ0T2Jz ZXJ2aW5nRE9NVGltZXJFeGVjdXRlOiBzdGFydCBvYnNlcnZpbmcgKCIgPDwgJnRpbWVyIDw8ICIp IHRpbWVyIGNhbGxiYWNrLiIpOworICAgIHN0YXJ0T2JzZXJ2aW5nQ29udGVudENoYW5nZXMoKTsK KyAgICBzdGFydE9ic2VydmluZ1N0eWxlUmVjYWxjU2NoZWR1bGluZygpOworfQorCit2b2lkIENv bnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RvcE9ic2VydmluZ0RPTVRpbWVyRXhlY3V0ZShjb25zdCBE T01UaW1lciYgdGltZXIpCit7CisgICAgaWYgKCFjb250YWluc09ic2VydmVkRE9NVGltZXIodGlt ZXIpKQorICAgICAgICByZXR1cm47CisgICAgcmVtb3ZlT2JzZXJ2ZWRET01UaW1lcih0aW1lcik7 CisgICAgc3RvcE9ic2VydmluZ1N0eWxlUmVjYWxjU2NoZWR1bGluZygpOworICAgIHN0b3BPYnNl cnZpbmdDb250ZW50Q2hhbmdlcygpOworICAgIGF1dG8gb2JzZXJ2ZWRDb250ZW50Q2hhbmdlID0g dGhpcy0+b2JzZXJ2ZWRDb250ZW50Q2hhbmdlKCk7CisgICAgLy8gQ2hlY2sgaWYgdGhlIHRpbWVy IGNhbGxiYWNrIHRyaWdnZXJlZCBlaXRoZXIgYSBzeW5jIG9yIGFzeW5jIHN0eWxlIHVwZGF0ZS4K KyAgICBhdXRvIGluRGV0ZXJtaW5lZFN0YXRlID0gb2JzZXJ2ZWRDb250ZW50Q2hhbmdlID09IFdL Q29udGVudFZpc2liaWxpdHlDaGFuZ2UgfHwgKCFjb3VudE9mT2JzZXJ2ZWRET01UaW1lcnMoKSAm JiBvYnNlcnZlZENvbnRlbnRDaGFuZ2UgPT0gV0tDb250ZW50Tm9DaGFuZ2UpOyAgCisKKyAgICBM T0dfV0lUSF9TVFJFQU0oQ29udGVudE9ic2VydmF0aW9uLCBzdHJlYW0gPDwgInN0b3BPYnNlcnZp bmdET01UaW1lckV4ZWN1dGU6IHN0b3Agb2JzZXJ2aW5nICgiIDw8ICZ0aW1lciA8PCAiKSB0aW1l ciBjYWxsYmFjay4iKTsKKyAgICBpZiAoaW5EZXRlcm1pbmVkU3RhdGUpIHsKKyAgICAgICAgTE9H X1dJVEhfU1RSRUFNKENvbnRlbnRPYnNlcnZhdGlvbiwgc3RyZWFtIDw8ICJzdG9wT2JzZXJ2aW5n RE9NVGltZXJFeGVjdXRlOiAoIiA8PCAmdGltZXIgPDwgIikgaW4gZGV0ZXJtaW5lZCBzdGF0ZS4i KTsKKyAgICAgICAgbV9wYWdlLmNocm9tZSgpLmNsaWVudCgpLm9ic2VydmVkQ29udGVudENoYW5n ZShtX3BhZ2UubWFpbkZyYW1lKCkpOworICAgIH0gZWxzZSBpZiAob2JzZXJ2ZWRDb250ZW50Q2hh bmdlID09IFdLQ29udGVudEluZGV0ZXJtaW5hdGVDaGFuZ2UpIHsKKyAgICAgICAgLy8gQW4gYXN5 bmMgc3R5bGUgcmVjYWxjIGhhcyBiZWVuIHNjaGVkdWxlZC4gTGV0J3Mgb2JzZXJ2ZSBpdC4KKyAg ICAgICAgTE9HX1dJVEhfU1RSRUFNKENvbnRlbnRPYnNlcnZhdGlvbiwgc3RyZWFtIDw8ICJzdG9w T2JzZXJ2aW5nRE9NVGltZXJFeGVjdXRlOiAoIiA8PCAmdGltZXIgPDwgIikgd2FpdCB1bnRpbCBu ZXh0IHN0eWxlIHJlY2FsYyBmaXJlcy4iKTsKKyAgICAgICAgc2V0U2hvdWxkT2JzZXJ2ZU5leHRT dHlsZVJlY2FsYyh0cnVlKTsKKyAgICB9Cit9CisKIHZvaWQgQ29udGVudENoYW5nZU9ic2VydmVy OjpzdGFydE9ic2VydmluZ0NvbnRlbnRDaGFuZ2VzKCkKIHsKICAgICBXS1N0YXJ0T2JzZXJ2aW5n Q29udGVudENoYW5nZXMoKTsKQEAgLTM4LDEyICs5MywxMiBAQCB2b2lkIENvbnRlbnRDaGFuZ2VP YnNlcnZlcjo6c3RhcnRPYnNlcnZpbmdDb250ZW50Q2hhbmdlcygpCiAKIHZvaWQgQ29udGVudENo YW5nZU9ic2VydmVyOjpzdG9wT2JzZXJ2aW5nQ29udGVudENoYW5nZXMoKQogewotICAgIFdLU3Rv cE9ic2VydmluZ0NvbnRlbnRDaGFuZ2VzKCk7ICAgCisgICAgV0tTdG9wT2JzZXJ2aW5nQ29udGVu dENoYW5nZXMoKTsKIH0KIAogYm9vbCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OmlzT2JzZXJ2aW5n Q29udGVudENoYW5nZXMoKQogewotICAgIHJldHVybiBXS09ic2VydmluZ0NvbnRlbnRDaGFuZ2Vz KCk7ICAgCisgICAgcmV0dXJuIFdLT2JzZXJ2aW5nQ29udGVudENoYW5nZXMoKTsKIH0KIAogdm9p ZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnN0YXJ0T2JzZXJ2aW5nRE9NVGltZXJTY2hlZHVsaW5n KCkKQEAgLTEwNiwxOSArMTYxLDE5IEBAIHZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpzZXRP YnNlcnZlZENvbnRlbnRDaGFuZ2UoV0tDb250ZW50Q2hhbmdlIGNoYW5nZSkKICAgICBXS1NldE9i c2VydmVkQ29udGVudENoYW5nZShjaGFuZ2UpOwogfQogCi1ib29sIENvbnRlbnRDaGFuZ2VPYnNl cnZlcjo6Y29udGFpbnNPYnNlcnZlZERPTVRpbWVyKERPTVRpbWVyJiB0aW1lcikKK2Jvb2wgQ29u dGVudENoYW5nZU9ic2VydmVyOjpjb250YWluc09ic2VydmVkRE9NVGltZXIoY29uc3QgRE9NVGlt ZXImIHRpbWVyKQogewotICAgIHJldHVybiBXZWJUaHJlYWRDb250YWluc09ic2VydmVkRE9NVGlt ZXIoJnRpbWVyKTsKKyAgICByZXR1cm4gV2ViVGhyZWFkQ29udGFpbnNPYnNlcnZlZERPTVRpbWVy KGNvbnN0X2Nhc3Q8RE9NVGltZXIqPigmdGltZXIpKTsKIH0KIAotdm9pZCBDb250ZW50Q2hhbmdl T2JzZXJ2ZXI6OmFkZE9ic2VydmVkRE9NVGltZXIoRE9NVGltZXImIHRpbWVyKQordm9pZCBDb250 ZW50Q2hhbmdlT2JzZXJ2ZXI6OmFkZE9ic2VydmVkRE9NVGltZXIoY29uc3QgRE9NVGltZXImIHRp bWVyKQogewotICAgIFdlYlRocmVhZEFkZE9ic2VydmVkRE9NVGltZXIoJnRpbWVyKTsKKyAgICBX ZWJUaHJlYWRBZGRPYnNlcnZlZERPTVRpbWVyKGNvbnN0X2Nhc3Q8RE9NVGltZXIqPigmdGltZXIp KTsKIH0KIAotdm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnJlbW92ZU9ic2VydmVkRE9NVGlt ZXIoRE9NVGltZXImIHRpbWVyKQordm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnJlbW92ZU9i c2VydmVkRE9NVGltZXIoY29uc3QgRE9NVGltZXImIHRpbWVyKQogewotICAgIFdlYlRocmVhZFJl bW92ZU9ic2VydmVkRE9NVGltZXIoJnRpbWVyKTsKKyAgICBXZWJUaHJlYWRSZW1vdmVPYnNlcnZl ZERPTVRpbWVyKGNvbnN0X2Nhc3Q8RE9NVGltZXIqPigmdGltZXIpKTsKIH0KIAogfQo=