163506 2016-10-16 11:51:33 -0700 REGRESSION (r206750): Crash when pressing Caps Lock if “Use the Caps Lock key to switch to and from U.S.” is selected in Input Sources preferences 2016-10-16 18:31:36 -0700 1 1 1 Unclassified WebKit UI Events Safari Technology Preview Unspecified macOS 10.12 RESOLVED FIXED InRadar, Regression P1 Blocker --- 1 mitz cdumez cdumez commit-queue webkit-bug-importer webkit oldest_to_newest 1240753 0 mitz 2016-10-16 11:51:33 -0700 <rdar://problem/28792483> To reproduce: 1. In System Preferences > Keyboard > Input Sources, select “Use the Caps Lock key to switch to and from U.S.” 2. In Safari or in MiniBrowser, focus the webpage and press the Caps Lock key Result: An Objective-C exception (Invalid message sent to event "NSEvent: type=FlagsChanged loc=(-307.102,1057.25) time=1336829.1 flags=0x100 win=0x6080001e0900 winNum=34673 ctxt=0x0 keyCode=255") is raised: #0 0x00007fffcbd1dc7d in objc_exception_throw () #1 0x00007fffb764a232 in +[NSException raise:format:arguments:] () #2 0x00007fffb907d390 in -[NSAssertionHandler handleFailureInMethod:object:file:lineNumber:description:] () #3 0x00007fffb53e678c in -[NSEvent characters] () #4 0x0000000108f8480a in WebCore::keyForKeyEvent(NSEvent*) at Source/WebCore/platform/mac/PlatformEventFactoryMac.mm:277 #5 0x0000000100730fac in WebKit::WebEventFactory::createWebKeyboardEvent(NSEvent*, bool, bool, WTF::Vector<WebCore::KeypressCommand, 0ul, WTF::CrashOnOverflow, 16ul> const&) at Source/WebKit2/Shared/mac/WebEventFactory.mm:481 #6 0x00000001002b0458 in WebKit::NativeWebKeyboardEvent::NativeWebKeyboardEvent(NSEvent*, bool, bool, WTF::Vector<WebCore::KeypressCommand, 0ul, WTF::CrashOnOverflow, 16ul> const&) at Source/WebKit2/Shared/mac/NativeWebKeyboardEventMac.mm:39 #7 0x00000001002b070b in WebKit::NativeWebKeyboardEvent::NativeWebKeyboardEvent(NSEvent*, bool, bool, WTF::Vector<WebCore::KeypressCommand, 0ul, WTF::CrashOnOverflow, 16ul> const&) at Source/WebKit2/Shared/mac/NativeWebKeyboardEventMac.mm:41 #8 0x0000000100bbd1ca in ::___ZN6WebKit11WebViewImpl12flagsChangedEP7NSEvent_block_invoke(BOOL, const WTF::Vector<WebCore::KeypressCommand, 0, WTF::CrashOnOverflow, 16> &) at Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm:3945 #9 0x0000000100bba080 in WebKit::WebViewImpl::interpretKeyEvent(NSEvent*, void (signed char, WTF::Vector<WebCore::KeypressCommand, 0ul, WTF::CrashOnOverflow, 16ul> const&) block_pointer) at Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm:3512 #10 0x0000000100bbd0f4 in WebKit::WebViewImpl::flagsChanged(NSEvent*) at Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm:3944 #11 0x0000000100ca8016 in ::-[WKWebView flagsChanged:](NSEvent *) at Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:2699 In WebKit1 MiniBrowser windows, this is preceded by an assertion failure: #0 0x0000000104d14e64 in ::WTFCrash() at /Projects/Safari/OpenSource/Source/WTF/wtf/Assertions.cpp:323 #1 0x0000000108f85ff6 in WebCore::keyIdentifierForKeyEvent(NSEvent*) at /Projects/Safari/OpenSource/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm:529 #2 0x0000000108f87b6c in WebCore::PlatformKeyboardEventBuilder::PlatformKeyboardEventBuilder(NSEvent*) at /Projects/Safari/OpenSource/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm:839 #3 0x0000000108f8666d in WebCore::PlatformKeyboardEventBuilder::PlatformKeyboardEventBuilder(NSEvent*) at /Projects/Safari/OpenSource/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm:830 #4 0x0000000108f86600 in WebCore::PlatformEventFactory::createPlatformKeyboardEvent(NSEvent*) at /Projects/Safari/OpenSource/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm:875 #5 0x0000000103228174 in ::-[WebHTMLView flagsChanged:](NSEvent *) at /Projects/Safari/OpenSource/Source/WebKit/mac/WebView/WebHTMLView.mm:5300 1240755 1 mitz 2016-10-16 12:03:04 -0700 Using nightly builds, I tracked the regression down to the r206737-r206763 range, and the only relevant change in that range is <https://trac.webkit.org/r206750>. 1240775 2 cdumez 2016-10-16 12:13:39 -0700 Thanks I will take a look tomorrow. 1240803 3 cdumez 2016-10-16 16:09:46 -0700 According to https://developer.apple.com/reference/appkit/nsevent/1534183-characters?language=objc : "" This property is only valid for key-up and key-down events. It raises an NSInternalInconsistencyException if accessed on any other kind of event object. "" The issue is that I cam calling characters to other events that keyUp and keyDown it seems. 1240806 4 291782 cdumez 2016-10-16 16:38:49 -0700 Created attachment 291782 Patch 1240807 5 291783 cdumez 2016-10-16 16:43:14 -0700 Created attachment 291783 Patch 1240809 6 291783 mitz 2016-10-16 16:45:26 -0700 Comment on attachment 291783 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=291783&action=review > Source/WebCore/platform/mac/PlatformEventFactoryMac.mm:275 > +#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 > + if ([event type] == NSEventTypeFlagsChanged) > +#else > + if ([event type] == NSFlagsChanged) > +#endif > + return ASCIILiteral("Unidentified"); Instead of doing this, just #import <wtf/AppKitCompatibilityDeclarations.h> so you can use the modern enum unconditionally. 1240816 7 cdumez 2016-10-16 17:09:10 -0700 (In reply to comment #6) > Comment on attachment 291783 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=291783&action=review > > > Source/WebCore/platform/mac/PlatformEventFactoryMac.mm:275 > > +#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 > > + if ([event type] == NSEventTypeFlagsChanged) > > +#else > > + if ([event type] == NSFlagsChanged) > > +#endif > > + return ASCIILiteral("Unidentified"); > > Instead of doing this, just #import <wtf/AppKitCompatibilityDeclarations.h> > so you can use the modern enum unconditionally. Nice, I'll update. 1240818 8 291786 cdumez 2016-10-16 17:13:01 -0700 Created attachment 291786 Patch 1240832 9 291786 commit-queue 2016-10-16 18:31:32 -0700 Comment on attachment 291786 Patch Clearing flags on attachment: 291786 Committed r207397: <http://trac.webkit.org/changeset/207397> 1240833 10 commit-queue 2016-10-16 18:31:36 -0700 All reviewed patches have been landed. Closing bug. 291782 2016-10-16 16:38:49 -0700 2016-10-16 16:43:10 -0700 Patch bug-163506-20161016163517.patch text/plain 2860 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3Mzk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODc1NzYxOWE3MGM0YmMz OTAwNDIzNGE3Y2RhOGIzNzE4YjQ1MDU4Zi4uYzAxYmE1ZWE2NDViYTIyOGFmYjE3NDE4MzM2NDY3 OWU2YzY1NmNjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE2LTEwLTE2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjIwNjc1 MCk6IENyYXNoIHdoZW4gcHJlc3NpbmcgQ2FwcyBMb2NrIGlmIOKAnFVzZSB0aGUgQ2FwcyBMb2Nr IGtleSB0byBzd2l0Y2ggdG8gYW5kIGZyb20gVS5TLuKAnSBpcyBzZWxlY3RlZCBpbiBJbnB1dCBT b3VyY2VzIHByZWZlcmVuY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjM1MDYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI4NzkyNDgzPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFzIHBlciB0aGUg TlNFdmVudCBkb2N1bWVudGF0aW9uIFsxXSwgY2FsbGluZyBbTlNFdmVudCBjaGFyYWN0ZXJzXSBp cyBvbmx5CisgICAgICAgIHZhbGlkIG9uIGtleSB1cCAvIGtleSBkb3duIGV2ZW50cyBhbmQgd2ls bCByYWlzZSBhbiBOU0ludGVybmFsSW5jb25zaXN0ZW5jeUV4Y2VwdGlvbgorICAgICAgICBpZiBh Y2Nlc3NlZCBvbiBhbnkgb3RoZXIga2luZCBvZiBldmVudCBvYmplY3QuIFRoZSBjcmFzaCBoYXBw ZW5zIHdoZW4ga2V5Rm9yS2V5RXZlbnQoKQorICAgICAgICBpcyBjYWxsZWQgd2l0aCB0aGUgdGhp cmQga2luZCBvZiBrZXkgZXZlbnQgKE5TRmxhZ3NDaGFuZ2VkKSB3aGljaCBpcyB1c2VkIGZvcgor ICAgICAgICBkZXRlY3RpbmcgbW9kaWZpZXIga2V5cy4gV2Ugbm9ybWFsbHkgZGV0ZWN0IHRoZSBt b2RpZmllciBrZXkgYW5kIHJldHVybiBlYXJseSBiZWZvcmUKKyAgICAgICAgY2FsbGluZyBbTlNF dmVudCBjaGFyYWN0ZXJzXS4gSG93ZXZlciwgaW4gc29tZSByYXJlIGNhc2VzLCB3ZSBmYWlsIHRv IGRldGVjdCB0aGUKKyAgICAgICAgbW9kaWZpZXIga2V5IGFuZCB3ZSBmYWxsIHRocm91Z2guCisK KyAgICAgICAgVG8gYWRkcmVzcyB0aGUgaXNzdWUsIHdlIG5vdyByZXR1cm4gIlVuaWRlbnRpZmll ZCIgZm9yIE5TRmxhZ3NDaGFuZ2VkIGV2ZW50cywgaWYgd2UKKyAgICAgICAgZmFpbCB0byBkZXRl Y3QgdGhlIG1vZGlmaWVyIGtleSBhbmQgYmVmb3JlIGNhbGxpbmcgW05TRXZlbnQgY2hhcmFjdGVy c10uCisKKyAgICAgICAgWzFdIGh0dHBzOi8vZGV2ZWxvcGVyLmFwcGxlLmNvbS9yZWZlcmVuY2Uv YXBwa2l0L25zZXZlbnQvMTUzNDE4My1jaGFyYWN0ZXJzCisKKyAgICAgICAgTm8gbmV3IHRlc3Qs IG5vdCBlYXNpbHkgdGVzdGFibGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvUGxhdGZvcm1F dmVudEZhY3RvcnlNYWMubW06CisgICAgICAgIChXZWJDb3JlOjprZXlGb3JLZXlFdmVudCk6CisK IDIwMTYtMTAtMTYgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KIAogICAgICAg ICBbTW9kZXJuIE1lZGlhIENvbnRyb2xzXSBTdHlsZXMgZm9yIFN0YXJ0QnV0dG9uIGFyZSBtaXNz aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGxhdGZvcm1FdmVu dEZhY3RvcnlNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGxhdGZvcm1FdmVu dEZhY3RvcnlNYWMubW0KaW5kZXggMmNlY2QyOWJmMGYyMTQwNDY0ZDg1ZDUzYTc2MjYwNDJhODY5 MjViNi4uYzk4ZDhlMmNlOGM3NTNiNjY4NWVjZTg5ZGFmNDZjZTQ5YjdkOTdkYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1BsYXRmb3JtRXZlbnRGYWN0b3J5TWFjLm1t CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QbGF0Zm9ybUV2ZW50RmFjdG9yeU1h Yy5tbQpAQCAtMjY0LDYgKzI2NCwxMiBAQCBTdHJpbmcga2V5Rm9yS2V5RXZlbnQoTlNFdmVudCAq ZXZlbnQpCiAgICAgICAgIHJldHVybiBBU0NJSUxpdGVyYWwoIkNvbnRyb2wiKTsKICAgICB9CiAK KyAgICAvLyBJZiB0aGUgZXZlbnQgaXMgYW4gTlNGbGFnc0NoYW5nZWQgZXZlbnRzIGFuZCB3ZSBo YXZlIG5vdCByZXR1cm5lZCB5ZXQgdGhlbiB0aGlzIG1lYW5zIHdlIGNvdWxkIG5vdAorICAgIC8v IGlkZW50aWZ5IHRoZSBtb2RpZmllciBrZXkuIFdlIHJldHVybiBub3cgYW5kIHJlcG9ydCB0aGUg a2V5IGFzICJVbmlkZW50aWZpZWQiLgorICAgIC8vIE5vdGUgdGhhdCBbZXZlbnQgY2hhcmFjdGVy c10gYmVsb3cgcmFpc2VzIGFuIGV4Y2VwdGlvbiBpZiBjYWxsZWQgb24gYW4gTlNGbGFnc0NoYW5n ZWQgZXZlbnQuCisgICAgaWYgKFtldmVudCB0eXBlXSA9PSBOU0ZsYWdzQ2hhbmdlZCkKKyAgICAg ICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgiVW5pZGVudGlmaWVkIik7CisKICAgICAvLyBJZiBtb3Jl IHRoYW4gb25lIGtleSBpcyBiZWluZyBwcmVzc2VkIGFuZCB0aGUga2V5IGNvbWJpbmF0aW9uIGlu Y2x1ZGVzIG9uZSBvciBtb3JlIG1vZGlmaWVyIGtleXMKICAgICAvLyB0aGF0IHJlc3VsdCBpbiB0 aGUga2V5IG5vIGxvbmdlciBwcm9kdWNpbmcgYSBwcmludGFibGUgY2hhcmFjdGVyIChlLmcuLCBD b250cm9sICsgYSksIHRoZW4gdGhlCiAgICAgLy8ga2V5IHZhbHVlIHNob3VsZCBiZSB0aGUgcHJp bnRhYmxlIGtleSB2YWx1ZSB0aGF0IHdvdWxkIGhhdmUgYmVlbiBwcm9kdWNlZCBpZiB0aGUga2V5 IGhhZCBiZWVuCg== 291783 2016-10-16 16:43:14 -0700 2016-10-16 17:12:58 -0700 Patch bug-163506-20161016163942.patch text/plain 2972 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3Mzk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODc1NzYxOWE3MGM0YmMz OTAwNDIzNGE3Y2RhOGIzNzE4YjQ1MDU4Zi4uYzAxYmE1ZWE2NDViYTIyOGFmYjE3NDE4MzM2NDY3 OWU2YzY1NmNjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE2LTEwLTE2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjIwNjc1 MCk6IENyYXNoIHdoZW4gcHJlc3NpbmcgQ2FwcyBMb2NrIGlmIOKAnFVzZSB0aGUgQ2FwcyBMb2Nr IGtleSB0byBzd2l0Y2ggdG8gYW5kIGZyb20gVS5TLuKAnSBpcyBzZWxlY3RlZCBpbiBJbnB1dCBT b3VyY2VzIHByZWZlcmVuY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjM1MDYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI4NzkyNDgzPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFzIHBlciB0aGUg TlNFdmVudCBkb2N1bWVudGF0aW9uIFsxXSwgY2FsbGluZyBbTlNFdmVudCBjaGFyYWN0ZXJzXSBp cyBvbmx5CisgICAgICAgIHZhbGlkIG9uIGtleSB1cCAvIGtleSBkb3duIGV2ZW50cyBhbmQgd2ls bCByYWlzZSBhbiBOU0ludGVybmFsSW5jb25zaXN0ZW5jeUV4Y2VwdGlvbgorICAgICAgICBpZiBh Y2Nlc3NlZCBvbiBhbnkgb3RoZXIga2luZCBvZiBldmVudCBvYmplY3QuIFRoZSBjcmFzaCBoYXBw ZW5zIHdoZW4ga2V5Rm9yS2V5RXZlbnQoKQorICAgICAgICBpcyBjYWxsZWQgd2l0aCB0aGUgdGhp cmQga2luZCBvZiBrZXkgZXZlbnQgKE5TRmxhZ3NDaGFuZ2VkKSB3aGljaCBpcyB1c2VkIGZvcgor ICAgICAgICBkZXRlY3RpbmcgbW9kaWZpZXIga2V5cy4gV2Ugbm9ybWFsbHkgZGV0ZWN0IHRoZSBt b2RpZmllciBrZXkgYW5kIHJldHVybiBlYXJseSBiZWZvcmUKKyAgICAgICAgY2FsbGluZyBbTlNF dmVudCBjaGFyYWN0ZXJzXS4gSG93ZXZlciwgaW4gc29tZSByYXJlIGNhc2VzLCB3ZSBmYWlsIHRv IGRldGVjdCB0aGUKKyAgICAgICAgbW9kaWZpZXIga2V5IGFuZCB3ZSBmYWxsIHRocm91Z2guCisK KyAgICAgICAgVG8gYWRkcmVzcyB0aGUgaXNzdWUsIHdlIG5vdyByZXR1cm4gIlVuaWRlbnRpZmll ZCIgZm9yIE5TRmxhZ3NDaGFuZ2VkIGV2ZW50cywgaWYgd2UKKyAgICAgICAgZmFpbCB0byBkZXRl Y3QgdGhlIG1vZGlmaWVyIGtleSBhbmQgYmVmb3JlIGNhbGxpbmcgW05TRXZlbnQgY2hhcmFjdGVy c10uCisKKyAgICAgICAgWzFdIGh0dHBzOi8vZGV2ZWxvcGVyLmFwcGxlLmNvbS9yZWZlcmVuY2Uv YXBwa2l0L25zZXZlbnQvMTUzNDE4My1jaGFyYWN0ZXJzCisKKyAgICAgICAgTm8gbmV3IHRlc3Qs IG5vdCBlYXNpbHkgdGVzdGFibGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvUGxhdGZvcm1F dmVudEZhY3RvcnlNYWMubW06CisgICAgICAgIChXZWJDb3JlOjprZXlGb3JLZXlFdmVudCk6CisK IDIwMTYtMTAtMTYgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KIAogICAgICAg ICBbTW9kZXJuIE1lZGlhIENvbnRyb2xzXSBTdHlsZXMgZm9yIFN0YXJ0QnV0dG9uIGFyZSBtaXNz aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGxhdGZvcm1FdmVu dEZhY3RvcnlNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGxhdGZvcm1FdmVu dEZhY3RvcnlNYWMubW0KaW5kZXggMmNlY2QyOWJmMGYyMTQwNDY0ZDg1ZDUzYTc2MjYwNDJhODY5 MjViNi4uMzU5YjI1MDgwZGE4ZWZjMjc1ZTk0NjQ4MTk1NmFiNDAyNTI5YmU4NSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1BsYXRmb3JtRXZlbnRGYWN0b3J5TWFjLm1t CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QbGF0Zm9ybUV2ZW50RmFjdG9yeU1h Yy5tbQpAQCAtMjY0LDYgKzI2NCwxNiBAQCBTdHJpbmcga2V5Rm9yS2V5RXZlbnQoTlNFdmVudCAq ZXZlbnQpCiAgICAgICAgIHJldHVybiBBU0NJSUxpdGVyYWwoIkNvbnRyb2wiKTsKICAgICB9CiAK KyAgICAvLyBJZiB0aGUgZXZlbnQgaXMgYW4gTlNGbGFnc0NoYW5nZWQgZXZlbnRzIGFuZCB3ZSBo YXZlIG5vdCByZXR1cm5lZCB5ZXQgdGhlbiB0aGlzIG1lYW5zIHdlIGNvdWxkIG5vdAorICAgIC8v IGlkZW50aWZ5IHRoZSBtb2RpZmllciBrZXkuIFdlIHJldHVybiBub3cgYW5kIHJlcG9ydCB0aGUg a2V5IGFzICJVbmlkZW50aWZpZWQiLgorICAgIC8vIE5vdGUgdGhhdCBbZXZlbnQgY2hhcmFjdGVy c10gYmVsb3cgcmFpc2VzIGFuIGV4Y2VwdGlvbiBpZiBjYWxsZWQgb24gYW4gTlNGbGFnc0NoYW5n ZWQgZXZlbnQuCisjaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDEyMDAK KyAgICBpZiAoW2V2ZW50IHR5cGVdID09IE5TRXZlbnRUeXBlRmxhZ3NDaGFuZ2VkKQorI2Vsc2UK KyAgICBpZiAoW2V2ZW50IHR5cGVdID09IE5TRmxhZ3NDaGFuZ2VkKQorI2VuZGlmCisgICAgICAg IHJldHVybiBBU0NJSUxpdGVyYWwoIlVuaWRlbnRpZmllZCIpOworCiAgICAgLy8gSWYgbW9yZSB0 aGFuIG9uZSBrZXkgaXMgYmVpbmcgcHJlc3NlZCBhbmQgdGhlIGtleSBjb21iaW5hdGlvbiBpbmNs dWRlcyBvbmUgb3IgbW9yZSBtb2RpZmllciBrZXlzCiAgICAgLy8gdGhhdCByZXN1bHQgaW4gdGhl IGtleSBubyBsb25nZXIgcHJvZHVjaW5nIGEgcHJpbnRhYmxlIGNoYXJhY3RlciAoZS5nLiwgQ29u dHJvbCArIGEpLCB0aGVuIHRoZQogICAgIC8vIGtleSB2YWx1ZSBzaG91bGQgYmUgdGhlIHByaW50 YWJsZSBrZXkgdmFsdWUgdGhhdCB3b3VsZCBoYXZlIGJlZW4gcHJvZHVjZWQgaWYgdGhlIGtleSBo YWQgYmVlbgo= 291786 2016-10-16 17:13:01 -0700 2016-10-16 18:31:32 -0700 Patch bug-163506-20161016170930.patch text/plain 5946 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3Mzk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODc1NzYxOWE3MGM0YmMz OTAwNDIzNGE3Y2RhOGIzNzE4YjQ1MDU4Zi4uYzAxYmE1ZWE2NDViYTIyOGFmYjE3NDE4MzM2NDY3 OWU2YzY1NmNjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE2LTEwLTE2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjIwNjc1 MCk6IENyYXNoIHdoZW4gcHJlc3NpbmcgQ2FwcyBMb2NrIGlmIOKAnFVzZSB0aGUgQ2FwcyBMb2Nr IGtleSB0byBzd2l0Y2ggdG8gYW5kIGZyb20gVS5TLuKAnSBpcyBzZWxlY3RlZCBpbiBJbnB1dCBT b3VyY2VzIHByZWZlcmVuY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjM1MDYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI4NzkyNDgzPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFzIHBlciB0aGUg TlNFdmVudCBkb2N1bWVudGF0aW9uIFsxXSwgY2FsbGluZyBbTlNFdmVudCBjaGFyYWN0ZXJzXSBp cyBvbmx5CisgICAgICAgIHZhbGlkIG9uIGtleSB1cCAvIGtleSBkb3duIGV2ZW50cyBhbmQgd2ls bCByYWlzZSBhbiBOU0ludGVybmFsSW5jb25zaXN0ZW5jeUV4Y2VwdGlvbgorICAgICAgICBpZiBh Y2Nlc3NlZCBvbiBhbnkgb3RoZXIga2luZCBvZiBldmVudCBvYmplY3QuIFRoZSBjcmFzaCBoYXBw ZW5zIHdoZW4ga2V5Rm9yS2V5RXZlbnQoKQorICAgICAgICBpcyBjYWxsZWQgd2l0aCB0aGUgdGhp cmQga2luZCBvZiBrZXkgZXZlbnQgKE5TRmxhZ3NDaGFuZ2VkKSB3aGljaCBpcyB1c2VkIGZvcgor ICAgICAgICBkZXRlY3RpbmcgbW9kaWZpZXIga2V5cy4gV2Ugbm9ybWFsbHkgZGV0ZWN0IHRoZSBt b2RpZmllciBrZXkgYW5kIHJldHVybiBlYXJseSBiZWZvcmUKKyAgICAgICAgY2FsbGluZyBbTlNF dmVudCBjaGFyYWN0ZXJzXS4gSG93ZXZlciwgaW4gc29tZSByYXJlIGNhc2VzLCB3ZSBmYWlsIHRv IGRldGVjdCB0aGUKKyAgICAgICAgbW9kaWZpZXIga2V5IGFuZCB3ZSBmYWxsIHRocm91Z2guCisK KyAgICAgICAgVG8gYWRkcmVzcyB0aGUgaXNzdWUsIHdlIG5vdyByZXR1cm4gIlVuaWRlbnRpZmll ZCIgZm9yIE5TRmxhZ3NDaGFuZ2VkIGV2ZW50cywgaWYgd2UKKyAgICAgICAgZmFpbCB0byBkZXRl Y3QgdGhlIG1vZGlmaWVyIGtleSBhbmQgYmVmb3JlIGNhbGxpbmcgW05TRXZlbnQgY2hhcmFjdGVy c10uCisKKyAgICAgICAgWzFdIGh0dHBzOi8vZGV2ZWxvcGVyLmFwcGxlLmNvbS9yZWZlcmVuY2Uv YXBwa2l0L25zZXZlbnQvMTUzNDE4My1jaGFyYWN0ZXJzCisKKyAgICAgICAgTm8gbmV3IHRlc3Qs IG5vdCBlYXNpbHkgdGVzdGFibGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvUGxhdGZvcm1F dmVudEZhY3RvcnlNYWMubW06CisgICAgICAgIChXZWJDb3JlOjprZXlGb3JLZXlFdmVudCk6CisK IDIwMTYtMTAtMTYgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KIAogICAgICAg ICBbTW9kZXJuIE1lZGlhIENvbnRyb2xzXSBTdHlsZXMgZm9yIFN0YXJ0QnV0dG9uIGFyZSBtaXNz aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGxhdGZvcm1FdmVu dEZhY3RvcnlNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGxhdGZvcm1FdmVu dEZhY3RvcnlNYWMubW0KaW5kZXggMmNlY2QyOWJmMGYyMTQwNDY0ZDg1ZDUzYTc2MjYwNDJhODY5 MjViNi4uZDM0ZDZlYWU5NDhmN2FmY2JhYjMzMDMxNGZkY2JhNzhlOWU0MDBiOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1BsYXRmb3JtRXZlbnRGYWN0b3J5TWFjLm1t CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QbGF0Zm9ybUV2ZW50RmFjdG9yeU1h Yy5tbQpAQCAtMzYsNiArMzYsNyBAQAogI2ltcG9ydCA8SElUb29sYm94L0V2ZW50cy5oPgogI2lt cG9ydCA8bWFjaC9tYWNoX3RpbWUuaD4KICNpbXBvcnQgPHd0Zi9BU0NJSUNUeXBlLmg+CisjaW1w b3J0IDx3dGYvbWFjL0FwcEtpdENvbXBhdGliaWxpdHlEZWNsYXJhdGlvbnMuaD4KIAogbmFtZXNw YWNlIFdlYkNvcmUgewogCkBAIC0yMjEsMjIgKzIyMiwxNCBAQCBzdGF0aWMgUGxhdGZvcm1XaGVl bEV2ZW50UGhhc2UgcGhhc2VGb3JFdmVudChOU0V2ZW50ICpldmVudCkKIAogc3RhdGljIGlubGlu ZSBTdHJpbmcgdGV4dEZyb21FdmVudChOU0V2ZW50KiBldmVudCkKIHsKLSNpZiBfX01BQ19PU19Y X1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTIwMAogICAgIGlmIChbZXZlbnQgdHlwZV0gPT0g TlNFdmVudFR5cGVGbGFnc0NoYW5nZWQpCi0jZWxzZQotICAgIGlmIChbZXZlbnQgdHlwZV0gPT0g TlNGbGFnc0NoYW5nZWQpCi0jZW5kaWYKICAgICAgICAgcmV0dXJuIGVtcHR5U3RyaW5nKCk7CiAg ICAgcmV0dXJuIFN0cmluZyhbZXZlbnQgY2hhcmFjdGVyc10pOwogfQogCiBzdGF0aWMgaW5saW5l IFN0cmluZyB1bm1vZGlmaWVkVGV4dEZyb21FdmVudChOU0V2ZW50KiBldmVudCkKIHsKLSNpZiBf X01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTIwMAogICAgIGlmIChbZXZlbnQg dHlwZV0gPT0gTlNFdmVudFR5cGVGbGFnc0NoYW5nZWQpCi0jZWxzZQotICAgIGlmIChbZXZlbnQg dHlwZV0gPT0gTlNGbGFnc0NoYW5nZWQpCi0jZW5kaWYKICAgICAgICAgcmV0dXJuIGVtcHR5U3Ry aW5nKCk7CiAgICAgcmV0dXJuIFN0cmluZyhbZXZlbnQgY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZp ZXJzXSk7CiB9CkBAIC0yNjQsMTYgKzI1NywxOCBAQCBTdHJpbmcga2V5Rm9yS2V5RXZlbnQoTlNF dmVudCAqZXZlbnQpCiAgICAgICAgIHJldHVybiBBU0NJSUxpdGVyYWwoIkNvbnRyb2wiKTsKICAg ICB9CiAKKyAgICAvLyBJZiB0aGUgZXZlbnQgaXMgYW4gTlNFdmVudFR5cGVGbGFnc0NoYW5nZWQg ZXZlbnRzIGFuZCB3ZSBoYXZlIG5vdCByZXR1cm5lZCB5ZXQgdGhlbiB0aGlzIG1lYW5zIHdlIGNv dWxkIG5vdAorICAgIC8vIGlkZW50aWZ5IHRoZSBtb2RpZmllciBrZXkuIFdlIHJldHVybiBub3cg YW5kIHJlcG9ydCB0aGUga2V5IGFzICJVbmlkZW50aWZpZWQiLgorICAgIC8vIE5vdGUgdGhhdCBb ZXZlbnQgY2hhcmFjdGVyc10gYmVsb3cgcmFpc2VzIGFuIGV4Y2VwdGlvbiBpZiBjYWxsZWQgb24g YW4gTlNFdmVudFR5cGVGbGFnc0NoYW5nZWQgZXZlbnQuCisgICAgaWYgKFtldmVudCB0eXBlXSA9 PSBOU0V2ZW50VHlwZUZsYWdzQ2hhbmdlZCkKKyAgICAgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgi VW5pZGVudGlmaWVkIik7CisKICAgICAvLyBJZiBtb3JlIHRoYW4gb25lIGtleSBpcyBiZWluZyBw cmVzc2VkIGFuZCB0aGUga2V5IGNvbWJpbmF0aW9uIGluY2x1ZGVzIG9uZSBvciBtb3JlIG1vZGlm aWVyIGtleXMKICAgICAvLyB0aGF0IHJlc3VsdCBpbiB0aGUga2V5IG5vIGxvbmdlciBwcm9kdWNp bmcgYSBwcmludGFibGUgY2hhcmFjdGVyIChlLmcuLCBDb250cm9sICsgYSksIHRoZW4gdGhlCiAg ICAgLy8ga2V5IHZhbHVlIHNob3VsZCBiZSB0aGUgcHJpbnRhYmxlIGtleSB2YWx1ZSB0aGF0IHdv dWxkIGhhdmUgYmVlbiBwcm9kdWNlZCBpZiB0aGUga2V5IGhhZCBiZWVuCiAgICAgLy8gdHlwZWQg d2l0aCB0aGUgZGVmYXVsdCBrZXlib2FyZCBsYXlvdXQgd2l0aCBubyBtb2RpZmllciBrZXlzIGV4 Y2VwdCBmb3IgU2hpZnQgYW5kIEFsdEdyIGFwcGxpZWQuCiAgICAgLy8gaHR0cHM6Ly93M2MuZ2l0 aHViLmlvL3VpZXZlbnRzLyNrZXlzLWd1aWRlbGluZXMKLSNpZiBfX01BQ19PU19YX1ZFUlNJT05f TUlOX1JFUVVJUkVEID49IDEwMTIwMAogICAgIGJvb2wgaXNDb250cm9sRG93biA9IChbZXZlbnQg bW9kaWZpZXJGbGFnc10gJiBOU0V2ZW50TW9kaWZpZXJGbGFnQ29udHJvbCk7Ci0jZWxzZQotICAg IGJvb2wgaXNDb250cm9sRG93biA9IChbZXZlbnQgbW9kaWZpZXJGbGFnc10gJiBOU0NvbnRyb2xL ZXlNYXNrKTsKLSNlbmRpZgogICAgIE5TU3RyaW5nICpzID0gaXNDb250cm9sRG93biA/IFtldmVu dCBjaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnNdIDogW2V2ZW50IGNoYXJhY3RlcnNdOwogICAg IGF1dG8gbGVuZ3RoID0gW3MgbGVuZ3RoXTsKICAgICAvLyBjaGFyYWN0ZXJzIC8gY2hhcmFjdGVy c0lnbm9yaW5nTW9kaWZpZXJzIHJldHVybiBhbiBlbXB0eSBzdHJpbmcgZm9yIGRlYWQga2V5cy4K QEAgLTUwMCwxMSArNDk1LDcgQEAgU3RyaW5nIGNvZGVGb3JLZXlFdmVudChOU0V2ZW50ICpldmVu dCkKIAogU3RyaW5nIGtleUlkZW50aWZpZXJGb3JLZXlFdmVudChOU0V2ZW50KiBldmVudCkKIHsK LSNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTIwMAogICAgIGlmIChb ZXZlbnQgdHlwZV0gPT0gTlNFdmVudFR5cGVGbGFnc0NoYW5nZWQpIHsKLSNlbHNlCi0gICAgaWYg KFtldmVudCB0eXBlXSA9PSBOU0ZsYWdzQ2hhbmdlZCkgewotI2VuZGlmCiAgICAgICAgIHN3aXRj aCAoW2V2ZW50IGtleUNvZGVdKSB7CiAgICAgICAgICAgICBjYXNlIDU0OiAvLyBSaWdodCBDb21t YW5kCiAgICAgICAgICAgICBjYXNlIDU1OiAvLyBMZWZ0IENvbW1hbmQKQEAgLTY5Miw3ICs2ODMs NiBAQCBzdGF0aWMgaW5saW5lIE9wdGlvblNldDxQbGF0Zm9ybUV2ZW50OjpNb2RpZmllcj4gbW9k aWZpZXJzRm9yRXZlbnQoTlNFdmVudCAqZXZlbgogewogICAgIE9wdGlvblNldDxQbGF0Zm9ybUV2 ZW50OjpNb2RpZmllcj4gbW9kaWZpZXJzOwogCi0jaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9S RVFVSVJFRCA+PSAxMDEyMDAKICAgICBpZiAoZXZlbnQubW9kaWZpZXJGbGFncyAmIE5TRXZlbnRN b2RpZmllckZsYWdTaGlmdCkKICAgICAgICAgbW9kaWZpZXJzIHw9IFBsYXRmb3JtRXZlbnQ6Ok1v ZGlmaWVyOjpTaGlmdEtleTsKICAgICBpZiAoZXZlbnQubW9kaWZpZXJGbGFncyAmIE5TRXZlbnRN b2RpZmllckZsYWdDb250cm9sKQpAQCAtNzAzLDE4ICs2OTMsNiBAQCBzdGF0aWMgaW5saW5lIE9w dGlvblNldDxQbGF0Zm9ybUV2ZW50OjpNb2RpZmllcj4gbW9kaWZpZXJzRm9yRXZlbnQoTlNFdmVu dCAqZXZlbgogICAgICAgICBtb2RpZmllcnMgfD0gUGxhdGZvcm1FdmVudDo6TW9kaWZpZXI6Ok1l dGFLZXk7CiAgICAgaWYgKGV2ZW50Lm1vZGlmaWVyRmxhZ3MgJiBOU0V2ZW50TW9kaWZpZXJGbGFn Q2Fwc0xvY2spCiAgICAgICAgIG1vZGlmaWVycyB8PSBQbGF0Zm9ybUV2ZW50OjpNb2RpZmllcjo6 Q2Fwc0xvY2tLZXk7Ci0jZWxzZQotICAgIGlmIChldmVudC5tb2RpZmllckZsYWdzICYgTlNTaGlm dEtleU1hc2spCi0gICAgICAgIG1vZGlmaWVycyB8PSBQbGF0Zm9ybUV2ZW50OjpNb2RpZmllcjo6 U2hpZnRLZXk7Ci0gICAgaWYgKGV2ZW50Lm1vZGlmaWVyRmxhZ3MgJiBOU0NvbnRyb2xLZXlNYXNr KQotICAgICAgICBtb2RpZmllcnMgfD0gUGxhdGZvcm1FdmVudDo6TW9kaWZpZXI6OkN0cmxLZXk7 Ci0gICAgaWYgKGV2ZW50Lm1vZGlmaWVyRmxhZ3MgJiBOU0FsdGVybmF0ZUtleU1hc2spCi0gICAg ICAgIG1vZGlmaWVycyB8PSBQbGF0Zm9ybUV2ZW50OjpNb2RpZmllcjo6QWx0S2V5OwotICAgIGlm IChldmVudC5tb2RpZmllckZsYWdzICYgTlNDb21tYW5kS2V5TWFzaykKLSAgICAgICAgbW9kaWZp ZXJzIHw9IFBsYXRmb3JtRXZlbnQ6Ok1vZGlmaWVyOjpNZXRhS2V5OwotICAgIGlmIChldmVudC5t b2RpZmllckZsYWdzICYgTlNBbHBoYVNoaWZ0S2V5TWFzaykKLSAgICAgICAgbW9kaWZpZXJzIHw9 IFBsYXRmb3JtRXZlbnQ6Ok1vZGlmaWVyOjpDYXBzTG9ja0tleTsKLSNlbmRpZgogCiAgICAgcmV0 dXJuIG1vZGlmaWVyczsKIH0K