57893 2011-04-05 15:27:27 -0700 [Mac] WebKit2: Escape key does not stop page loads when focus is on the web page 2011-04-05 17:55:40 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Mac All RESOLVED FIXED InRadar P2 Normal --- 1 darin darin ap oldest_to_newest 379907 0 darin 2011-04-05 15:27:27 -0700 [MAC] WebKit2: Escape key does not stop page loads when focus is on the web page 379908 1 darin 2011-04-05 15:28:08 -0700 <rdar://problem/9130486> 379976 2 88337 darin 2011-04-05 17:07:20 -0700 Created attachment 88337 Patch 379979 3 darin 2011-04-05 17:07:59 -0700 Alexey, this is the bug you asked me to fix. 379993 4 88337 ap 2011-04-05 17:30:59 -0700 Comment on attachment 88337 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=88337&action=review > Source/WebKit2/UIProcess/PageClient.h:104 > + virtual bool executeKeypressCommand(const String& selector) = 0; Keypress may confuse someone into thinking that the command is executed when keypress is dispatched. But it's for keydown, as far as I can tell. 380007 5 darin 2011-04-05 17:55:40 -0700 Committed r83004: <http://trac.webkit.org/changeset/83004> 88337 2011-04-05 17:07:20 -0700 2011-04-05 17:30:59 -0700 Patch bug-57893-20110405170719.patch text/plain 17897 darin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyOTk3KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNTQgQEAKKzIwMTEtMDQtMDUgIERhcmluIEFk bGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFtNYWNdIFdlYktpdDI6IEVzY2FwZSBrZXkgZG9lcyBub3Qgc3RvcCBw YWdlIGxvYWRzIHdoZW4gZm9jdXMgaXMgb24gdGhlIHdlYiBwYWdlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Nzg5MworICAgICAgICA8cmRhcjovL3By b2JsZW0vOTEzMDQ4Nj4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJ bXBsLmg6IEFkZGVkIGV4ZWN1dGVLZXlwcmVzc0NvbW1hbmQuCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9tYWMvUGFnZUNsaWVudEltcGwubW06IFJlbmFtZWQgaW50ZXJuYWwgT2JqZWN0aXZlLUMg Y2xhc3NlcyB0byB1c2UKKyAgICAgICAgdGhlIFdlYktpdDIgT2JqZWN0aXZlLUMgY2xhc3MgcHJl Zml4LCBXSywgcmF0aGVyIHRoYW4gdGhlIFdlYktpdDEgT2JqZWN0aXZlLUMgY2xhc3MKKyAgICAg ICAgcHJlZml4LCBXZWIuIFJlbW92ZWQgc29tZSB1bm5lZWRlZCBleHBsaWNpdCBXZWJLaXQgbmFt ZXNwYWNlIHByZWZpeGVzLgorICAgICAgICAoLVtXS0VkaXRDb21tYW5kT2JqQyBpbml0V2l0aFdl YkVkaXRDb21tYW5kUHJveHk6XSk6IFJlbW92ZWQgdW5uZWVkZWQgV2ViS2l0CisgICAgICAgIG5h bWVzcGFjZSBwcmVmaXguCisgICAgICAgICgtW1dLRWRpdENvbW1hbmRPYmpDIGNvbW1hbmRdKTog RGl0dG8uCisgICAgICAgICgtW1dLRWRpdG9yVW5kb1RhcmdldE9iakMgdW5kb0VkaXRpbmc6XSk6 IFVwZGF0ZWQgZm9yIG5ldyBjbGFzcyBuYW1lLgorICAgICAgICAoLVtXS0VkaXRvclVuZG9UYXJn ZXRPYmpDIHJlZG9FZGl0aW5nOl0pOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6UGFnZUNsaWVu dEltcGw6OlBhZ2VDbGllbnRJbXBsKTogRGl0dG8uCisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGll bnRJbXBsOjpyZWdpc3RlckVkaXRDb21tYW5kKTogRGl0dG8uCisgICAgICAgIChXZWJLaXQ6OlBh Z2VDbGllbnRJbXBsOjpleGVjdXRlS2V5cHJlc3NDb21tYW5kKTogQWRkZWQuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW06IFJlbmFtZWQgaW50ZXJuYWwgT2JqZWN0aXZl LUMgY2F0ZWdvcmllcyB0byB1c2UgdGhlCisgICAgICAgIFdlYktpdDIgT2JqZWN0aXZlLUMgcHJl Zml4LCBXSywgcmF0aGVyIHRoYW4gdGhlIFdlYktpdDEgT2JqZWN0aXZlLUMgcHJlZml4LCBXZWIs CisgICAgICAgIG9yIG5vIHByZWZpeCBhdCBhbGwuIFR3ZWFrZWQgdXNlIG9mIGV4dGVybiAiQyIg YSBsaXR0bGUuCisgICAgICAgICgtW1dLVmlldyBkb0NvbW1hbmRCeVNlbGVjdG9yOl0pOiBUd2Vh a2VkIHRoZSBjb21tZW50LgorICAgICAgICAoLVtXS1ZpZXcgX2V4ZWN1dGVLZXlwcmVzc0NvbW1h bmQ6XSk6IEFkZGVkLiBGb3IgdXNlIHdoZW4gY29tbWFuZCBpcyBub3QgaGFuZGxlZAorICAgICAg ICBieSBXZWJDb3JlLgorICAgICAgICAoLVtXS1Jlc3BvbmRlckNoYWluU2luayBpbml0V2l0aFJl c3BvbmRlckNoYWluOl0pOiBBZGRlZC4gQmFzZWQgb24gdGhlCisgICAgICAgIFdlYlJlc3BvbmRl ckNoYWluU2luayBjbGFzcyBpbiBXZWJLaXQxLgorICAgICAgICAoLVtXS1Jlc3BvbmRlckNoYWlu U2luayBkZXRhY2hdKTogQWRkZWQuCisgICAgICAgICgtW1dLUmVzcG9uZGVyQ2hhaW5TaW5rIGRp ZFJlY2VpdmVVbmhhbmRsZWRDb21tYW5kXSk6IEFkZGVkLgorICAgICAgICAoLVtXS1Jlc3BvbmRl ckNoYWluU2luayBub1Jlc3BvbmRlckZvcjpdKTogQWRkZWQuCisgICAgICAgICgtW1dLUmVzcG9u ZGVyQ2hhaW5TaW5rIGRvQ29tbWFuZEJ5U2VsZWN0b3I6XSk6IEFkZGVkLgorICAgICAgICAoLVtX S1Jlc3BvbmRlckNoYWluU2luayB0cnlUb1BlcmZvcm06d2l0aDpdKTogQWRkZWQuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdJbnRlcm5hbC5oOiBBZGRlZCBkZWNsYXJhdGlv biBvZiBfZXhlY3V0ZUtleXByZXNzQ29tbWFuZDouCisgICAgICAgIEFsc28gcmVtb3ZlZCB1bm5l ZWRlZCBpbmNsdWRlcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlQ2xpZW50Lmg6IEFkZGVk IGV4ZWN1dGVLZXlwcmVzc0NvbW1hbmQuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5oOiBBZGRlZCBleGVjdXRlS2V5cHJlc3NDb21tYW5kLgorICAgICAgICAqIFVJUHJvY2Vzcy9X ZWJQYWdlUHJveHkubWVzc2FnZXMuaW46IEFkZGVkIEV4ZWN1dGVLZXlwcmVzc0NvbW1hbmQuCisK KyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYkZ1bGxTY3JlZW5NYW5hZ2VyUHJveHlNYWMubW06 IFVwZGF0ZWQgaW5jbHVkZXMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94 eU1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpleGVjdXRlS2V5cHJlc3ND b21tYW5kKTogQWRkZWQuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBh Z2VNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmV4ZWN1dGVLZXlwcmVzc0NvbW1h bmRzSW50ZXJuYWwpOiBTZW5kIHRoZSBzeW5jaHJvbm91cworICAgICAgICBFeGVjdXRlS2V5cHJl c3NDb21tYW5kIG1lc3NhZ2Ugd2hlbiBhIGNvbW1hbmQgaXMgbm90IGhhbmRsZWQgYnkgV2ViQ29y ZS4KKwogMjAxMS0wNC0wNSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEFsZXhleSBQcm9za3VyeWFrb3YuCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgJKHJldmlzaW9uIDgyOTkyKQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUg QEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEwLCAyMDExIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmlu YXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRl ZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMTAxLDYgKzEwMSw3 IEBAIHB1YmxpYzoKICNpZiBQTEFURk9STShNQUMpCiAgICAgdmlydHVhbCB2b2lkIGFjY2Vzc2li aWxpdHlXZWJQcm9jZXNzVG9rZW5SZWNlaXZlZChjb25zdCBDb3JlSVBDOjpEYXRhUmVmZXJlbmNl JikgPSAwOwogICAgIHZpcnR1YWwgYm9vbCBpbnRlcnByZXRLZXlFdmVudChjb25zdCBOYXRpdmVX ZWJLZXlib2FyZEV2ZW50JiwgY29uc3QgVGV4dElucHV0U3RhdGUmLCBWZWN0b3I8V2ViQ29yZTo6 S2V5cHJlc3NDb21tYW5kPiYpID0gMDsKKyAgICB2aXJ0dWFsIGJvb2wgZXhlY3V0ZUtleXByZXNz Q29tbWFuZChjb25zdCBTdHJpbmcmIHNlbGVjdG9yKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHNl dERyYWdJbWFnZShjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgY2xpZW50UG9zaXRpb24sIFBhc3NS ZWZQdHI8U2hhcmVhYmxlQml0bWFwPiBkcmFnSW1hZ2UsIGJvb2wgaXNMaW5rRHJhZykgPSAwOwog I2VuZGlmCiAjaWYgUExBVEZPUk0oV0lOKQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaAkocmV2aXNpb24gODI5OTIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTU5MywxMCArNTkzLDExIEBAIHBy aXZhdGU6CiAgICAgLy8gS2V5Ym9hcmQgaGFuZGxpbmcKICNpZiBQTEFURk9STShNQUMpCiAgICAg dm9pZCBpbnRlcnByZXRRdWV1ZWRLZXlFdmVudChjb25zdCBUZXh0SW5wdXRTdGF0ZSYsIGJvb2wm IGhhbmRsZWQsIFZlY3RvcjxXZWJDb3JlOjpLZXlwcmVzc0NvbW1hbmQ+Jik7CisgICAgdm9pZCBl eGVjdXRlS2V5cHJlc3NDb21tYW5kKGNvbnN0IFN0cmluZyYgc2VsZWN0b3IsIGJvb2wmIGhhbmRs ZWQpOwogI2VuZGlmCiAKICNpZiBQTEFURk9STShHVEspCi0gICAgdm9pZCBnZXRFZGl0b3JDb21t YW5kc0ZvcktleUV2ZW50KFZlY3RvcjxXVEY6OlN0cmluZz4mKTsKKyAgICB2b2lkIGdldEVkaXRv ckNvbW1hbmRzRm9yS2V5RXZlbnQoVmVjdG9yPFN0cmluZz4mKTsKICNlbmRpZgogCiAgICAgLy8g RmluZC4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2Fn ZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5tZXNzYWdlcy5pbgkocmV2aXNpb24gODI5OTIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC0xOTksNiArMTk5 LDcgQEAgbWVzc2FnZXMgLT4gV2ViUGFnZVByb3h5IHsKIAogICAgICMgS2V5Ym9hcmQgaW5wdXQg c3VwcG9ydCBtZXNzYWdlcwogICAgIEludGVycHJldFF1ZXVlZEtleUV2ZW50KFdlYktpdDo6VGV4 dElucHV0U3RhdGUgc3RhdGUpIC0+IChib29sIGhhbmRsZWQsIFZlY3RvcjxXZWJDb3JlOjpLZXlw cmVzc0NvbW1hbmQ+IHNhdmVkQ29tbWFuZHMpCisgICAgRXhlY3V0ZUtleXByZXNzQ29tbWFuZChX VEY6OlN0cmluZyBzZWxlY3RvcikgLT4gKGJvb2wgaGFuZGxlZCkKICAgICAKICAgICAjIFJlbW90 ZSBhY2Nlc3NpYmlsaXR5IG1lc3NhZ2VzCiAgICAgUmVnaXN0ZXJXZWJQcm9jZXNzQWNjZXNzaWJp bGl0eVRva2VuKENvcmVJUEM6OkRhdGFSZWZlcmVuY2UgZGF0YSkKSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwuaAkocmV2aXNpb24g ODI5OTIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1w bC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykg MjAxMCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIw MTAsIDIwMTEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJp YnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91 dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxv d2luZyBjb25kaXRpb25zCkBAIC03Miw2ICs3Miw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2 b2lkIHJlZ2lzdGVyRWRpdENvbW1hbmQoUGFzc1JlZlB0cjxXZWJFZGl0Q29tbWFuZFByb3h5Piwg V2ViUGFnZVByb3h5OjpVbmRvT3JSZWRvKTsKICAgICB2aXJ0dWFsIHZvaWQgY2xlYXJBbGxFZGl0 Q29tbWFuZHMoKTsKICAgICB2aXJ0dWFsIGJvb2wgaW50ZXJwcmV0S2V5RXZlbnQoY29uc3QgTmF0 aXZlV2ViS2V5Ym9hcmRFdmVudCYsIGNvbnN0IFRleHRJbnB1dFN0YXRlJiwgVmVjdG9yPFdlYkNv cmU6OktleXByZXNzQ29tbWFuZD4mKTsKKyAgICB2aXJ0dWFsIGJvb2wgZXhlY3V0ZUtleXByZXNz Q29tbWFuZChjb25zdCBTdHJpbmcmIHNlbGVjdG9yKTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0RHJh Z0ltYWdlKGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBjbGllbnRQb3NpdGlvbiwgUGFzc1JlZlB0 cjxTaGFyZWFibGVCaXRtYXA+IGRyYWdJbWFnZSwgYm9vbCBpc0xpbmtEcmFnKTsKIAogICAgIHZp cnR1YWwgV2ViQ29yZTo6RmxvYXRSZWN0IGNvbnZlcnRUb0RldmljZVNwYWNlKGNvbnN0IFdlYkNv cmU6OkZsb2F0UmVjdCYpOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMv UGFnZUNsaWVudEltcGwubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9tYWMvUGFnZUNsaWVudEltcGwubW0JKHJldmlzaW9uIDgyOTkyKQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwubW0JKHdvcmtpbmcgY29weSkK QEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDEwIEFwcGxlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMCwgMjAxMSBBcHBsZSBJbmMu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBz b3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24s IGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAg LTUyLDIwICs1MiwyNCBAQCAtIChOU0N1cnNvciAqKV9jdXJzb3JSZWN0Q3Vyc29yOwogQGVuZAog CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKK3VzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKLUBp bnRlcmZhY2UgV2ViRWRpdENvbW1hbmRPYmpDIDogTlNPYmplY3QKK0BpbnRlcmZhY2UgV0tFZGl0 Q29tbWFuZE9iakMgOiBOU09iamVjdAogewotICAgIFJlZlB0cjxXZWJLaXQ6OldlYkVkaXRDb21t YW5kUHJveHk+IG1fY29tbWFuZDsKKyAgICBSZWZQdHI8V2ViRWRpdENvbW1hbmRQcm94eT4gbV9j b21tYW5kOwogfQorLSAoaWQpaW5pdFdpdGhXZWJFZGl0Q29tbWFuZFByb3h5OihQYXNzUmVmUHRy PFdlYkVkaXRDb21tYW5kUHJveHk+KWNvbW1hbmQ7CistIChXZWJFZGl0Q29tbWFuZFByb3h5Kilj b21tYW5kOworQGVuZAogCi0tIChpZClpbml0V2l0aFdlYkVkaXRDb21tYW5kUHJveHk6KFBhc3NS ZWZQdHI8V2ViS2l0OjpXZWJFZGl0Q29tbWFuZFByb3h5Piljb21tYW5kOwotLSAoV2ViS2l0OjpX ZWJFZGl0Q29tbWFuZFByb3h5Kiljb21tYW5kOwotCitAaW50ZXJmYWNlIFdLRWRpdG9yVW5kb1Rh cmdldE9iakMgOiBOU09iamVjdAorLSAodm9pZCl1bmRvRWRpdGluZzooaWQpc2VuZGVyOworLSAo dm9pZClyZWRvRWRpdGluZzooaWQpc2VuZGVyOwogQGVuZAogCi1AaW1wbGVtZW50YXRpb24gV2Vi RWRpdENvbW1hbmRPYmpDCitAaW1wbGVtZW50YXRpb24gV0tFZGl0Q29tbWFuZE9iakMKIAotLSAo aWQpaW5pdFdpdGhXZWJFZGl0Q29tbWFuZFByb3h5OihQYXNzUmVmUHRyPFdlYktpdDo6V2ViRWRp dENvbW1hbmRQcm94eT4pY29tbWFuZAorLSAoaWQpaW5pdFdpdGhXZWJFZGl0Q29tbWFuZFByb3h5 OihQYXNzUmVmUHRyPFdlYkVkaXRDb21tYW5kUHJveHk+KWNvbW1hbmQKIHsKICAgICBzZWxmID0g W3N1cGVyIGluaXRdOwogICAgIGlmICghc2VsZikKQEAgLTc1LDMxICs3OSwyNCBAQCAtIChpZClp bml0V2l0aFdlYkVkaXRDb21tYW5kUHJveHk6KFBhc3NSCiAgICAgcmV0dXJuIHNlbGY7CiB9CiAK LS0gKFdlYktpdDo6V2ViRWRpdENvbW1hbmRQcm94eSopY29tbWFuZAorLSAoV2ViRWRpdENvbW1h bmRQcm94eSopY29tbWFuZAogewogICAgIHJldHVybiBtX2NvbW1hbmQuZ2V0KCk7CiB9CiAKIEBl bmQKIAotQGludGVyZmFjZSBXZWJFZGl0b3JVbmRvVGFyZ2V0T2JqQyA6IE5TT2JqZWN0Ci0KLS0g KHZvaWQpdW5kb0VkaXRpbmc6KGlkKXNlbmRlcjsKLS0gKHZvaWQpcmVkb0VkaXRpbmc6KGlkKXNl bmRlcjsKLQotQGVuZAotCi1AaW1wbGVtZW50YXRpb24gV2ViRWRpdG9yVW5kb1RhcmdldE9iakMK K0BpbXBsZW1lbnRhdGlvbiBXS0VkaXRvclVuZG9UYXJnZXRPYmpDCiAKIC0gKHZvaWQpdW5kb0Vk aXRpbmc6KGlkKXNlbmRlcgogewotICAgIEFTU0VSVChbc2VuZGVyIGlzS2luZE9mQ2xhc3M6W1dl YkVkaXRDb21tYW5kT2JqQyBjbGFzc11dKTsKKyAgICBBU1NFUlQoW3NlbmRlciBpc0tpbmRPZkNs YXNzOltXS0VkaXRDb21tYW5kT2JqQyBjbGFzc11dKTsKICAgICBbc2VuZGVyIGNvbW1hbmRdLT51 bmFwcGx5KCk7CiB9CiAKIC0gKHZvaWQpcmVkb0VkaXRpbmc6KGlkKXNlbmRlcgogewotICAgIEFT U0VSVChbc2VuZGVyIGlzS2luZE9mQ2xhc3M6W1dlYkVkaXRDb21tYW5kT2JqQyBjbGFzc11dKTsK KyAgICBBU1NFUlQoW3NlbmRlciBpc0tpbmRPZkNsYXNzOltXS0VkaXRDb21tYW5kT2JqQyBjbGFz c11dKTsKICAgICBbc2VuZGVyIGNvbW1hbmRdLT5yZWFwcGx5KCk7CiB9CiAKQEAgLTExOSw3ICsx MTYsNyBAQCBQYXNzT3duUHRyPFBhZ2VDbGllbnRJbXBsPiBQYWdlQ2xpZW50SW1wCiAKIFBhZ2VD bGllbnRJbXBsOjpQYWdlQ2xpZW50SW1wbChXS1ZpZXcqIHdrVmlldykKICAgICA6IG1fd2tWaWV3 KHdrVmlldykKLSAgICAsIG1fdW5kb1RhcmdldChBZG9wdE5TLCBbW1dlYkVkaXRvclVuZG9UYXJn ZXRPYmpDIGFsbG9jXSBpbml0XSkKKyAgICAsIG1fdW5kb1RhcmdldChBZG9wdE5TLCBbW1dLRWRp dG9yVW5kb1RhcmdldE9iakMgYWxsb2NdIGluaXRdKQogewogfQogCkBAIC0yNzcsNyArMjc0LDcg QEAgdm9pZCBQYWdlQ2xpZW50SW1wbDo6cmVnaXN0ZXJFZGl0Q29tbWFuZAogewogICAgIFJlZlB0 cjxXZWJFZGl0Q29tbWFuZFByb3h5PiBjb21tYW5kID0gcHJwQ29tbWFuZDsKIAotICAgIFJldGFp blB0cjxXZWJFZGl0Q29tbWFuZE9iakM+IGNvbW1hbmRPYmpDKEFkb3B0TlMsIFtbV2ViRWRpdENv bW1hbmRPYmpDIGFsbG9jXSBpbml0V2l0aFdlYkVkaXRDb21tYW5kUHJveHk6Y29tbWFuZF0pOwor ICAgIFJldGFpblB0cjxXS0VkaXRDb21tYW5kT2JqQz4gY29tbWFuZE9iakMoQWRvcHROUywgW1tX S0VkaXRDb21tYW5kT2JqQyBhbGxvY10gaW5pdFdpdGhXZWJFZGl0Q29tbWFuZFByb3h5OmNvbW1h bmRdKTsKICAgICBOU1N0cmluZyAqYWN0aW9uTmFtZSA9IG5hbWVGb3JFZGl0QWN0aW9uKGNvbW1h bmQtPmVkaXRBY3Rpb24oKSk7CiAKICAgICBOU1VuZG9NYW5hZ2VyICp1bmRvTWFuYWdlciA9IFtt X3drVmlldyB1bmRvTWFuYWdlcl07CkBAIC00ODMsNCArNDgwLDkgQEAgZmxvYXQgUGFnZUNsaWVu dEltcGw6OnVzZXJTcGFjZVNjYWxlRmFjdAogI2VuZGlmCiB9CiAKK2Jvb2wgUGFnZUNsaWVudElt cGw6OmV4ZWN1dGVLZXlwcmVzc0NvbW1hbmQoY29uc3QgU3RyaW5nJiBzZWxlY3RvclN0cmluZykK K3sKKyAgICByZXR1cm4gW21fd2tWaWV3IF9leGVjdXRlS2V5cHJlc3NDb21tYW5kOk5TU2VsZWN0 b3JGcm9tU3RyaW5nKHNlbGVjdG9yU3RyaW5nKV07Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktp dApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQkocmV2 aXNpb24gODI5OTIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcu bW0JKHdvcmtpbmcgY29weSkKQEAgLTcwLDIzICs3MCwyNiBAQAogI2ltcG9ydCA8d3RmL1JlZlB0 ci5oPgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgogCi1AaW50ZXJmYWNlIE5TQXBwbGljYXRp b24gKFdlYk5TQXBwbGljYXRpb25EZXRhaWxzKQorQGludGVyZmFjZSBOU0FwcGxpY2F0aW9uIChX S05TQXBwbGljYXRpb25EZXRhaWxzKQogLSAodm9pZClzcGVha1N0cmluZzooTlNTdHJpbmcgKilz dHJpbmc7CiAtICh2b2lkKV9zZXRDdXJyZW50RXZlbnQ6KE5TRXZlbnQgKilldmVudDsKIEBlbmQK IAotQGludGVyZmFjZSBOU1dpbmRvdyAoV2ViTlNXaW5kb3dEZXRhaWxzKQorQGludGVyZmFjZSBO U09iamVjdCAoV0tOU1RleHRJbnB1dENvbnRleHREZXRhaWxzKQorLSAoQk9PTCl3YW50c1RvSGFu ZGxlTW91c2VFdmVudHM7CistIChCT09MKWhhbmRsZU1vdXNlRXZlbnQ6KE5TRXZlbnQgKilldmVu dDsKK0BlbmQKKworQGludGVyZmFjZSBOU1dpbmRvdyAoV0tOU1dpbmRvd0RldGFpbHMpCiAtIChO U1JlY3QpX2dyb3dCb3hSZWN0OwogLSAoaWQpX2dyb3dCb3hPd25lcjsKIC0gKHZvaWQpX3NldFNo b3dPcGFxdWVHcm93Qm94Rm9yT3duZXI6KGlkKW93bmVyOwogLSAoQk9PTClfdXBkYXRlR3Jvd0Jv eEZvcldpbmRvd0ZyYW1lQ2hhbmdlOwogQGVuZAogCi1leHRlcm4gIkMiIHsKLSAgICAvLyBOZWVk IHRvIGRlY2xhcmUgdGhpcyBhdHRyaWJ1dGUgbmFtZSBiZWNhdXNlIEFwcEtpdCBleHBvcnRzIGl0 IGJ1dCBkb2VzIG5vdCBtYWtlIGl0IGF2YWlsYWJsZSBpbiBBUEkgb3IgU1BJIGhlYWRlcnMuCi0g ICAgLy8gRklYTUU6IFdlIHdvdWxkbid0IG5lZWQgdGhpcyBpZiB3ZSBpbXBsZW1lbnRlZCBOU1Rl eHRJbnB1dENsaWVudCBwcm90b2NvbCBpbnN0ZWFkIG9mIGRlcHJlY2F0ZWQgTlNUZXh0SW5wdXQu Ci0gICAgZXh0ZXJuIE5TU3RyaW5nICpOU1RleHRJbnB1dFJlcGxhY2VtZW50UmFuZ2VBdHRyaWJ1 dGVOYW1lOwotfQorLy8gRGVjbGFyZSB0aGlzIGF0dHJpYnV0ZSBuYW1lIGJlY2F1c2UgQXBwS2l0 IGV4cG9ydHMgaXQgYnV0IGRvZXMgbm90IG1ha2UgaXQgYXZhaWxhYmxlIGluIEFQSSBvciBTUEkg aGVhZGVycy4KKy8vIEZJWE1FOiBXZSB3b3VsZG4ndCBuZWVkIHRoaXMgaWYgd2UgaW1wbGVtZW50 ZWQgdGhlIE5TVGV4dElucHV0Q2xpZW50IHByb3RvY29sIGluc3RlYWQgb2YgdGhlIGRlcHJlY2F0 ZWQgTlNUZXh0SW5wdXQuCitleHRlcm4gIkMiIE5TU3RyaW5nICpOU1RleHRJbnB1dFJlcGxhY2Vt ZW50UmFuZ2VBdHRyaWJ1dGVOYW1lOwogCiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogdXNpbmcg bmFtZXNwYWNlIFdlYkNvcmU7CkBAIC0xNTYsMTIgKzE1OSwxNiBAQCBAaW50ZXJmYWNlIFdLVmll d0RhdGEgOiBOU09iamVjdCB7CiB9CiBAZW5kCiAKLUBpbXBsZW1lbnRhdGlvbiBXS1ZpZXdEYXRh CitAaW50ZXJmYWNlIFdLUmVzcG9uZGVyQ2hhaW5TaW5rIDogTlNSZXNwb25kZXIgeworICAgIE5T UmVzcG9uZGVyICpfbGFzdFJlc3BvbmRlckluQ2hhaW47CisgICAgYm9vbCBfZGlkUmVjZWl2ZVVu aGFuZGxlZENvbW1hbmQ7Cit9CistIChpZClpbml0V2l0aFJlc3BvbmRlckNoYWluOihOU1Jlc3Bv bmRlciAqKWNoYWluOworLSAodm9pZClkZXRhY2g7CistIChib29sKWRpZFJlY2VpdmVVbmhhbmRs ZWRDb21tYW5kOwogQGVuZAogCi1AaW50ZXJmYWNlIE5TT2JqZWN0IChOU1RleHRJbnB1dENvbnRl eHREZXRhaWxzKQotLSAoQk9PTCl3YW50c1RvSGFuZGxlTW91c2VFdmVudHM7Ci0tIChCT09MKWhh bmRsZU1vdXNlRXZlbnQ6KE5TRXZlbnQgKilldmVudDsKK0BpbXBsZW1lbnRhdGlvbiBXS1ZpZXdE YXRhCiBAZW5kCiAKIEBpbXBsZW1lbnRhdGlvbiBXS1ZpZXcKQEAgLTEwMzEsNyArMTAzOCw4IEBA IC0gKHZvaWQpZG9Db21tYW5kQnlTZWxlY3RvcjooU0VMKXNlbGVjdG8KICAgICBpZiAocGFyYW1l dGVycyAmJiAhaXNGcm9tSW5wdXRNZXRob2QpCiAgICAgICAgIHBhcmFtZXRlcnMtPmNvbW1hbmRz LT5hcHBlbmQoS2V5cHJlc3NDb21tYW5kKE5TU3RyaW5nRnJvbVNlbGVjdG9yKHNlbGVjdG9yKSkp OwogICAgIGVsc2UgewotICAgICAgICAvLyBGSVhNRTogU2VuZCB0aGUgY29tbWFuZCB0byBFZGl0 b3Igc3luY2hyb25vdXNseS4KKyAgICAgICAgLy8gRklYTUU6IFNlbmQgdGhlIGNvbW1hbmQgdG8g RWRpdG9yIHN5bmNocm9ub3VzbHkgYW5kIG9ubHkgc2VuZCBpdCBhbG9uZyB0aGUKKyAgICAgICAg Ly8gcmVzcG9uZGVyIGNoYWluIGlmIGl0J3MgYSBzZWxlY3RvciB0aGF0IGRvZXMgbm90IGNvcnJl c3BvbmQgdG8gYW4gZWRpdGluZyBjb21tYW5kLgogICAgICAgICBbc3VwZXIgZG9Db21tYW5kQnlT ZWxlY3RvcjpzZWxlY3Rvcl07CiAgICAgfQogfQpAQCAtMjE3Miw2ICsyMTgwLDE2IEBAIC0gKFdL RnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIqKWZ1bGxTY3IKIH0KICNlbmRpZgogCistIChib29s KV9leGVjdXRlS2V5cHJlc3NDb21tYW5kOihTRUwpc2VsZWN0b3IKK3sKKyAgICAvLyBUaGUgc2lu ayBkb2VzIHR3byB0aGluZ3M6IDEpIFRlbGxzIHVzIGlmIHRoZSByZXNwb25kZXIgd2VudCB1bmhh bmRsZWQsIGFuZAorICAgIC8vIDIpIHByZXZlbnRzIGFueSBOU0JlZXA7IHdlIGRvbid0IGV2ZXIg d2FudCB0byBiZWVwIGhlcmUuCisgICAgUmV0YWluUHRyPFdLUmVzcG9uZGVyQ2hhaW5TaW5rPiBz aW5rKEFkb3B0TlMsIFtbV0tSZXNwb25kZXJDaGFpblNpbmsgYWxsb2NdIGluaXRXaXRoUmVzcG9u ZGVyQ2hhaW46c2VsZl0pOworICAgIFtzdXBlciBkb0NvbW1hbmRCeVNlbGVjdG9yOnNlbGVjdG9y XTsKKyAgICBbc2luay5nZXQoKSBkZXRhY2hdOworICAgIHJldHVybiAhW3NpbmsuZ2V0KCkgZGlk UmVjZWl2ZVVuaGFuZGxlZENvbW1hbmRdOworfQorCiBAZW5kCiAKIEBpbXBsZW1lbnRhdGlvbiBX S1ZpZXcgKFByaXZhdGUpCkBAIC0yMjIwLDMgKzIyMzgsNDUgQEAgLSAodm9pZCloYW5kbGVDb3Jy ZWN0aW9uUGFuZWxSZXN1bHQ6KE5TUwogCiBAZW5kCiAKK0BpbXBsZW1lbnRhdGlvbiBXS1Jlc3Bv bmRlckNoYWluU2luaworCistIChpZClpbml0V2l0aFJlc3BvbmRlckNoYWluOihOU1Jlc3BvbmRl ciAqKWNoYWluCit7CisgICAgc2VsZiA9IFtzdXBlciBpbml0XTsKKyAgICBpZiAoIXNlbGYpCisg ICAgICAgIHJldHVybiBuaWw7CisgICAgX2xhc3RSZXNwb25kZXJJbkNoYWluID0gY2hhaW47Cisg ICAgd2hpbGUgKE5TUmVzcG9uZGVyICpuZXh0ID0gW19sYXN0UmVzcG9uZGVySW5DaGFpbiBuZXh0 UmVzcG9uZGVyXSkKKyAgICAgICAgX2xhc3RSZXNwb25kZXJJbkNoYWluID0gbmV4dDsKKyAgICBb X2xhc3RSZXNwb25kZXJJbkNoYWluIHNldE5leHRSZXNwb25kZXI6c2VsZl07CisgICAgcmV0dXJu IHNlbGY7Cit9CisKKy0gKHZvaWQpZGV0YWNoCit7CisgICAgW19sYXN0UmVzcG9uZGVySW5DaGFp biBzZXROZXh0UmVzcG9uZGVyOm5pbF07CisgICAgX2xhc3RSZXNwb25kZXJJbkNoYWluID0gbmls OworfQorCistIChib29sKWRpZFJlY2VpdmVVbmhhbmRsZWRDb21tYW5kCit7CisgICAgcmV0dXJu IF9kaWRSZWNlaXZlVW5oYW5kbGVkQ29tbWFuZDsKK30KKworLSAodm9pZClub1Jlc3BvbmRlckZv cjooU0VMKXNlbGVjdG9yCit7CisgICAgX2RpZFJlY2VpdmVVbmhhbmRsZWRDb21tYW5kID0gdHJ1 ZTsKK30KKworLSAodm9pZClkb0NvbW1hbmRCeVNlbGVjdG9yOihTRUwpc2VsZWN0b3IKK3sKKyAg ICBfZGlkUmVjZWl2ZVVuaGFuZGxlZENvbW1hbmQgPSB0cnVlOworfQorCistIChCT09MKXRyeVRv UGVyZm9ybTooU0VMKWFjdGlvbiB3aXRoOihpZClvYmplY3QKK3sKKyAgICBfZGlkUmVjZWl2ZVVu aGFuZGxlZENvbW1hbmQgPSB0cnVlOworICAgIHJldHVybiBZRVM7Cit9CisKK0BlbmQKSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3SW50ZXJuYWwu aAkocmV2aXNpb24gODI5OTIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9X S1ZpZXdJbnRlcm5hbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNCwxMyArMjQsMTcgQEAKICAqLwog CiAjaW1wb3J0ICJXS1ZpZXcuaCIKLSNpbXBvcnQgPFdlYkNvcmUvRWRpdG9yLmg+Ci0jaW1wb3J0 IDxXZWJDb3JlL0tleWJvYXJkRXZlbnQuaD4KKyNpbXBvcnQgPHd0Zi9Gb3J3YXJkLmg+CisjaW1w b3J0IDx3dGYvVmVjdG9yLmg+CiAKIG5hbWVzcGFjZSBDb3JlSVBDIHsKICAgICBjbGFzcyBEYXRh UmVmZXJlbmNlOwogfQogCituYW1lc3BhY2UgV2ViQ29yZSB7CisgICAgc3RydWN0IEtleXByZXNz Q29tbWFuZDsKK30KKwogbmFtZXNwYWNlIFdlYktpdCB7CiAgICAgY2xhc3MgRHJhd2luZ0FyZWFQ cm94eTsKICAgICBjbGFzcyBGaW5kSW5kaWNhdG9yOwpAQCAtMzgsOSArNDIsNyBAQCBuYW1lc3Bh Y2UgV2ViS2l0IHsKICAgICBzdHJ1Y3QgVGV4dElucHV0U3RhdGU7CiB9CiAKLSNpZiBFTkFCTEUo RlVMTFNDUkVFTl9BUEkpCiBAY2xhc3MgV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlcjsKLSNl bmRpZgogCiBAaW50ZXJmYWNlIFdLVmlldyAoSW50ZXJuYWwpCiAtIChQYXNzT3duUHRyPFdlYktp dDo6RHJhd2luZ0FyZWFQcm94eT4pX2NyZWF0ZURyYXdpbmdBcmVhUHJveHk7CkBAIC01NCw2ICs1 Niw3IEBAIEBpbnRlcmZhY2UgV0tWaWV3IChJbnRlcm5hbCkKIC0gKHZvaWQpX3NldFVzZXJJbnRl cmZhY2VJdGVtU3RhdGU6KE5TU3RyaW5nICopY29tbWFuZE5hbWUgZW5hYmxlZDooQk9PTClpc0Vu YWJsZWQgc3RhdGU6KGludCluZXdTdGF0ZTsKIC0gKEJPT0wpX2ludGVycHJldEtleUV2ZW50OihO U0V2ZW50ICopdGhlRXZlbnQgd2l0aENhY2hlZFRleHRJbnB1dFN0YXRlOihjb25zdCBXZWJLaXQ6 OlRleHRJbnB1dFN0YXRlJiljYWNoZWRUZXh0SW5wdXRTdGF0ZSBzYXZpbmdDb21tYW5kc1RvOihW ZWN0b3I8V2ViQ29yZTo6S2V5cHJlc3NDb21tYW5kPiYpY29tbWFuZHM7CiAtICh2b2lkKV9yZXNl bmRLZXlEb3duRXZlbnQ6KE5TRXZlbnQgKilldmVudDsKKy0gKGJvb2wpX2V4ZWN1dGVLZXlwcmVz c0NvbW1hbmQ6KFNFTClzZWxlY3RvcjsKIC0gKE5TUmVjdClfY29udmVydFRvRGV2aWNlU3BhY2U6 KE5TUmVjdClyZWN0OwogLSAoTlNSZWN0KV9jb252ZXJ0VG9Vc2VyU3BhY2U6KE5TUmVjdClyZWN0 OwogLSAodm9pZClfc2V0RmluZEluZGljYXRvcjooUGFzc1JlZlB0cjxXZWJLaXQ6OkZpbmRJbmRp Y2F0b3I+KWZpbmRJbmRpY2F0b3IgZmFkZU91dDooQk9PTClmYWRlT3V0OwpJbmRleDogU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJGdWxsU2NyZWVuTWFuYWdlclByb3h5TWFjLm1tCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViRnVsbFNjcmVlbk1h bmFnZXJQcm94eU1hYy5tbQkocmV2aXNpb24gODI5OTIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvbWFjL1dlYkZ1bGxTY3JlZW5NYW5hZ2VyUHJveHlNYWMubW0JKHdvcmtpbmcgY29weSkK QEAgLTIzLDExICsyMywxMyBAQAogICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgog ICovCiAKLSNpbmNsdWRlICJjb25maWcuaCIKLSNpbmNsdWRlICJXZWJGdWxsU2NyZWVuTWFuYWdl clByb3h5LmgiCi0jaW5jbHVkZSAiTGF5ZXJUcmVlQ29udGV4dC5oIgotI2luY2x1ZGUgIldLRnVs bFNjcmVlbldpbmRvd0NvbnRyb2xsZXIuaCIKLSNpbmNsdWRlICJXS1ZpZXdJbnRlcm5hbC5oIgor I2ltcG9ydCAiY29uZmlnLmgiCisjaW1wb3J0ICJXZWJGdWxsU2NyZWVuTWFuYWdlclByb3h5Lmgi CisKKyNpbXBvcnQgIkxheWVyVHJlZUNvbnRleHQuaCIKKyNpbXBvcnQgIldLRnVsbFNjcmVlbldp bmRvd0NvbnRyb2xsZXIuaCIKKyNpbXBvcnQgIldLVmlld0ludGVybmFsLmgiCisjaW1wb3J0IDxX ZWJDb3JlL0ludFJlY3QuaD4KIAogI2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkKIApJbmRleDog U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJveHlNYWMubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJveHlNYWMubW0JKHJl dmlzaW9uIDgyOTkyKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJv eHlNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTI4Myw0ICsyODMsOSBAQCB2b2lkIFdlYlBhZ2VQ cm94eTo6c2V0Q29tcGxleFRleHRJbnB1dEVuCiAgICAgbV9wYWdlQ2xpZW50LT5zZXRDb21wbGV4 VGV4dElucHV0RW5hYmxlZChwbHVnaW5Db21wbGV4VGV4dElucHV0SWRlbnRpZmllciwgY29tcGxl eFRleHRJbnB1dEVuYWJsZWQpOwogfQogCit2b2lkIFdlYlBhZ2VQcm94eTo6ZXhlY3V0ZUtleXBy ZXNzQ29tbWFuZChjb25zdCBTdHJpbmcmIHNlbGVjdG9yLCBib29sJiBoYW5kbGVkKQoreworICAg IGhhbmRsZWQgPSBtX3BhZ2VDbGllbnQtPmV4ZWN1dGVLZXlwcmVzc0NvbW1hbmQoc2VsZWN0b3Ip OworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW0JKHJldmlzaW9uIDgyOTky KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1t CSh3b3JraW5nIGNvcHkpCkBAIC0xNTIsNyArMTUyLDEyIEBAIGJvb2wgV2ViUGFnZTo6ZXhlY3V0 ZUtleXByZXNzQ29tbWFuZHNJbnQKICAgICAgICAgICAgIEVkaXRvcjo6Q29tbWFuZCBjb21tYW5k ID0gZnJhbWUtPmVkaXRvcigpLT5jb21tYW5kKGNvbW1hbmROYW1lRm9yU2VsZWN0b3JOYW1lKGNv bW1hbmRzW2ldLmNvbW1hbmROYW1lKSk7CiAgICAgICAgICAgICBpZiAoY29tbWFuZC5pc1N1cHBv cnRlZCgpKQogICAgICAgICAgICAgICAgIGV2ZW50V2FzSGFuZGxlZCB8PSBjb21tYW5kLmV4ZWN1 dGUoZXZlbnQpOwotICAgICAgICAgICAgLy8gRklYTUU6IFdlYkhUTUxWaWV3IHNlbmRzIHRoZSBl dmVudCB1cCB0aGUgcmVzcG9uZGVyIGNoYWluIHdpdGggV2ViUmVzcG9uZGVyQ2hhaW5TaW5rIGlm IGl0J3Mgbm90IHN1cHBvcnRlZCBieSB0aGUgZWRpdG9yLiBTaG91bGQgd2UgZG8gdGhlIHNhbWU/ CisgICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgICAgICBib29sIGV2ZW50V2FzSGFuZGxl ZEJ5VUlQcm9jZXNzID0gZmFsc2U7CisgICAgICAgICAgICAgICAgV2ViUHJvY2Vzczo6c2hhcmVk KCkuY29ubmVjdGlvbigpLT5zZW5kU3luYyhNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpFeGVjdXRl S2V5cHJlc3NDb21tYW5kKGNvbW1hbmRzW2ldLmNvbW1hbmROYW1lKSwgCisgICAgICAgICAgICAg ICAgICAgIE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkV4ZWN1dGVLZXlwcmVzc0NvbW1hbmQ6OlJl cGx5KGV2ZW50V2FzSGFuZGxlZEJ5VUlQcm9jZXNzKSwgbV9wYWdlSUQpOworICAgICAgICAgICAg ICAgIGV2ZW50V2FzSGFuZGxlZCB8PSBldmVudFdhc0hhbmRsZWRCeVVJUHJvY2VzczsKKyAgICAg ICAgICAgIH0KICAgICAgICAgfQogICAgIH0KICAgICByZXR1cm4gZXZlbnRXYXNIYW5kbGVkOwo=