201864 2019-09-17 01:03:34 -0700 Remove the "Show Link Previews" and "Hide Link Previews" action menus in the preview platter 2019-09-30 18:03:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dino dino aakash_jain ap ddkilzer ryanhaddad simon.fraser tsavell webkit-bot-watchers-bugzilla webkit-bug-importer oldest_to_newest 1571466 0 dino 2019-09-17 01:03:34 -0700 Remove the "Show Link Previews" and "Hide Link Previews" action menus in the preview platter 1571467 1 dino 2019-09-17 01:05:07 -0700 <rdar://55190038> 1571469 2 378948 dino 2019-09-17 01:09:26 -0700 Created attachment 378948 Patch 1571478 3 378949 dino 2019-09-17 01:31:21 -0700 Created attachment 378949 Patch 1571483 4 378949 simon.fraser 2019-09-17 01:51:10 -0700 Comment on attachment 378949 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=378949&action=review > Source/WebKit/ChangeLog:5 > + https://bugs.webkit.org/show_bug.cgi?id=201864 > + Missing radar number. > Tools/TestWebKitAPI/Tests/WebKitCocoa/ContextMenus.mm:262 > + return [UIViewController new]; autorelease? 1571485 5 dino 2019-09-17 02:04:30 -0700 Committed r249950: <https://trac.webkit.org/changeset/249950> 1571543 6 aakash_jain 2019-09-17 08:27:24 -0700 (In reply to Dean Jackson from comment #5) > Committed r249950: <https://trac.webkit.org/changeset/249950> This seems to have broken the iOS build, as also indicated the EWS. 1571544 7 aakash_jain 2019-09-17 08:27:33 -0700 This seems to be the relevant build error: /Volumes/Data/worker/iOS-12-Build-EWS/build/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.mm:167:10: error: variable 'handler' is used uninitialized whenever switch case is taken [-Werror,-Wsometimes-uninitialized] case _WKElementActionToggleShowLinkPreviews: ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /Volumes/Data/worker/iOS-12-Build-EWS/build/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.mm:175:92: note: uninitialized use occurs here return [[[self alloc] _initWithTitle:(customTitle ? customTitle : title) actionHandler:handler type:type assistant:assistant] autorelease]; ^~~~~~~ /Volumes/Data/worker/iOS-12-Build-EWS/build/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.mm:125:36: note: did you mean to use __block 'handler'? WKElementActionHandlerInternal handler; ^ __block 1 error generated. 1571553 8 tsavell 2019-09-17 09:03:13 -0700 Reverted r249950 for reason: Broke the iOS build. Committed r249956: <https://trac.webkit.org/changeset/249956> 1571765 9 dino 2019-09-17 18:21:01 -0700 Committed r250015: <https://trac.webkit.org/changeset/250015> 1575401 10 ddkilzer 2019-09-30 18:03:18 -0700 (In reply to Dean Jackson from comment #9) > Committed r250015: <https://trac.webkit.org/changeset/250015> The build fix was this: diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction. mm index 4b5ff1bec28..31ec821c9b7 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.mm @@ -121,8 +121,8 @@ + (instancetype)_elementActionWithType:(_WKElementActionType)type title:(NSStrin + (instancetype)_elementActionWithType:(_WKElementActionType)type customTitle:(NSString *)customTitle assistant:(WKActionSheetAssistant *)assistant { - NSString *title; - WKElementActionHandlerInternal handler; + NSString *title = @""; + WKElementActionHandlerInternal handler = nil; switch (type) { case _WKElementActionTypeCopy: title = WEB_UI_STRING_KEY("Copy", "Copy (ActionSheet)", "Title for Copy Link or Image action button"); @@ -164,17 +164,9 @@ + (instancetype)_elementActionWithType:(_WKElementActionType)type customTitle:(N [assistant.delegate actionSheetAssistant:assistant shareElementWithURL:actionInfo.URL ?: actionInfo.imageURL rect:actionInfo.boundingRect]; }; break; - case _WKElementActionToggleShowLinkPreviews: { - bool showingLinkPreviews = true; - if (NSNumber *value = [[NSUserDefaults standardUserDefaults] objectForKey:webkitShowLinkPreviewsPreferenceKey]) - showingLinkPreviews = value.boolValue; - - title = showingLinkPreviews ? WEB_UI_STRING("Hide Link Previews", "Title for Hide Link Previews action button") : WEB_UI_STRING("Show Link Previews", "Title for Show Link Previews action button"); - handler = ^(WKActionSheetAssistant *, _WKActivatedElementInfo *) { - [[NSUserDefaults standardUserDefaults] setBool:!showingLinkPreviews forKey:webkitShowLinkPreviewsPreferenceKey]; - }; + case _WKElementActionToggleShowLinkPreviews: + // This action must still exist for compatibility, but doesn't do anything. break; - } default: [NSException raise:NSInvalidArgumentException format:@"There is no standard web element action of type %ld.", (long)type]; return nil; Wouldn't it be better to do this instead so `handler` is not nil (which would cause a crash if `handler` was invoked without a nullptr check--as it is in this class), and future case statements that don't set these variables get a warning/build failure? diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.mm index 31ec821c9b7..b4b701408f5 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.mm @@ -121,8 +121,8 @@ + (instancetype)_elementActionWithType:(_WKElementActionType)type title:(NSStrin + (instancetype)_elementActionWithType:(_WKElementActionType)type customTitle:(NSString *)customTitle assistant:(WKActionSheetAssistant *)assistant { - NSString *title = @""; - WKElementActionHandlerInternal handler = nil; + NSString *title; + WKElementActionHandlerInternal handler; switch (type) { case _WKElementActionTypeCopy: title = WEB_UI_STRING_KEY("Copy", "Copy (ActionSheet)", "Title for Copy Link or Image action button"); @@ -166,6 +166,8 @@ + (instancetype)_elementActionWithType:(_WKElementActionType)type customTitle:(N break; case _WKElementActionToggleShowLinkPreviews: // This action must still exist for compatibility, but doesn't do anything. + title = @""; + handler = ^(WKActionSheetAssistant *assistant, _WKActivatedElementInfo *actionInfo) { }; break; default: [NSException raise:NSInvalidArgumentException format:@"There is no standard web element action of type %ld.", (long)type]; 378948 2019-09-17 01:09:26 -0700 2019-09-17 01:31:17 -0700 Patch bug-201864-20190917170924.patch text/plain 7850 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5ODcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDExMTRmMDU2MGVhOWM3OWNh ZDhjNTQ2NDE5MDRhNzNhMGI0YWUwYjQuLmY5YTU1OTk3YzJjNDcyNDczYTBmNGM0ZTA0MzZlNTdl NjJlMDE5YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMDktMTcgIERlYW4gSmFj a3NvbiAgPGRpbm9AYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSB0aGUgIlNob3cgTGluayBQ cmV2aWV3cyIgYW5kICJIaWRlIExpbmsgUHJldmlld3MiIGFjdGlvbiBtZW51cyBpbiB0aGUgcHJl dmlldyBwbGF0dGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMDE4NjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbTogUmVtb3ZlIHRo ZSB0b2dnbGUgYWN0aW9uIGZyb20gdGhlCisgICAgICAgIGRlZmF1bHQgdmFsdWVzLgorICAgICAg ICAoLVtXS0FjdGlvblNoZWV0QXNzaXN0YW50IGRlZmF1bHRBY3Rpb25zRm9yTGlua1NoZWV0Ol0p OgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOiBO byBsb25nZXIgdHJ5IHRvIGFkZCBhIHRvZ2dsZSB3aGVuCisgICAgICAgIGl0IGlzbid0IHRoZXJl LgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGFzc2lnbkxlZ2FjeURhdGFGb3JDb250ZXh0TWVu dUludGVyYWN0aW9uXSk6CisgICAgICAgIChtZW51V2l0aFNob3dMaW5rUHJldmlld0FjdGlvbik6 IERlbGV0ZWQuCisKIDIwMTktMDktMTYgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgog CiAgICAgICAgIFByb3ZpZGUgYSBwcm90b3R5cGUgZm9yIEFSIFF1aWNrTG9vayB0byB0cmlnZ2Vy IHByb2Nlc3NpbmcgaW4gdGhlIG9yaWdpbmF0aW5nIHBhZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQubW0KaW5kZXggMzkyMTYy NjE2YTRlNzdiMDYyY2Y0Y2FlYTk5MjBmZmU4YTllNGU2ZC4uOTE4NGIzZjcwZmNlOThkMzA2Njhi MzNiMDA5ZTcwMjg2ODRlYzYwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQubW0KQEAgLTU1OCw4ICs1NTgsNiBAQCBBTExP V19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKICAgICAgICAgW2RlZmF1bHRBY3Rpb25zIGFk ZE9iamVjdDpbX1dLRWxlbWVudEFjdGlvbiBfZWxlbWVudEFjdGlvbldpdGhUeXBlOl9XS0VsZW1l bnRBY3Rpb25UeXBlU2hhcmUgYXNzaXN0YW50OnNlbGZdXTsKICAgICB9CiAKLSAgICBbZGVmYXVs dEFjdGlvbnMgYWRkT2JqZWN0OltfV0tFbGVtZW50QWN0aW9uIF9lbGVtZW50QWN0aW9uV2l0aFR5 cGU6X1dLRWxlbWVudEFjdGlvblRvZ2dsZVNob3dMaW5rUHJldmlld3MgYXNzaXN0YW50OnNlbGZd XTsKLQogICAgIHJldHVybiBkZWZhdWx0QWN0aW9uczsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KaW5kZXgg N2E0NmNhMzRlMjJiYmQyMjM4M2FkZmQzMWYzYTU5YWU5ZmY0MDM4NC4uM2U5MjYyNzcyMzNkZDY1 MTllMmY2NTQ0NDI1ZDNlM2FjZjc0ODYxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC03ODc1LDMyICs3 ODc1LDYgQEAgc3RhdGljIFVJTWVudSAqbWVudUZyb21MZWdhY3lQcmV2aWV3T3JEZWZhdWx0QWN0 aW9ucyhVSVZpZXdDb250cm9sbGVyICpwcmV2aWV3VmkKICAgICByZXR1cm4gW1VJTWVudSBtZW51 V2l0aFRpdGxlOnRpdGxlIGNoaWxkcmVuOmFjdGlvbnNdOwogfQogCi1zdGF0aWMgVUlNZW51ICpt ZW51V2l0aFNob3dMaW5rUHJldmlld0FjdGlvbihVSU1lbnUgKm9yaWdpbmFsTWVudSkKLXsKLSAg ICBpZiAoIW9yaWdpbmFsTWVudSkKLSAgICAgICAgcmV0dXJuIG5pbDsKLQotICAgIC8vIExvb2sg Zm9yIGEgVUlBY3Rpb24gdGhhdCBoYXMgdGhlIFdLRWxlbWVudEFjdGlvblR5cGVUb2dnbGVTaG93 TGlua1ByZXZpZXdzSWRlbnRpZmllci4KLSAgICBOU1VJbnRlZ2VyIHJlc3VsdCA9IFtvcmlnaW5h bE1lbnUuY2hpbGRyZW4gaW5kZXhPZk9iamVjdFBhc3NpbmdUZXN0Ol5CT09MKFVJTWVudUVsZW1l bnQgKmVsZW1lbnQsIE5TVUludGVnZXIgaW5kZXgsIEJPT0wgKnN0b3ApIHsKLSAgICAgICAgaWYg KCFbZWxlbWVudCBpc0tpbmRPZkNsYXNzOltVSUFjdGlvbiBjbGFzc11dKQotICAgICAgICAgICAg cmV0dXJuIE5POwotICAgICAgICBpZiAoWyhVSUFjdGlvbiAqKWVsZW1lbnQgaWRlbnRpZmllcl0g PT0gV0tFbGVtZW50QWN0aW9uVHlwZVRvZ2dsZVNob3dMaW5rUHJldmlld3NJZGVudGlmaWVyKSB7 Ci0gICAgICAgICAgICAqc3RvcCA9IFlFUzsKLSAgICAgICAgICAgIHJldHVybiBZRVM7Ci0gICAg ICAgIH0KLSAgICAgICAgcmV0dXJuIE5POwotICAgIH1dOwotICAgIGlmIChyZXN1bHQgIT0gTlNO b3RGb3VuZCkKLSAgICAgICAgcmV0dXJuIG9yaWdpbmFsTWVudTsKLQotICAgIC8vIFdlIGRpZG4n dCBmaW5kIG9uZSwgc28gbWFrZSBhIG5ldyBVSU1lbnUgd2l0aCB0aGUgdG9nZ2xlIGFjdGlvbi4K LSAgICBOU011dGFibGVBcnJheTxVSU1lbnVFbGVtZW50ICo+ICptZW51RWxlbWVudHMgPSBbTlNN dXRhYmxlQXJyYXkgYXJyYXlXaXRoQ2FwYWNpdHk6KG9yaWdpbmFsTWVudS5jaGlsZHJlbi5jb3Vu dCArIDEpXTsKLSAgICBbbWVudUVsZW1lbnRzIGFkZE9iamVjdHNGcm9tQXJyYXk6b3JpZ2luYWxN ZW51LmNoaWxkcmVuXTsKLSAgICBfV0tFbGVtZW50QWN0aW9uICp0b2dnbGVBY3Rpb24gPSBbX1dL RWxlbWVudEFjdGlvbiBlbGVtZW50QWN0aW9uV2l0aFR5cGU6X1dLRWxlbWVudEFjdGlvblRvZ2ds ZVNob3dMaW5rUHJldmlld3NdOwotICAgIFttZW51RWxlbWVudHMgYWRkT2JqZWN0Olt0b2dnbGVB Y3Rpb24gdWlBY3Rpb25Gb3JFbGVtZW50SW5mbzpuaWxdXTsKLSAgICByZXR1cm4gW29yaWdpbmFs TWVudSBtZW51QnlSZXBsYWNpbmdDaGlsZHJlbjptZW51RWxlbWVudHNdOwotfQotCiAtICh2b2lk KWFzc2lnbkxlZ2FjeURhdGFGb3JDb250ZXh0TWVudUludGVyYWN0aW9uCiB7CiAgICAgQVNTRVJU KCFfY29udGV4dE1lbnVIYXNSZXF1ZXN0ZWRMZWdhY3lEYXRhKTsKQEAgLTc5NTMsNyArNzkyNyw3 IEBAIHN0YXRpYyBVSU1lbnUgKm1lbnVXaXRoU2hvd0xpbmtQcmV2aWV3QWN0aW9uKFVJTWVudSAq b3JpZ2luYWxNZW51KQogICAgICAgICAgICAgICAgICAgICBfY29udGV4dE1lbnVMZWdhY3lQcmV2 aWV3Q29udHJvbGxlciA9IGRhdGFEZXRlY3RvcnNSZXN1bHQuZ2V0KCkucHJldmlld1Byb3ZpZGVy KCk7CiAgICAgICAgICAgICAgICAgaWYgKGRhdGFEZXRlY3RvcnNSZXN1bHQgJiYgZGF0YURldGVj dG9yc1Jlc3VsdC5nZXQoKS5hY3Rpb25Qcm92aWRlcikgewogICAgICAgICAgICAgICAgICAgICBh dXRvIG1lbnVFbGVtZW50cyA9IG1lbnVFbGVtZW50c0Zyb21EZWZhdWx0QWN0aW9ucyhkZWZhdWx0 QWN0aW9uc0Zyb21Bc3Npc3RhbnQsIGVsZW1lbnRJbmZvKTsKLSAgICAgICAgICAgICAgICAgICAg X2NvbnRleHRNZW51TGVnYWN5TWVudSA9IG1lbnVXaXRoU2hvd0xpbmtQcmV2aWV3QWN0aW9uKGRh dGFEZXRlY3RvcnNSZXN1bHQuZ2V0KCkuYWN0aW9uUHJvdmlkZXIobWVudUVsZW1lbnRzKSk7Cisg ICAgICAgICAgICAgICAgICAgIF9jb250ZXh0TWVudUxlZ2FjeU1lbnUgPSBkYXRhRGV0ZWN0b3Jz UmVzdWx0LmdldCgpLmFjdGlvblByb3ZpZGVyKG1lbnVFbGVtZW50cyk7CiAgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CiAgICAgICAg ICAgICB9CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5k ZXggNjg2OGVhMWQ4YTMwMjY4N2VkMDQyMWM3ZGVlM2I1MTJlYzAxMGExMy4uZmU2MTU5YmM2OGZi YTIzNmVjYjg0YmMyMTdlMTIxZjkwYTAxOWI2MCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9n CisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTA5LTE3ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgdGhlICJTaG93IExp bmsgUHJldmlld3MiIGFuZCAiSGlkZSBMaW5rIFByZXZpZXdzIiBhY3Rpb24gbWVudXMgaW4gdGhl IHByZXZpZXcgcGxhdHRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjAxODY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGVzdCBmb3IgdGhlIHN1Z2dlc3RlZCBhY3Rpb25zLgorCisgICAgICAgICogVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Db250ZXh0TWVudXMubW06CisgICAgICAgICgt W1Rlc3RDb250ZXh0TWVudVN1Z2dlc3RlZEFjdGlvbnNVSURlbGVnYXRlIHdlYlZpZXc6Y29udGV4 dE1lbnVDb25maWd1cmF0aW9uRm9yRWxlbWVudDpjb21wbGV0aW9uSGFuZGxlcjpdKToKKyAgICAg ICAgKC1bVGVzdENvbnRleHRNZW51U3VnZ2VzdGVkQWN0aW9uc1VJRGVsZWdhdGUgd2ViVmlldzpj b250ZXh0TWVudVdpbGxQcmVzZW50Rm9yRWxlbWVudDpdKToKKyAgICAgICAgKFRFU1QpOgorCiAy MDE5LTA5LTEzICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBX UFQgaW1wb3J0ZXIgc2hvdWxkIGNoZWNrIE1FVEEgZ2xvYmFsIHRhZyBpbiAuYW55LmpzIGZpbGVz IHRvIGdlbmVyYXRlIHRoZSB2YWxpZCAuaHRtbCBzdHViIGZpbGVzCmRpZmYgLS1naXQgYS9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0NvbnRleHRNZW51cy5tbSBiL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvQ29udGV4dE1lbnVzLm1tCmluZGV4IDNm ZjAyYjEyNzZiMDkwNGU4NjAxMjI4ZDExNzlkYjU3ZDk0ZWM4OWMuLjc4ODg2Y2VjYmJkMDE1OWNj YTc3YzhhNWRjZmNlNDA2ZTJhZjQ2ZmUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvQ29udGV4dE1lbnVzLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvQ29udGV4dE1lbnVzLm1tCkBAIC0yNDgsNSArMjQ4LDU2IEBA IFRFU1QoV2ViS2l0LCBDb250ZXh0TWVudUxlZ2FjeSkKIAogI3ByYWdtYSBjbGFuZyBkaWFnbm9z dGljIHBvcAogCitAaW50ZXJmYWNlIFRlc3RDb250ZXh0TWVudVN1Z2dlc3RlZEFjdGlvbnNVSURl bGVnYXRlIDogTlNPYmplY3QgPFdLVUlEZWxlZ2F0ZT4KK0BlbmQKKworQGltcGxlbWVudGF0aW9u IFRlc3RDb250ZXh0TWVudVN1Z2dlc3RlZEFjdGlvbnNVSURlbGVnYXRlCisKKy0gKHZvaWQpd2Vi VmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBjb250ZXh0TWVudUNvbmZpZ3VyYXRpb25Gb3JFbGVt ZW50OihXS0NvbnRleHRNZW51RWxlbWVudEluZm8gKillbGVtZW50SW5mbyBjb21wbGV0aW9uSGFu ZGxlcjoodm9pZCheKShVSUNvbnRleHRNZW51Q29uZmlndXJhdGlvbiAqIF9OdWxsYWJsZSkpY29t cGxldGlvbkhhbmRsZXIKK3sKKyAgICBFWFBFQ1RfVFJVRShbZWxlbWVudEluZm8ubGlua1VSTC5h YnNvbHV0ZVN0cmluZyBpc0VxdWFsVG9TdHJpbmc6W2xpbmtVUkwgYWJzb2x1dGVTdHJpbmddXSk7 CisgICAgY29udGV4dE1lbnVSZXF1ZXN0ZWQgPSB0cnVlOworICAgIFVJQ29udGV4dE1lbnVDb250 ZW50UHJldmlld1Byb3ZpZGVyIHByZXZpZXdQcm92aWRlciA9IF5VSVZpZXdDb250cm9sbGVyICog KCkKKyAgICB7CisgICAgICAgIHJldHVybiBbVUlWaWV3Q29udHJvbGxlciBuZXddOworICAgIH07 CisgICAgVUlDb250ZXh0TWVudUFjdGlvblByb3ZpZGVyIGFjdGlvblByb3ZpZGVyID0gXlVJTWVu dSAqKE5TQXJyYXk8VUlNZW51RWxlbWVudCAqPiAqc3VnZ2VzdGVkQWN0aW9ucykKKyAgICB7Cisg ICAgICAgIE5TQXJyYXk8TlNTdHJpbmcgKj4gKmV4cGVjdGVkSWRlbnRpZmllcnMgPSBAWworICAg ICAgICAgICAgQCJXS0VsZW1lbnRBY3Rpb25UeXBlT3BlbiIsCisgICAgICAgICAgICBAIldLRWxl bWVudEFjdGlvblR5cGVBZGRUb1JlYWRpbmdMaXN0IiwKKyAgICAgICAgICAgIEAiV0tFbGVtZW50 QWN0aW9uVHlwZUNvcHkiLAorICAgICAgICAgICAgQCJXS0VsZW1lbnRBY3Rpb25UeXBlU2hhcmUi CisgICAgICAgIF07CisgICAgICAgIEVYUEVDVF9UUlVFKGV4cGVjdGVkSWRlbnRpZmllcnMuY291 bnQgPT0gc3VnZ2VzdGVkQWN0aW9ucy5jb3VudCk7CisKKyAgICAgICAgW3N1Z2dlc3RlZEFjdGlv bnMgZW51bWVyYXRlT2JqZWN0c1VzaW5nQmxvY2s6XihVSU1lbnVFbGVtZW50ICptZW51RWxlbWVu dCwgTlNVSW50ZWdlciBpbmRleCwgQk9PTCAqKSB7CisgICAgICAgICAgICBFWFBFQ1RfVFJVRShb bWVudUVsZW1lbnQgaXNLaW5kT2ZDbGFzczpbVUlBY3Rpb24gY2xhc3NdXSk7CisgICAgICAgICAg ICBFWFBFQ1RfVFJVRShbWyhVSUFjdGlvbiAqKW1lbnVFbGVtZW50IGlkZW50aWZpZXJdIGlzRXF1 YWxUb1N0cmluZzpleHBlY3RlZElkZW50aWZpZXJzW2luZGV4XV0pOworICAgICAgICB9XTsKKyAg ICAgICAgcmV0dXJuIFtVSU1lbnUgbWVudVdpdGhUaXRsZTpAIiIgY2hpbGRyZW46c3VnZ2VzdGVk QWN0aW9uc107CisgICAgfTsKKyAgICBjb21wbGV0aW9uSGFuZGxlcihbVUlDb250ZXh0TWVudUNv bmZpZ3VyYXRpb24gY29uZmlndXJhdGlvbldpdGhJZGVudGlmaWVyOm5pbCBwcmV2aWV3UHJvdmlk ZXI6cHJldmlld1Byb3ZpZGVyIGFjdGlvblByb3ZpZGVyOmFjdGlvblByb3ZpZGVyXSk7Cit9CisK Ky0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBjb250ZXh0TWVudVdpbGxQcmVz ZW50Rm9yRWxlbWVudDooV0tDb250ZXh0TWVudUVsZW1lbnRJbmZvICopZWxlbWVudEluZm8KK3sK KyAgICB3aWxsUHJlc2VudENhbGxlZCA9IHRydWU7Cit9CisKK0BlbmQKKworVEVTVChXZWJLaXQs IENvbnRleHRNZW51U3VnZ2VzdGVkQWN0aW9ucykKK3sKKyAgICBhdXRvIGRyaXZlciA9IGNvbnRl eHRNZW51V2ViVmlld0RyaXZlcihbVGVzdENvbnRleHRNZW51U3VnZ2VzdGVkQWN0aW9uc1VJRGVs ZWdhdGUgY2xhc3NdKTsKKyAgICBbZHJpdmVyIGJlZ2luOl4oQk9PTCByZXN1bHQpIHsKKyAgICAg ICAgRVhQRUNUX1RSVUUocmVzdWx0KTsKKyAgICAgICAgW2RyaXZlciBjbGlja0Rvd25dOworICAg ICAgICBbZHJpdmVyIGNsaWNrVXBdOworICAgIH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6 OnJ1bigmd2lsbFByZXNlbnRDYWxsZWQpOworICAgIEVYUEVDVF9UUlVFKGNvbnRleHRNZW51UmVx dWVzdGVkKTsKKyAgICBFWFBFQ1RfVFJVRSh3aWxsUHJlc2VudENhbGxlZCk7Cit9CiAKICNlbmRp ZiAvLyBQTEFURk9STShJT1MpICYmIFVTRShVSUNPTlRFWFRNRU5VKQo= 378949 2019-09-17 01:31:21 -0700 2019-09-17 01:51:10 -0700 Patch bug-201864-20190917173118.patch text/plain 9469 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5ODcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDExMTRmMDU2MGVhOWM3OWNh ZDhjNTQ2NDE5MDRhNzNhMGI0YWUwYjQuLmY5YTU1OTk3YzJjNDcyNDczYTBmNGM0ZTA0MzZlNTdl NjJlMDE5YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMDktMTcgIERlYW4gSmFj a3NvbiAgPGRpbm9AYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSB0aGUgIlNob3cgTGluayBQ cmV2aWV3cyIgYW5kICJIaWRlIExpbmsgUHJldmlld3MiIGFjdGlvbiBtZW51cyBpbiB0aGUgcHJl dmlldyBwbGF0dGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMDE4NjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbTogUmVtb3ZlIHRo ZSB0b2dnbGUgYWN0aW9uIGZyb20gdGhlCisgICAgICAgIGRlZmF1bHQgdmFsdWVzLgorICAgICAg ICAoLVtXS0FjdGlvblNoZWV0QXNzaXN0YW50IGRlZmF1bHRBY3Rpb25zRm9yTGlua1NoZWV0Ol0p OgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOiBO byBsb25nZXIgdHJ5IHRvIGFkZCBhIHRvZ2dsZSB3aGVuCisgICAgICAgIGl0IGlzbid0IHRoZXJl LgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGFzc2lnbkxlZ2FjeURhdGFGb3JDb250ZXh0TWVu dUludGVyYWN0aW9uXSk6CisgICAgICAgIChtZW51V2l0aFNob3dMaW5rUHJldmlld0FjdGlvbik6 IERlbGV0ZWQuCisKIDIwMTktMDktMTYgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgog CiAgICAgICAgIFByb3ZpZGUgYSBwcm90b3R5cGUgZm9yIEFSIFF1aWNrTG9vayB0byB0cmlnZ2Vy IHByb2Nlc3NpbmcgaW4gdGhlIG9yaWdpbmF0aW5nIHBhZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tFbGVtZW50QWN0aW9uLm1tIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0VsZW1lbnRBY3Rpb24ubW0KaW5kZXggNGI1ZmYx YmVjMjgzNGY2YWMzNDljMjA1N2U4NmIxNDMxM2VhZTczOS4uMTE5NzM0YTA4ZDQ4NWJiODQ3NGI1 MmNmOGFkYzQyMGE3N2IxOTJlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL19XS0VsZW1lbnRBY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0NvY29hL19XS0VsZW1lbnRBY3Rpb24ubW0KQEAgLTE2NCwxNyArMTY0LDkgQEAgc3Rh dGljIHZvaWQgYWRkVG9SZWFkaW5nTGlzdChOU1VSTCAqdGFyZ2V0VVJMLCBOU1N0cmluZyAqdGl0 bGUpCiAgICAgICAgICAgICBbYXNzaXN0YW50LmRlbGVnYXRlIGFjdGlvblNoZWV0QXNzaXN0YW50 OmFzc2lzdGFudCBzaGFyZUVsZW1lbnRXaXRoVVJMOmFjdGlvbkluZm8uVVJMID86IGFjdGlvbklu Zm8uaW1hZ2VVUkwgcmVjdDphY3Rpb25JbmZvLmJvdW5kaW5nUmVjdF07CiAgICAgICAgIH07CiAg ICAgICAgIGJyZWFrOwotICAgIGNhc2UgX1dLRWxlbWVudEFjdGlvblRvZ2dsZVNob3dMaW5rUHJl dmlld3M6IHsKLSAgICAgICAgYm9vbCBzaG93aW5nTGlua1ByZXZpZXdzID0gdHJ1ZTsKLSAgICAg ICAgaWYgKE5TTnVtYmVyICp2YWx1ZSA9IFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVm YXVsdHNdIG9iamVjdEZvcktleTp3ZWJraXRTaG93TGlua1ByZXZpZXdzUHJlZmVyZW5jZUtleV0p Ci0gICAgICAgICAgICBzaG93aW5nTGlua1ByZXZpZXdzID0gdmFsdWUuYm9vbFZhbHVlOwotCi0g ICAgICAgIHRpdGxlID0gc2hvd2luZ0xpbmtQcmV2aWV3cyA/IFdFQl9VSV9TVFJJTkcoIkhpZGUg TGluayBQcmV2aWV3cyIsICJUaXRsZSBmb3IgSGlkZSBMaW5rIFByZXZpZXdzIGFjdGlvbiBidXR0 b24iKSA6IFdFQl9VSV9TVFJJTkcoIlNob3cgTGluayBQcmV2aWV3cyIsICJUaXRsZSBmb3IgU2hv dyBMaW5rIFByZXZpZXdzIGFjdGlvbiBidXR0b24iKTsKLSAgICAgICAgaGFuZGxlciA9IF4oV0tB Y3Rpb25TaGVldEFzc2lzdGFudCAqLCBfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyAqKSB7Ci0gICAg ICAgICAgICBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBzZXRCb29sOiFz aG93aW5nTGlua1ByZXZpZXdzIGZvcktleTp3ZWJraXRTaG93TGlua1ByZXZpZXdzUHJlZmVyZW5j ZUtleV07Ci0gICAgICAgIH07CisgICAgY2FzZSBfV0tFbGVtZW50QWN0aW9uVG9nZ2xlU2hvd0xp bmtQcmV2aWV3czoKKyAgICAgICAgLy8gVGhpcyBhY3Rpb24gbXVzdCBzdGlsbCBleGlzdCBmb3Ig Y29tcGF0aWJpbGl0eSwgYnV0IGRvZXNuJ3QgZG8gYW55dGhpbmcuCiAgICAgICAgIGJyZWFrOwot ICAgIH0KICAgICBkZWZhdWx0OgogICAgICAgICBbTlNFeGNlcHRpb24gcmFpc2U6TlNJbnZhbGlk QXJndW1lbnRFeGNlcHRpb24gZm9ybWF0OkAiVGhlcmUgaXMgbm8gc3RhbmRhcmQgd2ViIGVsZW1l bnQgYWN0aW9uIG9mIHR5cGUgJWxkLiIsIChsb25nKXR5cGVdOwogICAgICAgICByZXR1cm4gbmls OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRB c3Npc3RhbnQubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFz c2lzdGFudC5tbQppbmRleCAzOTIxNjI2MTZhNGU3N2IwNjJjZjRjYWVhOTkyMGZmZThhOWU0ZTZk Li45MTg0YjNmNzBmY2U5OGQzMDY2OGIzM2IwMDllNzAyODY4NGVjNjA5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbQpA QCAtNTU4LDggKzU1OCw2IEBAIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAogICAg ICAgICBbZGVmYXVsdEFjdGlvbnMgYWRkT2JqZWN0OltfV0tFbGVtZW50QWN0aW9uIF9lbGVtZW50 QWN0aW9uV2l0aFR5cGU6X1dLRWxlbWVudEFjdGlvblR5cGVTaGFyZSBhc3Npc3RhbnQ6c2VsZl1d OwogICAgIH0KIAotICAgIFtkZWZhdWx0QWN0aW9ucyBhZGRPYmplY3Q6W19XS0VsZW1lbnRBY3Rp b24gX2VsZW1lbnRBY3Rpb25XaXRoVHlwZTpfV0tFbGVtZW50QWN0aW9uVG9nZ2xlU2hvd0xpbmtQ cmV2aWV3cyBhc3Npc3RhbnQ6c2VsZl1dOwotCiAgICAgcmV0dXJuIGRlZmF1bHRBY3Rpb25zOwog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll d0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXdJbnRlcmFjdGlvbi5tbQppbmRleCA3YTQ2Y2EzNGUyMmJiZDIyMzgzYWRmZDMxZjNhNTlhZTlm ZjQwMzg0Li4zZTkyNjI3NzIzM2RkNjUxOWUyZjY1NDQ0MjVkM2UzYWNmNzQ4NjFmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9u Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJh Y3Rpb24ubW0KQEAgLTc4NzUsMzIgKzc4NzUsNiBAQCBzdGF0aWMgVUlNZW51ICptZW51RnJvbUxl Z2FjeVByZXZpZXdPckRlZmF1bHRBY3Rpb25zKFVJVmlld0NvbnRyb2xsZXIgKnByZXZpZXdWaQog ICAgIHJldHVybiBbVUlNZW51IG1lbnVXaXRoVGl0bGU6dGl0bGUgY2hpbGRyZW46YWN0aW9uc107 CiB9CiAKLXN0YXRpYyBVSU1lbnUgKm1lbnVXaXRoU2hvd0xpbmtQcmV2aWV3QWN0aW9uKFVJTWVu dSAqb3JpZ2luYWxNZW51KQotewotICAgIGlmICghb3JpZ2luYWxNZW51KQotICAgICAgICByZXR1 cm4gbmlsOwotCi0gICAgLy8gTG9vayBmb3IgYSBVSUFjdGlvbiB0aGF0IGhhcyB0aGUgV0tFbGVt ZW50QWN0aW9uVHlwZVRvZ2dsZVNob3dMaW5rUHJldmlld3NJZGVudGlmaWVyLgotICAgIE5TVUlu dGVnZXIgcmVzdWx0ID0gW29yaWdpbmFsTWVudS5jaGlsZHJlbiBpbmRleE9mT2JqZWN0UGFzc2lu Z1Rlc3Q6XkJPT0woVUlNZW51RWxlbWVudCAqZWxlbWVudCwgTlNVSW50ZWdlciBpbmRleCwgQk9P TCAqc3RvcCkgewotICAgICAgICBpZiAoIVtlbGVtZW50IGlzS2luZE9mQ2xhc3M6W1VJQWN0aW9u IGNsYXNzXV0pCi0gICAgICAgICAgICByZXR1cm4gTk87Ci0gICAgICAgIGlmIChbKFVJQWN0aW9u ICopZWxlbWVudCBpZGVudGlmaWVyXSA9PSBXS0VsZW1lbnRBY3Rpb25UeXBlVG9nZ2xlU2hvd0xp bmtQcmV2aWV3c0lkZW50aWZpZXIpIHsKLSAgICAgICAgICAgICpzdG9wID0gWUVTOwotICAgICAg ICAgICAgcmV0dXJuIFlFUzsKLSAgICAgICAgfQotICAgICAgICByZXR1cm4gTk87Ci0gICAgfV07 Ci0gICAgaWYgKHJlc3VsdCAhPSBOU05vdEZvdW5kKQotICAgICAgICByZXR1cm4gb3JpZ2luYWxN ZW51OwotCi0gICAgLy8gV2UgZGlkbid0IGZpbmQgb25lLCBzbyBtYWtlIGEgbmV3IFVJTWVudSB3 aXRoIHRoZSB0b2dnbGUgYWN0aW9uLgotICAgIE5TTXV0YWJsZUFycmF5PFVJTWVudUVsZW1lbnQg Kj4gKm1lbnVFbGVtZW50cyA9IFtOU011dGFibGVBcnJheSBhcnJheVdpdGhDYXBhY2l0eToob3Jp Z2luYWxNZW51LmNoaWxkcmVuLmNvdW50ICsgMSldOwotICAgIFttZW51RWxlbWVudHMgYWRkT2Jq ZWN0c0Zyb21BcnJheTpvcmlnaW5hbE1lbnUuY2hpbGRyZW5dOwotICAgIF9XS0VsZW1lbnRBY3Rp b24gKnRvZ2dsZUFjdGlvbiA9IFtfV0tFbGVtZW50QWN0aW9uIGVsZW1lbnRBY3Rpb25XaXRoVHlw ZTpfV0tFbGVtZW50QWN0aW9uVG9nZ2xlU2hvd0xpbmtQcmV2aWV3c107Ci0gICAgW21lbnVFbGVt ZW50cyBhZGRPYmplY3Q6W3RvZ2dsZUFjdGlvbiB1aUFjdGlvbkZvckVsZW1lbnRJbmZvOm5pbF1d OwotICAgIHJldHVybiBbb3JpZ2luYWxNZW51IG1lbnVCeVJlcGxhY2luZ0NoaWxkcmVuOm1lbnVF bGVtZW50c107Ci19Ci0KIC0gKHZvaWQpYXNzaWduTGVnYWN5RGF0YUZvckNvbnRleHRNZW51SW50 ZXJhY3Rpb24KIHsKICAgICBBU1NFUlQoIV9jb250ZXh0TWVudUhhc1JlcXVlc3RlZExlZ2FjeURh dGEpOwpAQCAtNzk1Myw3ICs3OTI3LDcgQEAgc3RhdGljIFVJTWVudSAqbWVudVdpdGhTaG93TGlu a1ByZXZpZXdBY3Rpb24oVUlNZW51ICpvcmlnaW5hbE1lbnUpCiAgICAgICAgICAgICAgICAgICAg IF9jb250ZXh0TWVudUxlZ2FjeVByZXZpZXdDb250cm9sbGVyID0gZGF0YURldGVjdG9yc1Jlc3Vs dC5nZXQoKS5wcmV2aWV3UHJvdmlkZXIoKTsKICAgICAgICAgICAgICAgICBpZiAoZGF0YURldGVj dG9yc1Jlc3VsdCAmJiBkYXRhRGV0ZWN0b3JzUmVzdWx0LmdldCgpLmFjdGlvblByb3ZpZGVyKSB7 CiAgICAgICAgICAgICAgICAgICAgIGF1dG8gbWVudUVsZW1lbnRzID0gbWVudUVsZW1lbnRzRnJv bURlZmF1bHRBY3Rpb25zKGRlZmF1bHRBY3Rpb25zRnJvbUFzc2lzdGFudCwgZWxlbWVudEluZm8p OwotICAgICAgICAgICAgICAgICAgICBfY29udGV4dE1lbnVMZWdhY3lNZW51ID0gbWVudVdpdGhT aG93TGlua1ByZXZpZXdBY3Rpb24oZGF0YURldGVjdG9yc1Jlc3VsdC5nZXQoKS5hY3Rpb25Qcm92 aWRlcihtZW51RWxlbWVudHMpKTsKKyAgICAgICAgICAgICAgICAgICAgX2NvbnRleHRNZW51TGVn YWN5TWVudSA9IGRhdGFEZXRlY3RvcnNSZXN1bHQuZ2V0KCkuYWN0aW9uUHJvdmlkZXIobWVudUVs ZW1lbnRzKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgRU5EX0JMT0NLX09C SkNfRVhDRVBUSU9OUzsKICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxv ZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2ODY4ZWExZDhhMzAyNjg3ZWQwNDIxYzdkZWUzYjUx MmVjMDEwYTEzLi5mZTYxNTliYzY4ZmJhMjM2ZWNiODRiYzIxN2UxMjFmOTBhMDE5YjYwIDEwMDY0 NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTcgQEAKKzIwMTktMDktMTcgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgorCisgICAg ICAgIFJlbW92ZSB0aGUgIlNob3cgTGluayBQcmV2aWV3cyIgYW5kICJIaWRlIExpbmsgUHJldmll d3MiIGFjdGlvbiBtZW51cyBpbiB0aGUgcHJldmlldyBwbGF0dGVyCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDE4NjQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0IGZvciB0aGUgc3VnZ2VzdGVkIGFj dGlvbnMuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0NvbnRl eHRNZW51cy5tbToKKyAgICAgICAgKC1bVGVzdENvbnRleHRNZW51U3VnZ2VzdGVkQWN0aW9uc1VJ RGVsZWdhdGUgd2ViVmlldzpjb250ZXh0TWVudUNvbmZpZ3VyYXRpb25Gb3JFbGVtZW50OmNvbXBs ZXRpb25IYW5kbGVyOl0pOgorICAgICAgICAoLVtUZXN0Q29udGV4dE1lbnVTdWdnZXN0ZWRBY3Rp b25zVUlEZWxlZ2F0ZSB3ZWJWaWV3OmNvbnRleHRNZW51V2lsbFByZXNlbnRGb3JFbGVtZW50Ol0p OgorICAgICAgICAoVEVTVCk6CisKIDIwMTktMDktMTMgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5A YXBwbGUuY29tPgogCiAgICAgICAgIFdQVCBpbXBvcnRlciBzaG91bGQgY2hlY2sgTUVUQSBnbG9i YWwgdGFnIGluIC5hbnkuanMgZmlsZXMgdG8gZ2VuZXJhdGUgdGhlIHZhbGlkIC5odG1sIHN0dWIg ZmlsZXMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev Q29udGV4dE1lbnVzLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9D b250ZXh0TWVudXMubW0KaW5kZXggM2ZmMDJiMTI3NmIwOTA0ZTg2MDEyMjhkMTE3OWRiNTdkOTRl Yzg5Yy4uNzg4ODZjZWNiYmQwMTU5Y2NhNzdjOGE1ZGNmY2U0MDZlMmFmNDZmZSAxMDA2NDQKLS0t IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Db250ZXh0TWVudXMubW0K KysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Db250ZXh0TWVudXMu bW0KQEAgLTI0OCw1ICsyNDgsNTYgQEAgVEVTVChXZWJLaXQsIENvbnRleHRNZW51TGVnYWN5KQog CiAjcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgcG9wCiAKK0BpbnRlcmZhY2UgVGVzdENvbnRleHRN ZW51U3VnZ2VzdGVkQWN0aW9uc1VJRGVsZWdhdGUgOiBOU09iamVjdCA8V0tVSURlbGVnYXRlPgor QGVuZAorCitAaW1wbGVtZW50YXRpb24gVGVzdENvbnRleHRNZW51U3VnZ2VzdGVkQWN0aW9uc1VJ RGVsZWdhdGUKKworLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGNvbnRleHRN ZW51Q29uZmlndXJhdGlvbkZvckVsZW1lbnQ6KFdLQ29udGV4dE1lbnVFbGVtZW50SW5mbyAqKWVs ZW1lbnRJbmZvIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkKF4pKFVJQ29udGV4dE1lbnVDb25maWd1 cmF0aW9uICogX051bGxhYmxlKSljb21wbGV0aW9uSGFuZGxlcgoreworICAgIEVYUEVDVF9UUlVF KFtlbGVtZW50SW5mby5saW5rVVJMLmFic29sdXRlU3RyaW5nIGlzRXF1YWxUb1N0cmluZzpbbGlu a1VSTCBhYnNvbHV0ZVN0cmluZ11dKTsKKyAgICBjb250ZXh0TWVudVJlcXVlc3RlZCA9IHRydWU7 CisgICAgVUlDb250ZXh0TWVudUNvbnRlbnRQcmV2aWV3UHJvdmlkZXIgcHJldmlld1Byb3ZpZGVy ID0gXlVJVmlld0NvbnRyb2xsZXIgKiAoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIFtVSVZpZXdD b250cm9sbGVyIG5ld107CisgICAgfTsKKyAgICBVSUNvbnRleHRNZW51QWN0aW9uUHJvdmlkZXIg YWN0aW9uUHJvdmlkZXIgPSBeVUlNZW51ICooTlNBcnJheTxVSU1lbnVFbGVtZW50ICo+ICpzdWdn ZXN0ZWRBY3Rpb25zKQorICAgIHsKKyAgICAgICAgTlNBcnJheTxOU1N0cmluZyAqPiAqZXhwZWN0 ZWRJZGVudGlmaWVycyA9IEBbCisgICAgICAgICAgICBAIldLRWxlbWVudEFjdGlvblR5cGVPcGVu IiwKKyAgICAgICAgICAgIEAiV0tFbGVtZW50QWN0aW9uVHlwZUFkZFRvUmVhZGluZ0xpc3QiLAor ICAgICAgICAgICAgQCJXS0VsZW1lbnRBY3Rpb25UeXBlQ29weSIsCisgICAgICAgICAgICBAIldL RWxlbWVudEFjdGlvblR5cGVTaGFyZSIKKyAgICAgICAgXTsKKyAgICAgICAgRVhQRUNUX1RSVUUo ZXhwZWN0ZWRJZGVudGlmaWVycy5jb3VudCA9PSBzdWdnZXN0ZWRBY3Rpb25zLmNvdW50KTsKKwor ICAgICAgICBbc3VnZ2VzdGVkQWN0aW9ucyBlbnVtZXJhdGVPYmplY3RzVXNpbmdCbG9jazpeKFVJ TWVudUVsZW1lbnQgKm1lbnVFbGVtZW50LCBOU1VJbnRlZ2VyIGluZGV4LCBCT09MICopIHsKKyAg ICAgICAgICAgIEVYUEVDVF9UUlVFKFttZW51RWxlbWVudCBpc0tpbmRPZkNsYXNzOltVSUFjdGlv biBjbGFzc11dKTsKKyAgICAgICAgICAgIEVYUEVDVF9UUlVFKFtbKFVJQWN0aW9uICopbWVudUVs ZW1lbnQgaWRlbnRpZmllcl0gaXNFcXVhbFRvU3RyaW5nOmV4cGVjdGVkSWRlbnRpZmllcnNbaW5k ZXhdXSk7CisgICAgICAgIH1dOworICAgICAgICByZXR1cm4gW1VJTWVudSBtZW51V2l0aFRpdGxl OkAiIiBjaGlsZHJlbjpzdWdnZXN0ZWRBY3Rpb25zXTsKKyAgICB9OworICAgIGNvbXBsZXRpb25I YW5kbGVyKFtVSUNvbnRleHRNZW51Q29uZmlndXJhdGlvbiBjb25maWd1cmF0aW9uV2l0aElkZW50 aWZpZXI6bmlsIHByZXZpZXdQcm92aWRlcjpwcmV2aWV3UHJvdmlkZXIgYWN0aW9uUHJvdmlkZXI6 YWN0aW9uUHJvdmlkZXJdKTsKK30KKworLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJW aWV3IGNvbnRleHRNZW51V2lsbFByZXNlbnRGb3JFbGVtZW50OihXS0NvbnRleHRNZW51RWxlbWVu dEluZm8gKillbGVtZW50SW5mbworeworICAgIHdpbGxQcmVzZW50Q2FsbGVkID0gdHJ1ZTsKK30K KworQGVuZAorCitURVNUKFdlYktpdCwgQ29udGV4dE1lbnVTdWdnZXN0ZWRBY3Rpb25zKQorewor ICAgIGF1dG8gZHJpdmVyID0gY29udGV4dE1lbnVXZWJWaWV3RHJpdmVyKFtUZXN0Q29udGV4dE1l bnVTdWdnZXN0ZWRBY3Rpb25zVUlEZWxlZ2F0ZSBjbGFzc10pOworICAgIFtkcml2ZXIgYmVnaW46 XihCT09MIHJlc3VsdCkgeworICAgICAgICBFWFBFQ1RfVFJVRShyZXN1bHQpOworICAgICAgICBb ZHJpdmVyIGNsaWNrRG93bl07CisgICAgICAgIFtkcml2ZXIgY2xpY2tVcF07CisgICAgfV07Cisg ICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZ3aWxsUHJlc2VudENhbGxlZCk7CisgICAgRVhQ RUNUX1RSVUUoY29udGV4dE1lbnVSZXF1ZXN0ZWQpOworICAgIEVYUEVDVF9UUlVFKHdpbGxQcmVz ZW50Q2FsbGVkKTsKK30KIAogI2VuZGlmIC8vIFBMQVRGT1JNKElPUykgJiYgVVNFKFVJQ09OVEVY VE1FTlUpCg==