59054 2011-04-20 18:02:20 -0700 WebKit2: Unconfirmed inline input session persists after reload 2011-04-21 11:34:06 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Mac OS X 10.6 RESOLVED FIXED InRadar P2 Normal --- 1 ap ap abarth enrica eric webkit.review.bot oldest_to_newest 389707 0 ap 2011-04-20 18:02:20 -0700 We don't inform input methods when we abandon inline input, so they keep thinking that we have one. Steps to reproduce: 1. Enable Kotoeri Hiragana IM (or any other one that uses inline input). 2. Open www.baidu.com (or any other site with forms or contenteditable). 3. Type anything, don't confirm the session. 4. Press Cmd+R. 5. Type more. Results: text typed into the old page re-appears on the new one. We should be calling -[NSTextInputContext discardMarkedText] at appropriate moments. <rdar://problem/9291086> 389717 1 90464 ap 2011-04-20 18:19:59 -0700 Created attachment 90464 proposed fix 389839 2 90464 mjs 2011-04-20 21:53:03 -0700 Comment on attachment 90464 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=90464&action=review r=me If either of the FIXMEs is a really bug, please file a follow-up. > Source/WebKit2/UIProcess/WebPageProxy.cpp:1545 > + // FIXME: didCommitLoadForFrame comes too late when restoring a page from b/f cache, making us disable secure event mode in password fields. > + // FIXME: A load going on in one frame shouldn't affect typing in sibling frames. Do these FIXMEs represent real bugs that can occur in practice? 390188 3 ap 2011-04-21 11:29:47 -0700 Yes - filed bugs for those. Committed <http://trac.webkit.org/changeset/84526>. 390194 4 webkit.review.bot 2011-04-21 11:34:06 -0700 http://trac.webkit.org/changeset/84526 might have broken EFL Linux Release (Build) 90464 2011-04-20 18:19:59 -0700 2011-04-20 21:53:03 -0700 proposed fix ResetComposition.txt text/plain 16431 ap SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg0NDQ0KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNTcgQEAKKzIwMTEtMDQtMjAgIEFsZXhleSBQ cm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2ViS2l0MjogVW5jb25maXJtZWQgaW5saW5lIGlucHV0IHNl c3Npb24gcGVyc2lzdHMgYWZ0ZXIgcmVsb2FkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD01OTA1NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vOTI5MTA4 Nj4KKworICAgICAgICBNYWtlcyB0aGUgaW5saW5lIGlucHV0IGdldCBwcm9wZXJseSBjb25maXJt ZWQgb3IgZGlzY2FyZGVkIHdoZW4gY2hhbmdpbmcgc2VsZWN0aW9uLAorICAgICAgICBuYXZpZ2F0 aW5nIHRvIGFub3RoZXIgcGFnZSwgZm9jdXNpbmcgYW5vdGhlciB2aWV3IGluIHRoZSB3aW5kb3cs IG9yIGFmdGVyIGEgd2ViIHByb2Nlc3MKKyAgICAgICAgY3Jhc2guCisKKyAgICAgICAgKiBTaGFy ZWQvRWRpdG9yU3RhdGUuaDogKFdlYktpdDo6RWRpdG9yU3RhdGU6OkVkaXRvclN0YXRlKToKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6IChXZWJLaXQ6OldlYlBhZ2U6 OmVkaXRvclN0YXRlKToKKyAgICAgICAgQWRkZWQgYSB2YXJpYWJsZSB0aGF0IEVkaXRvciBzZXRz IHdoaWxlIHByb2Nlc3NpbmcgaW5wdXQgbWV0aG9kIGNhbGxzLiBXZSBkb24ndCB3YW50CisgICAg ICAgIHNlbGVjdGlvbiBjaGFuZ2VzIGNhdXNlZCBieSAtc2V0TWFya2VkVGV4dDogZGlzY2FyZCB0 aGUgY29tcG9zaXRpb24hCisgICAgICAgIAorICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlQ2xpZW50 Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwuaDoKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5tbToKKyAgICAgICAgKFdlYktp dDo6UGFnZUNsaWVudEltcGw6OnVwZGF0ZVRleHRJbnB1dFN0YXRlKToKKyAgICAgICAgKFdlYktp dDo6UGFnZUNsaWVudEltcGw6OnJlc2V0VGV4dElucHV0U3RhdGUpOgorICAgICAgICBFeHRlbmRl ZCB1cGRhdGVTZWN1cmVJbnB1dFN0YXRlKCkgdG8gcG90ZW50aWFsbHkgY29uZmlybSB0aGUgY3Vy cmVudCBpbmxpbmUgaW5wdXQgc2Vzc2lvbi4KKyAgICAgICAgQWRkZWQgcmVzZXRUZXh0SW5wdXRT dGF0ZSwgd2hpY2ggaXMgdG8gYmUgY2FsbGVkIHdoZW4gd2UgZ2V0IG91dCBvZiB0aGUgY3VycmVu dCB3ZWIgcGFnZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbToKKyAg ICAgICAgKC1bV0tWaWV3IHJlc2lnbkZpcnN0UmVzcG9uZGVyXSk6IEp1c3QgY2FsbCBfcmVzZXRU ZXh0SW5wdXRTdGF0ZSBpbnN0ZWFkIG9mIGRlYWxpbmcgd2l0aAorICAgICAgICBpbnB1dCBzdGF0 ZSBoZXJlLgorICAgICAgICAoLVtXS1ZpZXcgX3VwZGF0ZVNlY3VyZUlucHV0U3RhdGVdKTogVXNl IF9pc0ZvY3VzZWQgdG8gbWFrZSB0aGUgY29kZSBzaW1wbGVyLgorICAgICAgICAoLVtXS1ZpZXcg X3VwZGF0ZVRleHRJbnB1dFN0YXRlSW5jbHVkaW5nU2VjdXJlSW5wdXRTdGF0ZTpdKTogQ29uZmly bSB0aGUgY3VycmVudCBpbmxpbmUKKyAgICAgICAgaW5wdXQgc2Vzc2lvbiBpZiBzZWxlY3Rpb24g Y2hhbmdlZCBmb3IgYW55IG90aGVyIHJlYXNvbiBidXQgYW4gaW5wdXQgbWV0aG9kIGNoYW5naW5n IHRoZQorICAgICAgICBjb21wb3NpdGlvbi4gV2Ugd2lsbCB3YW50IHRvIGRvIG90aGVyIHdvcmsg aGVyZSwgbGlrZSBkaXNtaXNzaW5nIGEgZGljdGlvbmFyeSBwb3AtdXAsCisgICAgICAgIHVwZGF0 aW5nIGEgZm9udCBwYW5lbCBldGMuCisgICAgICAgICgtW1dLVmlldyBfcmVzZXRUZXh0SW5wdXRT dGF0ZV0pOiBBZGRlZC4gV2UgZG9uJ3Qgd2FudCBzZWN1cmUgdGV4dCBpbnB1dCBwZXJzaXN0IGFm dGVyCisgICAgICAgIG5hdmlnYXRpb25zLCBjcmFzaGVzIGFuIHN1Y2gsIGFuZCB3ZSBhbHNvIGRv bid0IHdhbnQgaW5wdXQgbWV0aG9kcyB0byByZW1lbWJlciBpbmxpbmUgaW5wdXQKKyAgICAgICAg c3RhdGUuIFJlbHlpbmcgb24gc2VsZWN0aW9uIGNoYW5nZWQgbm90aWZpY2F0aW9ucyBpcyBmcmFn aWxlIGFuZCBpbnN1ZmZpY2llbnQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9XS1Zp ZXdJbnRlcm5hbC5oOiBBZGRlZCBpbnRlcm5hbCBmdW5jdGlvbnMgdG8ga2VlcCB0aGUgYnVpbGQg dW5icm9rZW4uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRDb21taXRMb2FkRm9yRnJhbWUpOiBUaGlzIGlz IHRoZSBiZXN0IGNoYW5jZSB3ZSBoYXZlIHRvIHJlc2V0IGlucHV0CisgICAgICAgIHN0YXRlIGZv ciBhIG5ldyBwYWdlLiBUaGlzIGRvZXNuJ3Qgd29yayB3ZWxsIGZvciBjYWNoZWQgcGFnZSBsb2Fk cywgYnV0IFdLMSBpcyBxdWl0ZSBicm9rZW4KKyAgICAgICAgaW4gdGhhdCBjYXNlLCB0b28uCisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZWRpdG9yU3RhdGVDaGFuZ2VkKTogTW92ZWQg c29tZSBsb2dpYyB1cCB0byB0aGUgY2xpZW50LCBzaW5jZSB0aGUKKyAgICAgICAgZnVuY3Rpb24g bm93IGRvZXMgbXVjaCBtb3JlIHRoYW4gYmVmb3JlLgorCisgICAgICAgICogVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1t OiAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNvbmZpcm1Db21wb3NpdGlvbldpdGhvdXREaXN0dXJi aW5nU2VsZWN0aW9uKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluOgorICAgICAg ICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbTogKFdlYktpdDo6V2ViUGFn ZTo6Y29uZmlybUNvbXBvc2l0aW9uV2l0aG91dERpc3R1cmJpbmdTZWxlY3Rpb24pOgorICAgICAg ICBBZGRlZCBjb25maXJtQ29tcG9zaXRpb25XaXRob3V0RGlzdHVyYmluZ1NlbGVjdGlvbigpLiBX aGVuIHdlIGNvbmZpcm0gdGhlIGNvbXBvc2l0aW9uIGR1ZQorICAgICAgICB0byBzZWxlY3Rpb24g Y2hhbmdlLCB3ZSBvYnZpc291bHkgZG9uJ3Qgd2FudCB0aGUgc2VsZWN0aW9uIHRvIG1vdmUgYmFj ay4KKwogMjAxMS0wNC0yMCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9T aGFyZWQvRWRpdG9yU3RhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQv RWRpdG9yU3RhdGUuaAkocmV2aXNpb24gODQzOTkpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQv RWRpdG9yU3RhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtMzksNiArMzksNyBAQCBzdHJ1Y3QgRWRp dG9yU3RhdGUgewogICAgICAgICAsIGlzQ29udGVudFJpY2hseUVkaXRhYmxlKGZhbHNlKQogICAg ICAgICAsIGlzSW5QYXNzd29yZEZpZWxkKGZhbHNlKQogICAgICAgICAsIGhhc0NvbXBvc2l0aW9u KGZhbHNlKQorICAgICAgICAsIHNob3VsZElnbm9yZUNvbXBvc2l0aW9uU2VsZWN0aW9uQ2hhbmdl KGZhbHNlKQogICAgIHsKICAgICB9CiAKQEAgLTQ4LDYgKzQ5LDcgQEAgc3RydWN0IEVkaXRvclN0 YXRlIHsKICAgICBib29sIGlzQ29udGVudFJpY2hseUVkaXRhYmxlOwogICAgIGJvb2wgaXNJblBh c3N3b3JkRmllbGQ7CiAgICAgYm9vbCBoYXNDb21wb3NpdGlvbjsKKyAgICBib29sIHNob3VsZEln bm9yZUNvbXBvc2l0aW9uU2VsZWN0aW9uQ2hhbmdlOwogfTsKIAogfQpJbmRleDogU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCShyZXZpc2lvbiA4NDM5OSkKKysrIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTEwMyw3ICsxMDMs OCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIGludGVycHJldEtleUV2ZW50KGNvbnN0IE5h dGl2ZVdlYktleWJvYXJkRXZlbnQmLCBWZWN0b3I8V2ViQ29yZTo6S2V5cHJlc3NDb21tYW5kPiYp ID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgZXhlY3V0ZVNhdmVkQ29tbWFuZEJ5U2VsZWN0b3IoY29u c3QgU3RyaW5nJiBzZWxlY3RvcikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBzZXREcmFnSW1hZ2Uo Y29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIGNsaWVudFBvc2l0aW9uLCBQYXNzUmVmUHRyPFNoYXJl YWJsZUJpdG1hcD4gZHJhZ0ltYWdlLCBib29sIGlzTGlua0RyYWcpID0gMDsKLSAgICB2aXJ0dWFs IHZvaWQgdXBkYXRlU2VjdXJlSW5wdXRTdGF0ZSgpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgdXBk YXRlVGV4dElucHV0U3RhdGUoYm9vbCB1cGRhdGVTZWN1cmVJbnB1dFN0YXRlKSA9IDA7CisgICAg dmlydHVhbCB2b2lkIHJlc2V0VGV4dElucHV0U3RhdGUoKSA9IDA7CiAjZW5kaWYKICNpZiBQTEFU Rk9STShXSU4pCiAgICAgdmlydHVhbCB2b2lkIGNvbXBvc2l0aW9uU2VsZWN0aW9uQ2hhbmdlZChi b29sKSA9IDA7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cAkocmV2aXNpb24gODQzOTkpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTUzNywxMyArMTUzNywxOSBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lCiAgICAgaWYgKCFhcmd1bWVudHMtPmRlY29k ZShtZXNzYWdlRGVjb2RlcikpCiAgICAgICAgIHJldHVybjsKIAotI2lmIFBMQVRGT1JNKE1BQykg JiYgIWRlZmluZWQoQlVJTERJTkdfT05fU05PV19MRU9QQVJEKQorICAgIFdlYkZyYW1lUHJveHkq IGZyYW1lID0gcHJvY2VzcygpLT53ZWJGcmFtZShmcmFtZUlEKTsKKyAgICBNRVNTQUdFX0NIRUNL KGZyYW1lKTsKKworI2lmIFBMQVRGT1JNKE1BQykKKyAgICAvLyBGSVhNRTogZGlkQ29tbWl0TG9h ZEZvckZyYW1lIGNvbWVzIHRvbyBsYXRlIHdoZW4gcmVzdG9yaW5nIGEgcGFnZSBmcm9tIGIvZiBj YWNoZSwgbWFraW5nIHVzIGRpc2FibGUgc2VjdXJlIGV2ZW50IG1vZGUgaW4gcGFzc3dvcmQgZmll bGRzLgorICAgIC8vIEZJWE1FOiBBIGxvYWQgZ29pbmcgb24gaW4gb25lIGZyYW1lIHNob3VsZG4n dCBhZmZlY3QgdHlwaW5nIGluIHNpYmxpbmcgZnJhbWVzLgorICAgIG1fcGFnZUNsaWVudC0+cmVz ZXRUZXh0SW5wdXRTdGF0ZSgpOworI2lmICFkZWZpbmVkKEJVSUxESU5HX09OX1NOT1dfTEVPUEFS RCkKKyAgICAvLyBGSVhNRTogU2hvdWxkIHRoaXMgYmUgbW92ZWQgaW5zaWRlIHJlc2V0VGV4dElu cHV0U3RhdGUoKT8KICAgICBkaXNtaXNzQ29ycmVjdGlvblBhbmVsKFJlYXNvbkZvckRpc21pc3Np bmdDb3JyZWN0aW9uUGFuZWxJZ25vcmVkKTsKICAgICBtX3BhZ2VDbGllbnQtPmRpc21pc3NEaWN0 aW9uYXJ5TG9va3VwUGFuZWwoKTsKICNlbmRpZgotCi0gICAgV2ViRnJhbWVQcm94eSogZnJhbWUg PSBwcm9jZXNzKCktPndlYkZyYW1lKGZyYW1lSUQpOwotICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUp OworI2VuZGlmCiAKICAgICBjbGVhckxvYWREZXBlbmRlbnRDYWxsYmFja3MoKTsKIApAQCAtMjE1 MSwxMiArMjE1Nyw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjplZGl0b3JTdGF0ZUNoYW5nZWQoY28K ICAgICBtX2VkaXRvclN0YXRlID0gZWRpdG9yU3RhdGU7CiAKICNpZiBQTEFURk9STShNQUMpCi0g ICAgLy8gVGhpcyBpcyBhIHRlbXBvcmFyeSBzdGF0ZS4gRmxpcHBpbmcgc2VjdXJlIGlucHV0IHN0 YXRlIHRvbyBxdWlja2x5IGNhbiBleHBvc2UgcmFjZSBjb25kaXRpb25zLgotICAgIGlmIChlZGl0 b3JTdGF0ZS5zZWxlY3Rpb25Jc05vbmUpCi0gICAgICAgIHJldHVybjsKLQotICAgIGlmIChjb3Vs ZENoYW5nZVNlY3VyZUlucHV0U3RhdGUpCi0gICAgICAgIG1fcGFnZUNsaWVudC0+dXBkYXRlU2Vj dXJlSW5wdXRTdGF0ZSgpOworICAgIG1fcGFnZUNsaWVudC0+dXBkYXRlVGV4dElucHV0U3RhdGUo Y291bGRDaGFuZ2VTZWN1cmVJbnB1dFN0YXRlKTsKICNlbmRpZgogfQogCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiA4NDM5OSkKKysrIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtMjU4 LDYgKzI1OCw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgc2V0Q29tcG9zaXRpb24oY29uc3QgU3Ry aW5nJiB0ZXh0LCBWZWN0b3I8V2ViQ29yZTo6Q29tcG9zaXRpb25VbmRlcmxpbmU+IHVuZGVybGlu ZXMsIHVpbnQ2NF90IHNlbGVjdGlvblN0YXJ0LCB1aW50NjRfdCBzZWxlY3Rpb25FbmQsIHVpbnQ2 NF90IHJlcGxhY2VtZW50UmFuZ2VTdGFydCwgdWludDY0X3QgcmVwbGFjZW1lbnRSYW5nZUVuZCk7 CiAgICAgdm9pZCBjb25maXJtQ29tcG9zaXRpb24oKTsKKyAgICB2b2lkIGNvbmZpcm1Db21wb3Np dGlvbldpdGhvdXREaXN0dXJiaW5nU2VsZWN0aW9uKCk7CiAgICAgYm9vbCBpbnNlcnRUZXh0KGNv bnN0IFN0cmluZyYgdGV4dCwgdWludDY0X3QgcmVwbGFjZW1lbnRSYW5nZVN0YXJ0LCB1aW50NjRf dCByZXBsYWNlbWVudFJhbmdlRW5kKTsKICAgICB2b2lkIGdldE1hcmtlZFJhbmdlKHVpbnQ2NF90 JiBsb2NhdGlvbiwgdWludDY0X3QmIGxlbmd0aCk7CiAgICAgdm9pZCBnZXRTZWxlY3RlZFJhbmdl KHVpbnQ2NF90JiBsb2NhdGlvbiwgdWludDY0X3QmIGxlbmd0aCk7CkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLmgJKHJldmlzaW9u IDg0Mzk5KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudElt cGwuaAkod29ya2luZyBjb3B5KQpAQCAtNzQsNyArNzQsOCBAQCBwcml2YXRlOgogICAgIHZpcnR1 YWwgYm9vbCBpbnRlcnByZXRLZXlFdmVudChjb25zdCBOYXRpdmVXZWJLZXlib2FyZEV2ZW50Jiwg VmVjdG9yPFdlYkNvcmU6OktleXByZXNzQ29tbWFuZD4mKTsKICAgICB2aXJ0dWFsIGJvb2wgZXhl Y3V0ZVNhdmVkQ29tbWFuZEJ5U2VsZWN0b3IoY29uc3QgU3RyaW5nJiBzZWxlY3Rvcik7CiAgICAg dmlydHVhbCB2b2lkIHNldERyYWdJbWFnZShjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgY2xpZW50 UG9zaXRpb24sIFBhc3NSZWZQdHI8U2hhcmVhYmxlQml0bWFwPiBkcmFnSW1hZ2UsIGJvb2wgaXNM aW5rRHJhZyk7Ci0gICAgdmlydHVhbCB2b2lkIHVwZGF0ZVNlY3VyZUlucHV0U3RhdGUoKTsKKyAg ICB2aXJ0dWFsIHZvaWQgdXBkYXRlVGV4dElucHV0U3RhdGUoYm9vbCB1cGRhdGVTZWN1cmVJbnB1 dFN0YXRlKTsKKyAgICB2aXJ0dWFsIHZvaWQgcmVzZXRUZXh0SW5wdXRTdGF0ZSgpOwogCiAgICAg dmlydHVhbCBXZWJDb3JlOjpGbG9hdFJlY3QgY29udmVydFRvRGV2aWNlU3BhY2UoY29uc3QgV2Vi Q29yZTo6RmxvYXRSZWN0Jik7CiAgICAgdmlydHVhbCBXZWJDb3JlOjpGbG9hdFJlY3QgY29udmVy dFRvVXNlclNwYWNlKGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYpOwpJbmRleDogU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwubW0JKHJldmlz aW9uIDg0Mzk5KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVu dEltcGwubW0JKHdvcmtpbmcgY29weSkKQEAgLTI1Miw5ICsyNTIsMTQgQEAgdm9pZCBQYWdlQ2xp ZW50SW1wbDo6c2V0RHJhZ0ltYWdlKGNvbnN0IAogICAgIFttX3drVmlldyBfc2V0RHJhZ0ltYWdl OmRyYWdOU0ltYWdlLmdldCgpIGF0OmNsaWVudFBvc2l0aW9uIGxpbmtEcmFnOmlzTGlua0RyYWdd OwogfQogCi12b2lkIFBhZ2VDbGllbnRJbXBsOjp1cGRhdGVTZWN1cmVJbnB1dFN0YXRlKCkKK3Zv aWQgUGFnZUNsaWVudEltcGw6OnVwZGF0ZVRleHRJbnB1dFN0YXRlKGJvb2wgdXBkYXRlU2VjdXJl SW5wdXRTdGF0ZSkKIHsKLSAgICBbbV93a1ZpZXcgX3VwZGF0ZVNlY3VyZUlucHV0U3RhdGVdOwor ICAgIFttX3drVmlldyBfdXBkYXRlVGV4dElucHV0U3RhdGVJbmNsdWRpbmdTZWN1cmVJbnB1dFN0 YXRlOnVwZGF0ZVNlY3VyZUlucHV0U3RhdGVdOworfQorCit2b2lkIFBhZ2VDbGllbnRJbXBsOjpy ZXNldFRleHRJbnB1dFN0YXRlKCkKK3sKKyAgICBbbV93a1ZpZXcgX3Jlc2V0VGV4dElucHV0U3Rh dGVdOwogfQogCiBGbG9hdFJlY3QgUGFnZUNsaWVudEltcGw6OmNvbnZlcnRUb0RldmljZVNwYWNl KGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvbWFjL1dLVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL21hYy9XS1ZpZXcubW0JKHJldmlzaW9uIDg0Mzk5KQorKysgU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zMTAsMTAgKzMxMCw4 IEBAIC0gKEJPT0wpcmVzaWduRmlyc3RSZXNwb25kZXIKIHsKICAgICBfZGF0YS0+X2luUmVzaWdu Rmlyc3RSZXNwb25kZXIgPSB0cnVlOwogCi0gICAgaWYgKF9kYXRhLT5faW5TZWN1cmVJbnB1dFN0 YXRlKSB7Ci0gICAgICAgIERpc2FibGVTZWN1cmVFdmVudElucHV0KCk7Ci0gICAgICAgIF9kYXRh LT5faW5TZWN1cmVJbnB1dFN0YXRlID0gTk87Ci0gICAgfQorICAgIFtzZWxmIF9yZXNldFRleHRJ bnB1dFN0YXRlXTsKKyAgICAKICAgICBfZGF0YS0+X3BhZ2UtPnZpZXdTdGF0ZURpZENoYW5nZShX ZWJQYWdlUHJveHk6OlZpZXdJc0ZvY3VzZWQpOwogCiAgICAgX2RhdGEtPl9pblJlc2lnbkZpcnN0 UmVzcG9uZGVyID0gZmFsc2U7CkBAIC0yMzA0LDcgKzIzMDIsNyBAQCAtICh2b2lkKV9zZXREcmFn SW1hZ2U6KE5TSW1hZ2UgKilpbWFnZSBhCiAKIC0gKHZvaWQpX3VwZGF0ZVNlY3VyZUlucHV0U3Rh dGUKIHsKLSAgICBpZiAoIVtbc2VsZiB3aW5kb3ddIGlzS2V5V2luZG93XSB8fCAoW1tzZWxmIHdp bmRvd10gZmlyc3RSZXNwb25kZXJdICE9IHNlbGYgJiYgIV9kYXRhLT5faW5CZWNvbWVGaXJzdFJl c3BvbmRlcikpIHsKKyAgICBpZiAoIVtbc2VsZiB3aW5kb3ddIGlzS2V5V2luZG93XSB8fCAhW3Nl bGYgX2lzRm9jdXNlZF0pIHsKICAgICAgICAgaWYgKF9kYXRhLT5faW5TZWN1cmVJbnB1dFN0YXRl KSB7CiAgICAgICAgICAgICBEaXNhYmxlU2VjdXJlRXZlbnRJbnB1dCgpOwogICAgICAgICAgICAg X2RhdGEtPl9pblNlY3VyZUlucHV0U3RhdGUgPSBOTzsKQEAgLTIzMjgsNiArMjMyNiwzMyBAQCAt ICh2b2lkKV91cGRhdGVTZWN1cmVJbnB1dFN0YXRlCiAgICAgX2RhdGEtPl9pblNlY3VyZUlucHV0 U3RhdGUgPSBpc0luUGFzc3dvcmRGaWVsZDsKIH0KIAorLSAodm9pZClfdXBkYXRlVGV4dElucHV0 U3RhdGVJbmNsdWRpbmdTZWN1cmVJbnB1dFN0YXRlOihCT09MKXVwZGF0ZVNlY3VyZUlucHV0U3Rh dGUKK3sKKyAgICBjb25zdCBFZGl0b3JTdGF0ZSYgZWRpdG9yU3RhdGUgPSBfZGF0YS0+X3BhZ2Ut PmVkaXRvclN0YXRlKCk7CisgICAgaWYgKHVwZGF0ZVNlY3VyZUlucHV0U3RhdGUpIHsKKyAgICAg ICAgLy8gVGhpcyBpcyBhIHRlbXBvcmFyeSBzdGF0ZSB3aGVuIGVkaXRpbmcuIEZsaXBwaW5nIHNl Y3VyZSBpbnB1dCBzdGF0ZSB0b28gcXVpY2tseSBjYW4gZXhwb3NlIHJhY2UgY29uZGl0aW9ucy4K KyAgICAgICAgaWYgKCFlZGl0b3JTdGF0ZS5zZWxlY3Rpb25Jc05vbmUpCisgICAgICAgICAgICBb c2VsZiBfdXBkYXRlU2VjdXJlSW5wdXRTdGF0ZV07CisgICAgfQorCisgICAgaWYgKCFlZGl0b3JT dGF0ZS5oYXNDb21wb3NpdGlvbiB8fCBlZGl0b3JTdGF0ZS5zaG91bGRJZ25vcmVDb21wb3NpdGlv blNlbGVjdGlvbkNoYW5nZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgX2RhdGEtPl9wYWdlLT5j b25maXJtQ29tcG9zaXRpb25XaXRob3V0RGlzdHVyYmluZ1NlbGVjdGlvbigpOworICAgIFtbc3Vw ZXIgaW5wdXRDb250ZXh0XSBkaXNjYXJkTWFya2VkVGV4dF07Cit9CisKKy0gKHZvaWQpX3Jlc2V0 VGV4dElucHV0U3RhdGUKK3sKKyAgICBfZGF0YS0+X3BhZ2UtPmNvbmZpcm1Db21wb3NpdGlvbldp dGhvdXREaXN0dXJiaW5nU2VsZWN0aW9uKCk7CisgICAgW1tzdXBlciBpbnB1dENvbnRleHRdIGRp c2NhcmRNYXJrZWRUZXh0XTsKKworICAgIGlmIChfZGF0YS0+X2luU2VjdXJlSW5wdXRTdGF0ZSkg eworICAgICAgICBEaXNhYmxlU2VjdXJlRXZlbnRJbnB1dCgpOworICAgICAgICBfZGF0YS0+X2lu U2VjdXJlSW5wdXRTdGF0ZSA9IE5POworICAgIH0KK30KKwogLSAodm9pZClfc2V0RHJhd2luZ0Fy ZWFTaXplOihOU1NpemUpc2l6ZQogewogICAgIGlmICghX2RhdGEtPl9wYWdlLT5kcmF3aW5nQXJl YSgpKQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3SW50ZXJu YWwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1Zp ZXdJbnRlcm5hbC5oCShyZXZpc2lvbiA4NDM5OSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmgJKHdvcmtpbmcgY29weSkKQEAgLTQwLDYgKzQwLDcg QEAgbmFtZXNwYWNlIFdlYktpdCB7CiAgICAgY2xhc3MgRHJhd2luZ0FyZWFQcm94eTsKICAgICBj bGFzcyBGaW5kSW5kaWNhdG9yOwogICAgIGNsYXNzIExheWVyVHJlZUNvbnRleHQ7CisgICAgc3Ry dWN0IEVkaXRvclN0YXRlOwogfQogCiBAY2xhc3MgV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxl cjsKQEAgLTc0LDYgKzc1LDggQEAgQGludGVyZmFjZSBXS1ZpZXcgKEludGVybmFsKQogLSAodm9p ZClfY291bnRTdHJpbmdNYXRjaGVzSW5DdXN0b21SZXByZXNlbnRhdGlvbjooTlNTdHJpbmcgKilz dHJpbmcgd2l0aEZpbmRPcHRpb25zOihXZWJLaXQ6OkZpbmRPcHRpb25zKW9wdGlvbnMgbWF4TWF0 Y2hDb3VudDooTlNVSW50ZWdlciljb3VudDsKIC0gKHZvaWQpX3NldERyYWdJbWFnZTooTlNJbWFn ZSAqKWltYWdlIGF0OihOU1BvaW50KWNsaWVudFBvaW50IGxpbmtEcmFnOihCT09MKWxpbmtEcmFn OwogLSAodm9pZClfdXBkYXRlU2VjdXJlSW5wdXRTdGF0ZTsKKy0gKHZvaWQpX3VwZGF0ZVRleHRJ bnB1dFN0YXRlSW5jbHVkaW5nU2VjdXJlSW5wdXRTdGF0ZTooQk9PTCl1cGRhdGVTZWN1cmVJbnB1 dFN0YXRlOworLSAodm9pZClfcmVzZXRUZXh0SW5wdXRTdGF0ZTsKIAogLSAodm9pZClfc2V0RHJh d2luZ0FyZWFTaXplOihOU1NpemUpc2l6ZTsKIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL21hYy9XZWJQYWdlUHJveHlNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL21hYy9XZWJQYWdlUHJveHlNYWMubW0JKHJldmlzaW9uIDg0Mzk5KQorKysgU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJveHlNYWMubW0JKHdvcmtpbmcgY29w eSkKQEAgLTE1MSw2ICsxNTEsMTEgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmNvbmZpcm1Db21wb3Np dGlvbigpCiAgICAgcHJvY2VzcygpLT5zZW5kU3luYyhNZXNzYWdlczo6V2ViUGFnZTo6Q29uZmly bUNvbXBvc2l0aW9uKCksIE1lc3NhZ2VzOjpXZWJQYWdlOjpDb25maXJtQ29tcG9zaXRpb246OlJl cGx5KG1fZWRpdG9yU3RhdGUpLCBtX3BhZ2VJRCk7CiB9CiAKK3ZvaWQgV2ViUGFnZVByb3h5Ojpj b25maXJtQ29tcG9zaXRpb25XaXRob3V0RGlzdHVyYmluZ1NlbGVjdGlvbigpCit7CisgICAgcHJv Y2VzcygpLT5zZW5kU3luYyhNZXNzYWdlczo6V2ViUGFnZTo6Q29uZmlybUNvbXBvc2l0aW9uV2l0 aG91dERpc3R1cmJpbmdTZWxlY3Rpb24oKSwgTWVzc2FnZXM6OldlYlBhZ2U6OkNvbmZpcm1Db21w b3NpdGlvbjo6UmVwbHkobV9lZGl0b3JTdGF0ZSksIG1fcGFnZUlEKTsKK30KKwogYm9vbCBXZWJQ YWdlUHJveHk6Omluc2VydFRleHQoY29uc3QgU3RyaW5nJiB0ZXh0LCB1aW50NjRfdCByZXBsYWNl bWVudFJhbmdlU3RhcnQsIHVpbnQ2NF90IHJlcGxhY2VtZW50UmFuZ2VFbmQpCiB7CiAgICAgYm9v bCBoYW5kbGVkOwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcAkocmV2aXNpb24gODQzOTkpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMzMyw2ICszMzMsNyBAQCBF ZGl0b3JTdGF0ZSBXZWJQYWdlOjplZGl0b3JTdGF0ZSgpIGNvbnN0CiAgICAgcmVzdWx0LmlzQ29u dGVudFJpY2hseUVkaXRhYmxlID0gZnJhbWUtPnNlbGVjdGlvbigpLT5pc0NvbnRlbnRSaWNobHlF ZGl0YWJsZSgpOwogICAgIHJlc3VsdC5pc0luUGFzc3dvcmRGaWVsZCA9IGZyYW1lLT5zZWxlY3Rp b24oKS0+aXNJblBhc3N3b3JkRmllbGQoKTsKICAgICByZXN1bHQuaGFzQ29tcG9zaXRpb24gPSBm cmFtZS0+ZWRpdG9yKCktPmhhc0NvbXBvc2l0aW9uKCk7CisgICAgcmVzdWx0LnNob3VsZElnbm9y ZUNvbXBvc2l0aW9uU2VsZWN0aW9uQ2hhbmdlID0gZnJhbWUtPmVkaXRvcigpLT5pZ25vcmVDb21w b3NpdGlvblNlbGVjdGlvbkNoYW5nZSgpOwogICAgIAogICAgIHJldHVybiByZXN1bHQ7CiB9Cklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHJldmlz aW9uIDg0Mzk5KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu aAkod29ya2luZyBjb3B5KQpAQCAtMzIzLDYgKzMyMyw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQg c2V0Q29tcG9zaXRpb24oY29uc3QgU3RyaW5nJiB0ZXh0LCBWZWN0b3I8V2ViQ29yZTo6Q29tcG9z aXRpb25VbmRlcmxpbmU+IHVuZGVybGluZXMsIHVpbnQ2NF90IHNlbGVjdGlvblN0YXJ0LCB1aW50 NjRfdCBzZWxlY3Rpb25FbmQsIHVpbnQ2NF90IHJlcGxhY2VtZW50UmFuZ2VTdGFydCwgdWludDY0 X3QgcmVwbGFjZW1lbnRSYW5nZUVuZCwgRWRpdG9yU3RhdGUmIG5ld1N0YXRlKTsKICAgICB2b2lk IGNvbmZpcm1Db21wb3NpdGlvbihFZGl0b3JTdGF0ZSYgbmV3U3RhdGUpOworICAgIHZvaWQgY29u ZmlybUNvbXBvc2l0aW9uV2l0aG91dERpc3R1cmJpbmdTZWxlY3Rpb24oRWRpdG9yU3RhdGUmIG5l d1N0YXRlKTsKICAgICB2b2lkIGluc2VydFRleHQoY29uc3QgU3RyaW5nJiB0ZXh0LCB1aW50NjRf dCByZXBsYWNlbWVudFJhbmdlU3RhcnQsIHVpbnQ2NF90IHJlcGxhY2VtZW50UmFuZ2VFbmQsIGJv b2wmIGhhbmRsZWQsIEVkaXRvclN0YXRlJiBuZXdTdGF0ZSk7CiAgICAgdm9pZCBnZXRNYXJrZWRS YW5nZSh1aW50NjRfdCYgbG9jYXRpb24sIHVpbnQ2NF90JiBsZW5ndGgpOwogICAgIHZvaWQgZ2V0 U2VsZWN0ZWRSYW5nZSh1aW50NjRfdCYgbG9jYXRpb24sIHVpbnQ2NF90JiBsZW5ndGgpOwpJbmRl eDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu bWVzc2FnZXMuaW4JKHJldmlzaW9uIDg0Mzk5KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTE4Nyw2ICsx ODcsNyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlIHsKICAgICAjIFRleHQgaW5wdXQuCiAgICAgU2V0 Q29tcG9zaXRpb24oV1RGOjpTdHJpbmcgdGV4dCwgV1RGOjpWZWN0b3I8V2ViQ29yZTo6Q29tcG9z aXRpb25VbmRlcmxpbmU+IHVuZGVybGluZXMsIHVpbnQ2NF90IHNlbGVjdGlvblN0YXJ0LCB1aW50 NjRfdCBzZWxlY3Rpb25FbmQsIHVpbnQ2NF90IHJlcGxhY2VtZW50UmFuZ2VTdGFydCwgdWludDY0 X3QgcmVwbGFjZW1lbnRSYW5nZUVuZCkgLT4gKFdlYktpdDo6RWRpdG9yU3RhdGUgbmV3U3RhdGUp CiAgICAgQ29uZmlybUNvbXBvc2l0aW9uKCkgLT4gKFdlYktpdDo6RWRpdG9yU3RhdGUgbmV3U3Rh dGUpCisgICAgQ29uZmlybUNvbXBvc2l0aW9uV2l0aG91dERpc3R1cmJpbmdTZWxlY3Rpb24oKSAt PiAoV2ViS2l0OjpFZGl0b3JTdGF0ZSBuZXdTdGF0ZSkKICAgICBJbnNlcnRUZXh0KFdURjo6U3Ry aW5nIHRleHQsIHVpbnQ2NF90IHJlcGxhY2VtZW50UmFuZ2VTdGFydCwgdWludDY0X3QgcmVwbGFj ZW1lbnRSYW5nZUVuZCkgLT4gKGJvb2wgaGFuZGxlZCwgV2ViS2l0OjpFZGl0b3JTdGF0ZSBuZXdT dGF0ZSkKICAgICBHZXRNYXJrZWRSYW5nZSgpIC0+ICh1aW50NjRfdCBsb2NhdGlvbiwgdWludDY0 X3QgbGVuZ3RoKQogICAgIEdldFNlbGVjdGVkUmFuZ2UoKSAtPiAodWludDY0X3QgbG9jYXRpb24s IHVpbnQ2NF90IGxlbmd0aCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9tYWMvV2ViUGFnZU1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW0JKHJldmlzaW9uIDg0Mzk5KQorKysgU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tCSh3b3JraW5nIGNv cHkpCkBAIC0yNDcsNiArMjQ3LDE1IEBAIHZvaWQgV2ViUGFnZTo6Y29uZmlybUNvbXBvc2l0aW9u KEVkaXRvclMKICAgICBuZXdTdGF0ZSA9IGVkaXRvclN0YXRlKCk7CiB9CiAKK3ZvaWQgV2ViUGFn ZTo6Y29uZmlybUNvbXBvc2l0aW9uV2l0aG91dERpc3R1cmJpbmdTZWxlY3Rpb24oRWRpdG9yU3Rh dGUmIG5ld1N0YXRlKQoreworICAgIEZyYW1lKiBmcmFtZSA9IG1fcGFnZS0+Zm9jdXNDb250cm9s bGVyKCktPmZvY3VzZWRPck1haW5GcmFtZSgpOworCisgICAgZnJhbWUtPmVkaXRvcigpLT5jb25m aXJtQ29tcG9zaXRpb25XaXRob3V0RGlzdHVyYmluZ1NlbGVjdGlvbigpOworCisgICAgbmV3U3Rh dGUgPSBlZGl0b3JTdGF0ZSgpOworfQorCiB2b2lkIFdlYlBhZ2U6Omluc2VydFRleHQoY29uc3Qg U3RyaW5nJiB0ZXh0LCB1aW50NjRfdCByZXBsYWNlbWVudFJhbmdlU3RhcnQsIHVpbnQ2NF90IHJl cGxhY2VtZW50UmFuZ2VFbmQsIGJvb2wmIGhhbmRsZWQsIEVkaXRvclN0YXRlJiBuZXdTdGF0ZSkK IHsKICAgICBGcmFtZSogZnJhbWUgPSBtX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpLT5mb2N1c2Vk T3JNYWluRnJhbWUoKTsK