136356 2014-08-28 16:44:31 -0700 Occasional thread-safety-related crashes on the ServicesController queue 2014-08-28 16:58:40 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton beidson commit-queue enrica mitz mrowe simon.fraser oldest_to_newest 1032093 0 thorton 2014-08-28 16:44:31 -0700 We shouldn't use API that makes an NSMenu anywhere but the main thread. Instead, use alternate SPI. rdar://problem/18045685 1032094 1 237330 thorton 2014-08-28 16:47:48 -0700 Created attachment 237330 patch 1032095 2 237330 mitz 2014-08-28 16:52:39 -0700 Comment on attachment 237330 patch View in context: https://bugs.webkit.org/attachment.cgi?id=237330&action=review > Source/WebKit2/UIProcess/mac/ServicesController.mm:109 > + NSSharingServiceMask serviceMask = NSSharingServiceMaskViewer | NSSharingServiceMaskEditor; I don’t see why this variable is needed. > Source/WebKit2/UIProcess/mac/ServicesController.mm:110 > + return [[NSSharingService sharingServicesForItems:items mask:serviceMask] count]; You can use .count notation here! 1032096 3 237331 thorton 2014-08-28 16:53:27 -0700 Created attachment 237331 patch 1032097 4 237331 mitz 2014-08-28 16:55:09 -0700 Comment on attachment 237331 patch View in context: https://bugs.webkit.org/attachment.cgi?id=237331&action=review > Source/WebKit2/UIProcess/mac/ServicesController.mm:115 > + NSSharingServiceMask serviceMask = NSSharingServiceMaskViewer | NSSharingServiceMaskEditor; :-| 1032098 5 commit-queue 2014-08-28 16:56:18 -0700 Attachment 237331 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/mac/ServicesController.mm:52: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1032099 6 thorton 2014-08-28 16:58:40 -0700 http://trac.webkit.org/changeset/173092 237330 2014-08-28 16:47:48 -0700 2014-08-28 16:53:27 -0700 patch threads.diff text/plain 5065 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAxNzE2MDJkLi5lZTE2MjVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjIg QEAKIDIwMTQtMDgtMjggIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAK KyAgICAgICAgT2NjYXNpb25hbCB0aHJlYWQtc2FmZXR5LXJlbGF0ZWQgY3Jhc2hlcyBvbiB0aGUg U2VydmljZXNDb250cm9sbGVyIHF1ZXVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMzYzNTYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE4MDQ1Njg1 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQ cm9jZXNzL21hYy9TZXJ2aWNlc0NvbnRyb2xsZXIubW06CisgICAgICAgIChXZWJLaXQ6Omhhc0Nv bXBhdGlibGVTZXJ2aWNlc0Zvckl0ZW1zKToKKyAgICAgICAgQWRkZWQuIENoZWNrIGRpcmVjdGx5 IHdpdGggTlNTaGFyaW5nU2VydmljZSBpZiB3ZSBoYXZlIGFueSBzZXJ2aWNlcyBmb3IgdGhlIGdp dmVuIGl0ZW1zLgorICAgICAgICBXZSBzaG91bGQgZXZlbnR1YWxseSBjaGVjayBWaWV3ZXIgYW5k IEVkaXRvciBzZXJ2aWNlcyBzZXBhcmF0ZWx5IHNvIHRoZSBXZWIgcHJvY2VzcyBjYW4KKyAgICAg ICAgYmUgc21hcnRlciBhYm91dCB3aGVuIGl0IHNob3dzIHRoZSBvdmVybGF5LCBidXQgZm9yIG5v dyB0aGlzIG1haW50YWlucyB0aGUgZXhpc3RpbmcgYmVoYXZpb3IuCisKKyAgICAgICAgKFdlYktp dDo6U2VydmljZXNDb250cm9sbGVyOjpyZWZyZXNoRXhpc3RpbmdTZXJ2aWNlcyk6CisgICAgICAg IE1ha2UgdXNlIG9mIGhhc0NvbXBhdGlibGVTZXJ2aWNlc0Zvckl0ZW1zIGluc3RlYWQgb2YgaGF2 aW5nIE5TU2hhcmluZ1NlcnZpY2VQaWNrZXIgY29uc3RydWN0IE5TTWVudXMuCisKKzIwMTQtMDgt MjggIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKICAgICAgICAgV2Vi S2l0MiBkb2Vzbid0IHN1cHBvcnQgdmlld2VyIHNlcnZpY2VzIHRoYXQgYWNjZXB0IGltYWdlIGF0 dGFjaG1lbnRzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMzYzNDkKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE4MTY0NjA2PgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9TZXJ2aWNlc0NvbnRyb2xsZXIubW0gYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1NlcnZpY2VzQ29udHJvbGxlci5tbQppbmRleCAwZDM2 ZjQ0Li5lNDI2MDY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1Nl cnZpY2VzQ29udHJvbGxlci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1Nl cnZpY2VzQ29udHJvbGxlci5tbQpAQCAtNDIsMTMgKzQyLDI1IEBAIHR5cGVkZWYgZW51bSB7CiAg ICAgTlNTaGFyaW5nU2VydmljZVBpY2tlclN0eWxlVGV4dFNlbGVjdGlvbiA9IDIsCiAgICAgTlNT aGFyaW5nU2VydmljZVBpY2tlclN0eWxlRGF0YURldGVjdG9yID0gMwogfSBOU1NoYXJpbmdTZXJ2 aWNlUGlja2VyU3R5bGU7CisKK3R5cGVkZWYgZW51bSB7CisgICAgTlNTaGFyaW5nU2VydmljZU1h c2tTaGFyZSA9IDEgPDwgMCwKKyAgICBOU1NoYXJpbmdTZXJ2aWNlTWFza1ZpZXdlciA9IDEgPDwg MSwKKyAgICBOU1NoYXJpbmdTZXJ2aWNlTWFza0VkaXRvciA9IDEgPDwgMiwKKworICAgIE5TU2hh cmluZ1NlcnZpY2VNYXNrQWxsVHlwZXMgPSAweEZGRkYKK30gTlNTaGFyaW5nU2VydmljZU1hc2s7 CiAjZW5kaWYKIAotQGludGVyZmFjZSBOU1NoYXJpbmdTZXJ2aWNlUGlja2VyIChEZXRhaWxzKQor QGludGVyZmFjZSBOU1NoYXJpbmdTZXJ2aWNlUGlja2VyIChXS0RldGFpbHMpCiBAcHJvcGVydHkg TlNTaGFyaW5nU2VydmljZVBpY2tlclN0eWxlIHN0eWxlOwogLSAoTlNNZW51ICopbWVudTsKIEBl bmQKIAorQGludGVyZmFjZSBOU1NoYXJpbmdTZXJ2aWNlIChXS0RldGFpbHMpCisrIChOU0FycmF5 ICopc2hhcmluZ1NlcnZpY2VzRm9ySXRlbXM6KE5TQXJyYXkgKilpdGVtcyBtYXNrOihOU1NoYXJp bmdTZXJ2aWNlTWFzayltYXNrRm9yRmlsdGVyaW5nIE5TX0FWQUlMQUJMRV9NQUMoMTBfMTApOwor QGVuZAorCiAjaWZkZWYgX19MUDY0X18KICNpZiBfX2hhc19pbmNsdWRlKDxGb3VuZGF0aW9uL05T RXh0ZW5zaW9uLmg+KQogI2ltcG9ydCA8Rm91bmRhdGlvbi9OU0V4dGVuc2lvbi5oPgpAQCAtNTcs NyArNjksNyBAQCBAaW50ZXJmYWNlIE5TRXh0ZW5zaW9uCiBAZW5kCiAjZW5kaWYKIAotQGludGVy ZmFjZSBOU0V4dGVuc2lvbiAoRGV0YWlscykKK0BpbnRlcmZhY2UgTlNFeHRlbnNpb24gKFdLRGV0 YWlscykKICsgKGlkKWJlZ2luTWF0Y2hpbmdFeHRlbnNpb25zV2l0aEF0dHJpYnV0ZXM6KE5TRGlj dGlvbmFyeSAqKWF0dHJpYnV0ZXMgY29tcGxldGlvbjoodm9pZCAoXikoTlNBcnJheSAqbWF0Y2hp bmdFeHRlbnNpb25zLCBOU0Vycm9yICplcnJvcikpaGFuZGxlcjsKIEBlbmQKICNlbmRpZiAvLyBf X0xQNjRfXwpAQCAtOTIsNiArMTA0LDEyIEBAIFNlcnZpY2VzQ29udHJvbGxlcjo6U2VydmljZXND b250cm9sbGVyKCkKICNlbmRpZiAvLyBfX0xQNjRfXwogfQogCitzdGF0aWMgYm9vbCBoYXNDb21w YXRpYmxlU2VydmljZXNGb3JJdGVtcyhOU0FycmF5ICppdGVtcykKK3sKKyAgICBOU1NoYXJpbmdT ZXJ2aWNlTWFzayBzZXJ2aWNlTWFzayA9IE5TU2hhcmluZ1NlcnZpY2VNYXNrVmlld2VyIHwgTlNT aGFyaW5nU2VydmljZU1hc2tFZGl0b3I7CisgICAgcmV0dXJuIFtbTlNTaGFyaW5nU2VydmljZSBz aGFyaW5nU2VydmljZXNGb3JJdGVtczppdGVtcyBtYXNrOnNlcnZpY2VNYXNrXSBjb3VudF07Cit9 CisKIHZvaWQgU2VydmljZXNDb250cm9sbGVyOjpyZWZyZXNoRXhpc3RpbmdTZXJ2aWNlcyhib29s IHJlZnJlc2hJbW1lZGlhdGVseSkKIHsKICAgICBpZiAobV9oYXNQZW5kaW5nUmVmcmVzaCkKQEAg LTEwMiwxNiArMTIwLDEwIEBAIHZvaWQgU2VydmljZXNDb250cm9sbGVyOjpyZWZyZXNoRXhpc3Rp bmdTZXJ2aWNlcyhib29sIHJlZnJlc2hJbW1lZGlhdGVseSkKICAgICBhdXRvIHJlZnJlc2hUaW1l ID0gZGlzcGF0Y2hfdGltZShESVNQQVRDSF9USU1FX05PVywgcmVmcmVzaEltbWVkaWF0ZWx5ID8g MCA6IChpbnQ2NF90KSgxICogTlNFQ19QRVJfU0VDKSk7CiAgICAgZGlzcGF0Y2hfYWZ0ZXIocmVm cmVzaFRpbWUsIG1fcmVmcmVzaFF1ZXVlLCBeewogICAgICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95 ZWQ8TlNJbWFnZSAqPiBpbWFnZShbW05TSW1hZ2UgYWxsb2NdIGluaXRdKTsKLSAgICAgICAgUmV0 YWluUHRyPE5TU2hhcmluZ1NlcnZpY2VQaWNrZXI+ICBwaWNrZXIgPSBhZG9wdE5TKFtbTlNTaGFy aW5nU2VydmljZVBpY2tlciBhbGxvY10gaW5pdFdpdGhJdGVtczpAWyBpbWFnZSBdXSk7Ci0gICAg ICAgIFtwaWNrZXIgc2V0U3R5bGU6TlNTaGFyaW5nU2VydmljZVBpY2tlclN0eWxlUm9sbG92ZXJd OwotCi0gICAgICAgIGJvb2wgaGFzSW1hZ2VTZXJ2aWNlcyA9IHBpY2tlci5nZXQoKS5tZW51Owor ICAgICAgICBib29sIGhhc0ltYWdlU2VydmljZXMgPSBoYXNDb21wYXRpYmxlU2VydmljZXNGb3JJ dGVtcyhAWyBpbWFnZSBdKTsKIAogICAgICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8TlNBdHRy aWJ1dGVkU3RyaW5nICo+IGF0dHJpYnV0ZWRTdHJpbmcoW1tOU0F0dHJpYnV0ZWRTdHJpbmcgYWxs b2NdIGluaXRXaXRoU3RyaW5nOkAiYSJdKTsKLSAgICAgICAgcGlja2VyID0gYWRvcHROUyhbW05T U2hhcmluZ1NlcnZpY2VQaWNrZXIgYWxsb2NdIGluaXRXaXRoSXRlbXM6QFsgYXR0cmlidXRlZFN0 cmluZyBdXSk7Ci0gICAgICAgIFtwaWNrZXIgc2V0U3R5bGU6TlNTaGFyaW5nU2VydmljZVBpY2tl clN0eWxlVGV4dFNlbGVjdGlvbl07Ci0KLSAgICAgICAgYm9vbCBoYXNTZWxlY3Rpb25TZXJ2aWNl cyA9IHBpY2tlci5nZXQoKS5tZW51OworICAgICAgICBib29sIGhhc1NlbGVjdGlvblNlcnZpY2Vz ID0gaGFzQ29tcGF0aWJsZVNlcnZpY2VzRm9ySXRlbXMoQFsgYXR0cmlidXRlZFN0cmluZyBdKTsK IAogICAgICAgICBzdGF0aWMgTlNBdHRyaWJ1dGVkU3RyaW5nICphdHRyaWJ1dGVkU3RyaW5nV2l0 aFJpY2hDb250ZW50OwogICAgICAgICBpZiAoIWF0dHJpYnV0ZWRTdHJpbmdXaXRoUmljaENvbnRl bnQpIHsKQEAgLTEyMywxMCArMTM1LDcgQEAgdm9pZCBTZXJ2aWNlc0NvbnRyb2xsZXI6OnJlZnJl c2hFeGlzdGluZ1NlcnZpY2VzKGJvb2wgcmVmcmVzaEltbWVkaWF0ZWx5KQogICAgICAgICAgICAg YXR0cmlidXRlZFN0cmluZ1dpdGhSaWNoQ29udGVudCA9IFtyaWNoU3RyaW5nIHJldGFpbl07CiAg ICAgICAgIH0KIAotICAgICAgICBwaWNrZXIgPSBhZG9wdE5TKFtbTlNTaGFyaW5nU2VydmljZVBp Y2tlciBhbGxvY10gaW5pdFdpdGhJdGVtczpAWyBhdHRyaWJ1dGVkU3RyaW5nV2l0aFJpY2hDb250 ZW50IF1dKTsKLSAgICAgICAgW3BpY2tlciBzZXRTdHlsZTpOU1NoYXJpbmdTZXJ2aWNlUGlja2Vy U3R5bGVUZXh0U2VsZWN0aW9uXTsKLQotICAgICAgICBib29sIGhhc1JpY2hDb250ZW50U2Vydmlj ZXMgPSBwaWNrZXIuZ2V0KCkubWVudTsKKyAgICAgICAgYm9vbCBoYXNSaWNoQ29udGVudFNlcnZp Y2VzID0gaGFzQ29tcGF0aWJsZVNlcnZpY2VzRm9ySXRlbXMoQFsgYXR0cmlidXRlZFN0cmluZ1dp dGhSaWNoQ29udGVudCBdKTsKICAgICAgICAgCiAgICAgICAgIGRpc3BhdGNoX2FzeW5jKGRpc3Bh dGNoX2dldF9tYWluX3F1ZXVlKCksIF57CiAgICAgICAgICAgICBib29sIGF2YWlsYWJsZVNlcnZp Y2VzQ2hhbmdlZCA9IChoYXNJbWFnZVNlcnZpY2VzICE9IG1faGFzSW1hZ2VTZXJ2aWNlcykgfHwg KGhhc1NlbGVjdGlvblNlcnZpY2VzICE9IG1faGFzU2VsZWN0aW9uU2VydmljZXMpIHx8IChoYXNS aWNoQ29udGVudFNlcnZpY2VzICE9IG1faGFzUmljaENvbnRlbnRTZXJ2aWNlcyk7Cg== 237331 2014-08-28 16:53:27 -0700 2014-08-28 16:55:09 -0700 patch threads.diff text/plain 5652 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAxNzE2MDJkLi5lZTE2MjVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjIg QEAKIDIwMTQtMDgtMjggIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAK KyAgICAgICAgT2NjYXNpb25hbCB0aHJlYWQtc2FmZXR5LXJlbGF0ZWQgY3Jhc2hlcyBvbiB0aGUg U2VydmljZXNDb250cm9sbGVyIHF1ZXVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMzYzNTYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE4MDQ1Njg1 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQ cm9jZXNzL21hYy9TZXJ2aWNlc0NvbnRyb2xsZXIubW06CisgICAgICAgIChXZWJLaXQ6Omhhc0Nv bXBhdGlibGVTZXJ2aWNlc0Zvckl0ZW1zKToKKyAgICAgICAgQWRkZWQuIENoZWNrIGRpcmVjdGx5 IHdpdGggTlNTaGFyaW5nU2VydmljZSBpZiB3ZSBoYXZlIGFueSBzZXJ2aWNlcyBmb3IgdGhlIGdp dmVuIGl0ZW1zLgorICAgICAgICBXZSBzaG91bGQgZXZlbnR1YWxseSBjaGVjayBWaWV3ZXIgYW5k IEVkaXRvciBzZXJ2aWNlcyBzZXBhcmF0ZWx5IHNvIHRoZSBXZWIgcHJvY2VzcyBjYW4KKyAgICAg ICAgYmUgc21hcnRlciBhYm91dCB3aGVuIGl0IHNob3dzIHRoZSBvdmVybGF5LCBidXQgZm9yIG5v dyB0aGlzIG1haW50YWlucyB0aGUgZXhpc3RpbmcgYmVoYXZpb3IuCisKKyAgICAgICAgKFdlYktp dDo6U2VydmljZXNDb250cm9sbGVyOjpyZWZyZXNoRXhpc3RpbmdTZXJ2aWNlcyk6CisgICAgICAg IE1ha2UgdXNlIG9mIGhhc0NvbXBhdGlibGVTZXJ2aWNlc0Zvckl0ZW1zIGluc3RlYWQgb2YgaGF2 aW5nIE5TU2hhcmluZ1NlcnZpY2VQaWNrZXIgY29uc3RydWN0IE5TTWVudXMuCisKKzIwMTQtMDgt MjggIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKICAgICAgICAgV2Vi S2l0MiBkb2Vzbid0IHN1cHBvcnQgdmlld2VyIHNlcnZpY2VzIHRoYXQgYWNjZXB0IGltYWdlIGF0 dGFjaG1lbnRzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMzYzNDkKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE4MTY0NjA2PgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9TZXJ2aWNlc0NvbnRyb2xsZXIubW0gYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1NlcnZpY2VzQ29udHJvbGxlci5tbQppbmRleCAwZDM2 ZjQ0Li5kYWUwMWYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1Nl cnZpY2VzQ29udHJvbGxlci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1Nl cnZpY2VzQ29udHJvbGxlci5tbQpAQCAtMzYsMTkgKzM2LDM3IEBACiAjaWYgX19oYXNfaW5jbHVk ZSg8QXBwS2l0L05TU2hhcmluZ1NlcnZpY2VfUHJpdmF0ZS5oPikKICNpbXBvcnQgPEFwcEtpdC9O U1NoYXJpbmdTZXJ2aWNlX1ByaXZhdGUuaD4KICNlbHNlCi10eXBlZGVmIGVudW0gewordHlwZWRl ZiBOU19FTlVNKE5TSW50ZWdlciwgTlNTaGFyaW5nU2VydmljZVBpY2tlclN0eWxlKSB7CiAgICAg TlNTaGFyaW5nU2VydmljZVBpY2tlclN0eWxlTWVudSA9IDAsCiAgICAgTlNTaGFyaW5nU2Vydmlj ZVBpY2tlclN0eWxlUm9sbG92ZXIgPSAxLAogICAgIE5TU2hhcmluZ1NlcnZpY2VQaWNrZXJTdHls ZVRleHRTZWxlY3Rpb24gPSAyLAogICAgIE5TU2hhcmluZ1NlcnZpY2VQaWNrZXJTdHlsZURhdGFE ZXRlY3RvciA9IDMKLX0gTlNTaGFyaW5nU2VydmljZVBpY2tlclN0eWxlOworfSBOU19FTlVNX0FW QUlMQUJMRV9NQUMoMTBfMTApOworCit0eXBlZGVmIE5TX0VOVU0oTlNJbnRlZ2VyLCBOU1NoYXJp bmdTZXJ2aWNlVHlwZSkgeworICAgIE5TU2hhcmluZ1NlcnZpY2VUeXBlU2hhcmUgPSAwLAorICAg IE5TU2hhcmluZ1NlcnZpY2VUeXBlVmlld2VyID0gMSwKKyAgICBOU1NoYXJpbmdTZXJ2aWNlVHlw ZUVkaXRvciA9IDIKK30gTlNfRU5VTV9BVkFJTEFCTEVfTUFDKDEwXzEwKTsKKwordHlwZWRlZiBO U19PUFRJT05TKE5TVUludGVnZXIsIE5TU2hhcmluZ1NlcnZpY2VNYXNrKSB7CisgICAgTlNTaGFy aW5nU2VydmljZU1hc2tTaGFyZSA9ICgxIDw8IE5TU2hhcmluZ1NlcnZpY2VUeXBlU2hhcmUpLAor ICAgIE5TU2hhcmluZ1NlcnZpY2VNYXNrVmlld2VyID0gKDEgPDwgTlNTaGFyaW5nU2VydmljZVR5 cGVWaWV3ZXIpLAorICAgIE5TU2hhcmluZ1NlcnZpY2VNYXNrRWRpdG9yID0gKDEgPDwgTlNTaGFy aW5nU2VydmljZVR5cGVFZGl0b3IpLAorCisgICAgTlNTaGFyaW5nU2VydmljZU1hc2tBbGxUeXBl cyA9IDB4RkZGRgorfSBOU19FTlVNX0FWQUlMQUJMRV9NQUMoMTBfMTApOwogI2VuZGlmCiAKLUBp bnRlcmZhY2UgTlNTaGFyaW5nU2VydmljZVBpY2tlciAoRGV0YWlscykKK0BpbnRlcmZhY2UgTlNT aGFyaW5nU2VydmljZVBpY2tlciAoV0tEZXRhaWxzKQogQHByb3BlcnR5IE5TU2hhcmluZ1NlcnZp Y2VQaWNrZXJTdHlsZSBzdHlsZTsKIC0gKE5TTWVudSAqKW1lbnU7CiBAZW5kCiAKK0BpbnRlcmZh Y2UgTlNTaGFyaW5nU2VydmljZSAoV0tEZXRhaWxzKQorKyAoTlNBcnJheSAqKXNoYXJpbmdTZXJ2 aWNlc0Zvckl0ZW1zOihOU0FycmF5ICopaXRlbXMgbWFzazooTlNTaGFyaW5nU2VydmljZU1hc2sp bWFza0ZvckZpbHRlcmluZzsKK0BlbmQKKwogI2lmZGVmIF9fTFA2NF9fCiAjaWYgX19oYXNfaW5j bHVkZSg8Rm91bmRhdGlvbi9OU0V4dGVuc2lvbi5oPikKICNpbXBvcnQgPEZvdW5kYXRpb24vTlNF eHRlbnNpb24uaD4KQEAgLTU3LDcgKzc1LDcgQEAgQGludGVyZmFjZSBOU0V4dGVuc2lvbgogQGVu ZAogI2VuZGlmCiAKLUBpbnRlcmZhY2UgTlNFeHRlbnNpb24gKERldGFpbHMpCitAaW50ZXJmYWNl IE5TRXh0ZW5zaW9uIChXS0RldGFpbHMpCiArIChpZCliZWdpbk1hdGNoaW5nRXh0ZW5zaW9uc1dp dGhBdHRyaWJ1dGVzOihOU0RpY3Rpb25hcnkgKilhdHRyaWJ1dGVzIGNvbXBsZXRpb246KHZvaWQg KF4pKE5TQXJyYXkgKm1hdGNoaW5nRXh0ZW5zaW9ucywgTlNFcnJvciAqZXJyb3IpKWhhbmRsZXI7 CiBAZW5kCiAjZW5kaWYgLy8gX19MUDY0X18KQEAgLTkyLDYgKzExMCwxMiBAQCBTZXJ2aWNlc0Nv bnRyb2xsZXI6OlNlcnZpY2VzQ29udHJvbGxlcigpCiAjZW5kaWYgLy8gX19MUDY0X18KIH0KIAor c3RhdGljIGJvb2wgaGFzQ29tcGF0aWJsZVNlcnZpY2VzRm9ySXRlbXMoTlNBcnJheSAqaXRlbXMp Cit7CisgICAgTlNTaGFyaW5nU2VydmljZU1hc2sgc2VydmljZU1hc2sgPSBOU1NoYXJpbmdTZXJ2 aWNlTWFza1ZpZXdlciB8IE5TU2hhcmluZ1NlcnZpY2VNYXNrRWRpdG9yOworICAgIHJldHVybiBb TlNTaGFyaW5nU2VydmljZSBzaGFyaW5nU2VydmljZXNGb3JJdGVtczppdGVtcyBtYXNrOnNlcnZp Y2VNYXNrXS5jb3VudDsKK30KKwogdm9pZCBTZXJ2aWNlc0NvbnRyb2xsZXI6OnJlZnJlc2hFeGlz dGluZ1NlcnZpY2VzKGJvb2wgcmVmcmVzaEltbWVkaWF0ZWx5KQogewogICAgIGlmIChtX2hhc1Bl bmRpbmdSZWZyZXNoKQpAQCAtMTAyLDE2ICsxMjYsMTAgQEAgdm9pZCBTZXJ2aWNlc0NvbnRyb2xs ZXI6OnJlZnJlc2hFeGlzdGluZ1NlcnZpY2VzKGJvb2wgcmVmcmVzaEltbWVkaWF0ZWx5KQogICAg IGF1dG8gcmVmcmVzaFRpbWUgPSBkaXNwYXRjaF90aW1lKERJU1BBVENIX1RJTUVfTk9XLCByZWZy ZXNoSW1tZWRpYXRlbHkgPyAwIDogKGludDY0X3QpKDEgKiBOU0VDX1BFUl9TRUMpKTsKICAgICBk aXNwYXRjaF9hZnRlcihyZWZyZXNoVGltZSwgbV9yZWZyZXNoUXVldWUsIF57CiAgICAgICAgIHN0 YXRpYyBOZXZlckRlc3Ryb3llZDxOU0ltYWdlICo+IGltYWdlKFtbTlNJbWFnZSBhbGxvY10gaW5p dF0pOwotICAgICAgICBSZXRhaW5QdHI8TlNTaGFyaW5nU2VydmljZVBpY2tlcj4gIHBpY2tlciA9 IGFkb3B0TlMoW1tOU1NoYXJpbmdTZXJ2aWNlUGlja2VyIGFsbG9jXSBpbml0V2l0aEl0ZW1zOkBb IGltYWdlIF1dKTsKLSAgICAgICAgW3BpY2tlciBzZXRTdHlsZTpOU1NoYXJpbmdTZXJ2aWNlUGlj a2VyU3R5bGVSb2xsb3Zlcl07Ci0KLSAgICAgICAgYm9vbCBoYXNJbWFnZVNlcnZpY2VzID0gcGlj a2VyLmdldCgpLm1lbnU7CisgICAgICAgIGJvb2wgaGFzSW1hZ2VTZXJ2aWNlcyA9IGhhc0NvbXBh dGlibGVTZXJ2aWNlc0Zvckl0ZW1zKEBbIGltYWdlIF0pOwogCiAgICAgICAgIHN0YXRpYyBOZXZl ckRlc3Ryb3llZDxOU0F0dHJpYnV0ZWRTdHJpbmcgKj4gYXR0cmlidXRlZFN0cmluZyhbW05TQXR0 cmlidXRlZFN0cmluZyBhbGxvY10gaW5pdFdpdGhTdHJpbmc6QCJhIl0pOwotICAgICAgICBwaWNr ZXIgPSBhZG9wdE5TKFtbTlNTaGFyaW5nU2VydmljZVBpY2tlciBhbGxvY10gaW5pdFdpdGhJdGVt czpAWyBhdHRyaWJ1dGVkU3RyaW5nIF1dKTsKLSAgICAgICAgW3BpY2tlciBzZXRTdHlsZTpOU1No YXJpbmdTZXJ2aWNlUGlja2VyU3R5bGVUZXh0U2VsZWN0aW9uXTsKLQotICAgICAgICBib29sIGhh c1NlbGVjdGlvblNlcnZpY2VzID0gcGlja2VyLmdldCgpLm1lbnU7CisgICAgICAgIGJvb2wgaGFz U2VsZWN0aW9uU2VydmljZXMgPSBoYXNDb21wYXRpYmxlU2VydmljZXNGb3JJdGVtcyhAWyBhdHRy aWJ1dGVkU3RyaW5nIF0pOwogCiAgICAgICAgIHN0YXRpYyBOU0F0dHJpYnV0ZWRTdHJpbmcgKmF0 dHJpYnV0ZWRTdHJpbmdXaXRoUmljaENvbnRlbnQ7CiAgICAgICAgIGlmICghYXR0cmlidXRlZFN0 cmluZ1dpdGhSaWNoQ29udGVudCkgewpAQCAtMTIzLDEwICsxNDEsNyBAQCB2b2lkIFNlcnZpY2Vz Q29udHJvbGxlcjo6cmVmcmVzaEV4aXN0aW5nU2VydmljZXMoYm9vbCByZWZyZXNoSW1tZWRpYXRl bHkpCiAgICAgICAgICAgICBhdHRyaWJ1dGVkU3RyaW5nV2l0aFJpY2hDb250ZW50ID0gW3JpY2hT dHJpbmcgcmV0YWluXTsKICAgICAgICAgfQogCi0gICAgICAgIHBpY2tlciA9IGFkb3B0TlMoW1tO U1NoYXJpbmdTZXJ2aWNlUGlja2VyIGFsbG9jXSBpbml0V2l0aEl0ZW1zOkBbIGF0dHJpYnV0ZWRT dHJpbmdXaXRoUmljaENvbnRlbnQgXV0pOwotICAgICAgICBbcGlja2VyIHNldFN0eWxlOk5TU2hh cmluZ1NlcnZpY2VQaWNrZXJTdHlsZVRleHRTZWxlY3Rpb25dOwotCi0gICAgICAgIGJvb2wgaGFz UmljaENvbnRlbnRTZXJ2aWNlcyA9IHBpY2tlci5nZXQoKS5tZW51OworICAgICAgICBib29sIGhh c1JpY2hDb250ZW50U2VydmljZXMgPSBoYXNDb21wYXRpYmxlU2VydmljZXNGb3JJdGVtcyhAWyBh dHRyaWJ1dGVkU3RyaW5nV2l0aFJpY2hDb250ZW50IF0pOwogICAgICAgICAKICAgICAgICAgZGlz cGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKICAgICAgICAgICAgIGJv b2wgYXZhaWxhYmxlU2VydmljZXNDaGFuZ2VkID0gKGhhc0ltYWdlU2VydmljZXMgIT0gbV9oYXNJ bWFnZVNlcnZpY2VzKSB8fCAoaGFzU2VsZWN0aW9uU2VydmljZXMgIT0gbV9oYXNTZWxlY3Rpb25T ZXJ2aWNlcykgfHwgKGhhc1JpY2hDb250ZW50U2VydmljZXMgIT0gbV9oYXNSaWNoQ29udGVudFNl cnZpY2VzKTsK