189621 2018-09-14 09:28:04 -0700 It should be possible to get the mouse event modifiers from an injected bundle. 2019-02-18 14:52:56 -0800 1 1 1 Unclassified WebKit WebKit API WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan pvollan achristensen aestes andersca bfulgham cdumez commit-queue dbates thorton webkit-bug-importer oldest_to_newest 1459754 0 pvollan 2018-09-14 09:28:04 -0700 Currently, event modifiers are not available through the API. 1459755 1 349766 pvollan 2018-09-14 09:30:20 -0700 Created attachment 349766 Patch 1459756 2 pvollan 2018-09-14 09:34:13 -0700 rdar://problem/44437279 1460586 3 andersca 2018-09-18 08:01:42 -0700 I don't think this is the right approach - it would be better to add new client callbacks that include modifiers. 1460627 4 350029 pvollan 2018-09-18 10:08:11 -0700 Created attachment 350029 Patch 1460628 5 pvollan 2018-09-18 10:08:59 -0700 (In reply to Anders Carlsson from comment #3) > I don't think this is the right approach - it would be better to add new > client callbacks that include modifiers. Thanks for reviewing :) I have updated the patch. 1491707 6 350029 bfulgham 2019-01-04 10:15:37 -0800 Comment on attachment 350029 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=350029&action=review > Source/WebKit/ChangeLog:4 > + https://bugs.webkit.org/show_bug.cgi?id=189621 <Radar #?> > Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h:116 > +} WKBundlePageOverlayClientV2; It seems like this change requires clients to adopt a new Client API. Since this is a fix for a regression, it seems like this is not the best approach. Could we do something on the WebKit side (only) to fix this? 1491771 7 andersca 2019-01-04 11:48:38 -0800 (In reply to Brent Fulgham from comment #6) > Comment on attachment 350029 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=350029&action=review > > > Source/WebKit/ChangeLog:4 > > + https://bugs.webkit.org/show_bug.cgi?id=189621 > > <Radar #?> > > > Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h:116 > > +} WKBundlePageOverlayClientV2; > > It seems like this change requires clients to adopt a new Client API. Since > this is a fix for a regression, it seems like this is not the best approach. > > Could we do something on the WebKit side (only) to fix this? See https://bugs.webkit.org/show_bug.cgi?id=189621#c3 for why I thought a new client API was necessary. 1491788 8 bfulgham 2019-01-04 12:10:23 -0800 (In reply to Anders Carlsson from comment #7) > (In reply to Brent Fulgham from comment #6) > > Could we do something on the WebKit side (only) to fix this? > > See https://bugs.webkit.org/show_bug.cgi?id=189621#c3 for why I thought a > new client API was necessary. I don't think that comment helps me understand (except for reiterating that you think a new client API is better). But, if you prefer the API addition version, I'm fine with that. Could you r+ the patch so we could get it into a build soon? 1492091 9 358441 pvollan 2019-01-05 12:13:07 -0800 Created attachment 358441 Patch 1492092 10 pvollan 2019-01-05 12:15:06 -0800 (In reply to Brent Fulgham from comment #6) > Comment on attachment 350029 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=350029&action=review > > > Source/WebKit/ChangeLog:4 > > + https://bugs.webkit.org/show_bug.cgi?id=189621 > > <Radar #?> > > > Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h:116 > > +} WKBundlePageOverlayClientV2; > > It seems like this change requires clients to adopt a new Client API. Since > this is a fix for a regression, it seems like this is not the best approach. > > Could we do something on the WebKit side (only) to fix this? I have updated the patch to avoid changing any client code by swizzling [NSEvent modifierFlags]. Thanks for reviewing! 1506178 11 bfulgham 2019-02-14 09:12:47 -0800 Dan, can you look at this change and give us your thoughts? 1506192 12 358441 dbates 2019-02-14 09:30:28 -0800 Comment on attachment 358441 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=358441&action=review > Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:389 > + // Swizzle [NSEvent modiferFlags], since it always returns 0 when the WindowServer is blocked. Grep the code to ensure we don’t have an existing Swizzler class or helpers. Maybe we only have for TestWebKitAPI? > Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:390 > + Method method = class_getClassMethod(objc_getClass("NSEvent"), @selector(modifierFlags)); [NSEvent class]? > Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:391 > + method_setImplementation(method, (IMP)currentModifierFlags); Reinterpret_cast<>? 1506197 13 358441 dbates 2019-02-14 09:36:44 -0800 Comment on attachment 358441 Patch Something about the placement of this code seems a bit weird. Not sure what it is weird though. Grep the code for examples. 1506202 14 pvollan 2019-02-14 09:41:03 -0800 (In reply to Daniel Bates from comment #12) > Comment on attachment 358441 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=358441&action=review > > > Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:389 > > + // Swizzle [NSEvent modiferFlags], since it always returns 0 when the WindowServer is blocked. > > Grep the code to ensure we don’t have an existing Swizzler class or helpers. > Maybe we only have for TestWebKitAPI? > > > Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:390 > > + Method method = class_getClassMethod(objc_getClass("NSEvent"), @selector(modifierFlags)); > > [NSEvent class]? > > > Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:391 > > + method_setImplementation(method, (IMP)currentModifierFlags); > > Reinterpret_cast<>? Thanks for reviewing, Dan! I will update the patch. 1507349 15 362309 pvollan 2019-02-18 12:09:18 -0800 Created attachment 362309 Patch 1507355 16 pvollan 2019-02-18 12:12:45 -0800 (In reply to Per Arne Vollan from comment #15) > Created attachment 362309 [details] > Patch I moved the swizzling to InjectedBundle::initialize, since [NSEvent currentModifiers] is only used by injected bundles. 1507442 17 362309 commit-queue 2019-02-18 14:43:13 -0800 Comment on attachment 362309 Patch Clearing flags on attachment: 362309 Committed r241737: <https://trac.webkit.org/changeset/241737> 349766 2018-09-14 09:30:20 -0700 2018-09-18 10:08:10 -0700 Patch bug-189621-20180914093019.patch text/plain 4391 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzYwMDYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE4LTA5LTE0ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBJdCBzaG91bGQgYmUgcG9zc2li bGUgdG8gZ2V0IHRoZSBtb3VzZSBldmVudCBtb2RpZmllcnMgZm9yIGEgcGFnZSBvdmVybGF5IGNs aWVudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4 OTYyMQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDQ0MzcyNzk+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHRoZSBmdW5jdGlvbiBXS0J1bmRs ZVBhZ2VPdmVybGF5R2V0TW9kaWZpZXJzRm9yTGFzdEV2ZW50IHRvIHRoZSBDIEFQSS4KKworICAg ICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlT3Zlcmxh eS5jcHA6CisgICAgICAgIChQYWdlT3ZlcmxheUNsaWVudEltcGw6Om1vZGlmaWVycyBjb25zdCk6 CisgICAgICAgIChXS0J1bmRsZVBhZ2VPdmVybGF5R2V0TW9kaWZpZXJzRm9yTGFzdEV2ZW50KToK KyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZU92 ZXJsYXkuaDoKKwogMjAxOC0wOS0xNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gTWFrZSBzY3JpcHQgZGlhbG9ncyBtb2RhbCB0byB0 aGUgY3VycmVudCB3ZWIgdmlldyBvbmx5CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv SW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlT3ZlcmxheS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxl UGFnZU92ZXJsYXkuY3BwCShyZXZpc2lvbiAyMzU4NjgpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlT3ZlcmxheS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTM5LDYgKzM5LDcgQEAKICNpbmNsdWRlICJXZWJQYWdlT3ZlcmxheS5oIgog I2luY2x1ZGUgPFdlYkNvcmUvR3JhcGhpY3NDb250ZXh0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Q YWdlT3ZlcmxheS5oPgorI2luY2x1ZGUgPFdlYkNvcmUvUGxhdGZvcm1FdmVudC5oPgogI2luY2x1 ZGUgPFdlYkNvcmUvUGxhdGZvcm1Nb3VzZUV2ZW50Lmg+CiAKIG5hbWVzcGFjZSBBUEkgewpAQCAt NjgsNiArNjksMjIgQEAgcHVibGljOgogICAgICAgICBtX2FjY2Vzc2liaWxpdHlDbGllbnQuaW5p dGlhbGl6ZShjbGllbnQpOwogICAgIH0KIAorICAgIHVuc2lnbmVkIG1vZGlmaWVycygpIGNvbnN0 CisgICAgeworICAgICAgICBXS0V2ZW50TW9kaWZpZXJzIHdrTW9kaWZpZXJzID0gMDsKKyAgICAg ICAgaWYgKG1fbW9kaWZpZXJzICYgUGxhdGZvcm1FdmVudDo6TW9kaWZpZXI6OlNoaWZ0S2V5KQor ICAgICAgICAgICAgd2tNb2RpZmllcnMgfD0ga1dLRXZlbnRNb2RpZmllcnNTaGlmdEtleTsKKyAg ICAgICAgaWYgKG1fbW9kaWZpZXJzICYgUGxhdGZvcm1FdmVudDo6TW9kaWZpZXI6OkN0cmxLZXkp CisgICAgICAgICAgICB3a01vZGlmaWVycyB8PSBrV0tFdmVudE1vZGlmaWVyc0NvbnRyb2xLZXk7 CisgICAgICAgIGlmIChtX21vZGlmaWVycyAmIFBsYXRmb3JtRXZlbnQ6Ok1vZGlmaWVyOjpBbHRL ZXkpCisgICAgICAgICAgICB3a01vZGlmaWVycyB8PSBrV0tFdmVudE1vZGlmaWVyc0FsdEtleTsK KyAgICAgICAgaWYgKG1fbW9kaWZpZXJzICYgUGxhdGZvcm1FdmVudDo6TW9kaWZpZXI6Ok1ldGFL ZXkpCisgICAgICAgICAgICB3a01vZGlmaWVycyB8PSBrV0tFdmVudE1vZGlmaWVyc01ldGFLZXk7 CisgICAgICAgIGlmIChtX21vZGlmaWVycyAmIFBsYXRmb3JtRXZlbnQ6Ok1vZGlmaWVyOjpDYXBz TG9ja0tleSkKKyAgICAgICAgICAgIHdrTW9kaWZpZXJzIHw9IGtXS0V2ZW50TW9kaWZpZXJzQ2Fw c0xvY2tLZXk7CisgICAgICAgIHJldHVybiB3a01vZGlmaWVyczsKKyAgICB9CisKIHByaXZhdGU6 CiAgICAgLy8gV2ViUGFnZU92ZXJsYXk6OkNsaWVudC4KICAgICB2b2lkIHdpbGxNb3ZlVG9QYWdl KFdlYlBhZ2VPdmVybGF5JiBwYWdlT3ZlcmxheSwgV2ViUGFnZSogcGFnZSkgb3ZlcnJpZGUKQEAg LTk2LDYgKzExMyw4IEBAIHByaXZhdGU6CiAgICAgCiAgICAgYm9vbCBtb3VzZUV2ZW50KFdlYlBh Z2VPdmVybGF5JiBwYWdlT3ZlcmxheSwgY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiBldmVudCkg b3ZlcnJpZGUKICAgICB7CisgICAgICAgIG1fbW9kaWZpZXJzID0gZXZlbnQubW9kaWZpZXJzKCk7 CisKICAgICAgICAgc3dpdGNoIChldmVudC50eXBlKCkpIHsKICAgICAgICAgY2FzZSBQbGF0Zm9y bU1vdXNlRXZlbnQ6OlR5cGU6Ok1vdXNlUHJlc3NlZDogewogICAgICAgICAgICAgaWYgKCFtX2Ns aWVudC5tb3VzZURvd24pCkBAIC0yMTAsNiArMjI5LDcgQEAgcHJpdmF0ZToKICAgICB9CiAgICAg CiAgICAgQVBJOjpDbGllbnQ8V0tCdW5kbGVQYWdlT3ZlcmxheUFjY2Vzc2liaWxpdHlDbGllbnRC YXNlPiBtX2FjY2Vzc2liaWxpdHlDbGllbnQ7CisgICAgT3B0aW9uU2V0PFBsYXRmb3JtRXZlbnQ6 Ok1vZGlmaWVyPiBtX21vZGlmaWVyczsKIH07CiAKIFdLVHlwZUlEIFdLQnVuZGxlUGFnZU92ZXJs YXlHZXRUeXBlSUQoKQpAQCAtMjQ2LDMgKzI2Niw4IEBAIHZvaWQgV0tCdW5kbGVQYWdlT3Zlcmxh eUNsZWFyKFdLQnVuZGxlUGEKIHsKICAgICB0b0ltcGwoYnVuZGxlUGFnZU92ZXJsYXlSZWYpLT5j bGVhcigpOwogfQorCitXS0V2ZW50TW9kaWZpZXJzIFdLQnVuZGxlUGFnZU92ZXJsYXlHZXRNb2Rp ZmllcnNGb3JMYXN0RXZlbnQoV0tCdW5kbGVQYWdlT3ZlcmxheVJlZiBidW5kbGVQYWdlT3Zlcmxh eVJlZikKK3sKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8UGFnZU92ZXJsYXlDbGllbnRJbXBsJj4o dG9JbXBsKGJ1bmRsZVBhZ2VPdmVybGF5UmVmKS0+Y2xpZW50KCkpLm1vZGlmaWVycygpOworfQpJ bmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVu ZGxlUGFnZU92ZXJsYXkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv SW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlT3ZlcmxheS5oCShyZXZpc2lvbiAyMzU4 NjgpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tC dW5kbGVQYWdlT3ZlcmxheS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAq IENvcHlyaWdodCAoQykgMjAxMCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBD b3B5cmlnaHQgKEMpIDIwMTggQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAq IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0xMTEsNyArMTExLDggQEAgV0tfRVhQT1JUIHZv aWQgV0tCdW5kbGVQYWdlT3ZlcmxheVNldE5lZQogV0tfRVhQT1JUIGZsb2F0IFdLQnVuZGxlUGFn ZU92ZXJsYXlGcmFjdGlvbkZhZGVkSW4oV0tCdW5kbGVQYWdlT3ZlcmxheVJlZiBidW5kbGVQYWdl T3ZlcmxheSk7CiBXS19FWFBPUlQgdm9pZCBXS0J1bmRsZVBhZ2VPdmVybGF5U2V0QWNjZXNzaWJp bGl0eUNsaWVudChXS0J1bmRsZVBhZ2VPdmVybGF5UmVmIGJ1bmRsZVBhZ2VPdmVybGF5LCBXS0J1 bmRsZVBhZ2VPdmVybGF5QWNjZXNzaWJpbGl0eUNsaWVudEJhc2UqIGNsaWVudCk7CiBXS19FWFBP UlQgdm9pZCBXS0J1bmRsZVBhZ2VPdmVybGF5Q2xlYXIoV0tCdW5kbGVQYWdlT3ZlcmxheVJlZiBi dW5kbGVQYWdlT3ZlcmxheSk7Ci0KK1dLX0VYUE9SVCBXS0V2ZW50TW9kaWZpZXJzIFdLQnVuZGxl UGFnZU92ZXJsYXlHZXRNb2RpZmllcnNGb3JMYXN0RXZlbnQoV0tCdW5kbGVQYWdlT3ZlcmxheVJl ZiBidW5kbGVQYWdlT3ZlcmxheSk7CisgICAgCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0KICNlbmRp Zgo= 350029 2018-09-18 10:08:11 -0700 2019-01-05 12:13:05 -0800 Patch bug-189621-20180918100810.patch text/plain 9822 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzYxNDMpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE4LTA5LTE4ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBJdCBzaG91bGQgYmUgcG9zc2li bGUgdG8gZ2V0IHRoZSBtb3VzZSBldmVudCBtb2RpZmllcnMgZm9yIGEgcGFnZSBvdmVybGF5IGNs aWVudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4 OTYyMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk ZCBtb3VzZSBjbGllbnQgY2FsbGJhY2tzIHRoYXQgaW5jbHVkZSBtb2RpZmllcnMuCisKKyAgICAg ICAgKiBTaGFyZWQvQVBJL2MvV0tTaGFyZWRBUElDYXN0Lmg6CisgICAgICAgIChXZWJLaXQ6OnRv QVBJKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxl UGFnZU92ZXJsYXkuY3BwOgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJ L2MvV0tCdW5kbGVQYWdlT3ZlcmxheS5oOgorCiAyMDE4LTA5LTE4ICBBbnR0aSBLb2l2aXN0byAg PGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChQU09OKTogV2hpdGUgb3Ig QmxhY2sgZmxhc2ggb2NjdXJzIHdoZW4gcHJvY2VzcyBzd2FwcGluZyBvbiBuYXZpZ2F0aW9uIG9u IE1hYwpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvQVBJL2MvV0tTaGFyZWRBUElDYXN0LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvQVBJL2MvV0tTaGFyZWRBUElDYXN0 LmgJKHJldmlzaW9uIDIzNjA4MikKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL0FQSS9jL1dLU2hh cmVkQVBJQ2FzdC5oCSh3b3JraW5nIGNvcHkpCkBAIC01NSw2ICs1NSw3IEBACiAjaW5jbHVkZSA8 V2ViQ29yZS9GcmFtZUxvYWRlclR5cGVzLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9JbnRSZWN0Lmg+ CiAjaW5jbHVkZSA8V2ViQ29yZS9MYXlvdXRNaWxlc3RvbmVzLmg+CisjaW5jbHVkZSA8V2ViQ29y ZS9QbGF0Zm9ybUV2ZW50Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9TZWN1cml0eU9yaWdpbi5oPgog I2luY2x1ZGUgPFdlYkNvcmUvVXNlckNvbnRlbnRUeXBlcy5oPgogI2luY2x1ZGUgPFdlYkNvcmUv VXNlclNjcmlwdFR5cGVzLmg+CkBAIC0yOTcsNiArMjk4LDIyIEBAIGlubGluZSBXS0V2ZW50TW9k aWZpZXJzIHRvQVBJKFdlYkV2ZW50OjoKICAgICByZXR1cm4gd2tNb2RpZmllcnM7CiB9CiAKK2lu bGluZSBXS0V2ZW50TW9kaWZpZXJzIHRvQVBJKE9wdGlvblNldDxXZWJDb3JlOjpQbGF0Zm9ybUV2 ZW50OjpNb2RpZmllcj4gbW9kaWZpZXJzKQoreworICAgIFdLRXZlbnRNb2RpZmllcnMgd2tNb2Rp ZmllcnMgPSAwOworICAgIGlmIChtb2RpZmllcnMgJiBXZWJDb3JlOjpQbGF0Zm9ybUV2ZW50OjpN b2RpZmllcjo6U2hpZnRLZXkpCisgICAgICAgIHdrTW9kaWZpZXJzIHw9IGtXS0V2ZW50TW9kaWZp ZXJzU2hpZnRLZXk7CisgICAgaWYgKG1vZGlmaWVycyAmIFdlYkNvcmU6OlBsYXRmb3JtRXZlbnQ6 Ok1vZGlmaWVyOjpDdHJsS2V5KQorICAgICAgICB3a01vZGlmaWVycyB8PSBrV0tFdmVudE1vZGlm aWVyc0NvbnRyb2xLZXk7CisgICAgaWYgKG1vZGlmaWVycyAmIFdlYkNvcmU6OlBsYXRmb3JtRXZl bnQ6Ok1vZGlmaWVyOjpBbHRLZXkpCisgICAgICAgIHdrTW9kaWZpZXJzIHw9IGtXS0V2ZW50TW9k aWZpZXJzQWx0S2V5OworICAgIGlmIChtb2RpZmllcnMgJiBXZWJDb3JlOjpQbGF0Zm9ybUV2ZW50 OjpNb2RpZmllcjo6TWV0YUtleSkKKyAgICAgICAgd2tNb2RpZmllcnMgfD0ga1dLRXZlbnRNb2Rp ZmllcnNNZXRhS2V5OworICAgIGlmIChtb2RpZmllcnMgJiBXZWJDb3JlOjpQbGF0Zm9ybUV2ZW50 OjpNb2RpZmllcjo6Q2Fwc0xvY2tLZXkpCisgICAgICAgIHdrTW9kaWZpZXJzIHw9IGtXS0V2ZW50 TW9kaWZpZXJzQ2Fwc0xvY2tLZXk7CisgICAgcmV0dXJuIHdrTW9kaWZpZXJzOworfQorCiBpbmxp bmUgV0tFdmVudE1vdXNlQnV0dG9uIHRvQVBJKFdlYk1vdXNlRXZlbnQ6OkJ1dHRvbiBtb3VzZUJ1 dHRvbikKIHsKICAgICBXS0V2ZW50TW91c2VCdXR0b24gd2tNb3VzZUJ1dHRvbiA9IGtXS0V2ZW50 TW91c2VCdXR0b25Ob0J1dHRvbjsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9Jbmpl Y3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2VPdmVybGF5LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdl T3ZlcmxheS5jcHAJKHJldmlzaW9uIDIzNjA4MikKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2VPdmVybGF5LmNwcAkod29ya2luZyBj b3B5KQpAQCAtNDQsNyArNDQsNyBAQAogbmFtZXNwYWNlIEFQSSB7CiAKIHRlbXBsYXRlPD4gc3Ry dWN0IENsaWVudFRyYWl0czxXS0J1bmRsZVBhZ2VPdmVybGF5Q2xpZW50QmFzZT4gewotICAgIHR5 cGVkZWYgc3RkOjp0dXBsZTxXS0J1bmRsZVBhZ2VPdmVybGF5Q2xpZW50VjAsIFdLQnVuZGxlUGFn ZU92ZXJsYXlDbGllbnRWMT4gVmVyc2lvbnM7CisgICAgdHlwZWRlZiBzdGQ6OnR1cGxlPFdLQnVu ZGxlUGFnZU92ZXJsYXlDbGllbnRWMCwgV0tCdW5kbGVQYWdlT3ZlcmxheUNsaWVudFYxLCBXS0J1 bmRsZVBhZ2VPdmVybGF5Q2xpZW50VjI+IFZlcnNpb25zOwogfTsKIAogdGVtcGxhdGU8PiBzdHJ1 Y3QgQ2xpZW50VHJhaXRzPFdLQnVuZGxlUGFnZU92ZXJsYXlBY2Nlc3NpYmlsaXR5Q2xpZW50QmFz ZT4gewpAQCAtOTgsMzAgKzk4LDQyIEBAIHByaXZhdGU6CiAgICAgewogICAgICAgICBzd2l0Y2gg KGV2ZW50LnR5cGUoKSkgewogICAgICAgICBjYXNlIFBsYXRmb3JtTW91c2VFdmVudDo6VHlwZTo6 TW91c2VQcmVzc2VkOiB7Ci0gICAgICAgICAgICBpZiAoIW1fY2xpZW50Lm1vdXNlRG93bikKLSAg ICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICBpZiAobV9jbGllbnQubW91 c2VEb3duV2l0aE1vZGlmaWVycykKKyAgICAgICAgICAgICAgICByZXR1cm4gbV9jbGllbnQubW91 c2VEb3duV2l0aE1vZGlmaWVycyh0b0FQSSgmcGFnZU92ZXJsYXkpLCB0b0FQSShldmVudC5wb3Np dGlvbigpKSwgdG9BUEkoZXZlbnQuYnV0dG9uKCkpLCB0b0FQSShldmVudC5tb2RpZmllcnMoKSks IG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CisKKyAgICAgICAgICAgIGlmIChtX2NsaWVudC5t b3VzZURvd24pCisgICAgICAgICAgICAgICAgcmV0dXJuIG1fY2xpZW50Lm1vdXNlRG93bih0b0FQ SSgmcGFnZU92ZXJsYXkpLCB0b0FQSShldmVudC5wb3NpdGlvbigpKSwgdG9BUEkoZXZlbnQuYnV0 dG9uKCkpLCBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOwogCi0gICAgICAgICAgICByZXR1cm4g bV9jbGllbnQubW91c2VEb3duKHRvQVBJKCZwYWdlT3ZlcmxheSksIHRvQVBJKGV2ZW50LnBvc2l0 aW9uKCkpLCB0b0FQSShldmVudC5idXR0b24oKSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7 CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KICAgICAgICAgY2FzZSBQbGF0 Zm9ybU1vdXNlRXZlbnQ6OlR5cGU6Ok1vdXNlUmVsZWFzZWQ6IHsKLSAgICAgICAgICAgIGlmICgh bV9jbGllbnQubW91c2VVcCkKLSAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAg ICAgICBpZiAobV9jbGllbnQubW91c2VVcFdpdGhNb2RpZmllcnMpCisgICAgICAgICAgICAgICAg cmV0dXJuIG1fY2xpZW50Lm1vdXNlVXBXaXRoTW9kaWZpZXJzKHRvQVBJKCZwYWdlT3ZlcmxheSks IHRvQVBJKGV2ZW50LnBvc2l0aW9uKCkpLCB0b0FQSShldmVudC5idXR0b24oKSksIHRvQVBJKGV2 ZW50Lm1vZGlmaWVycygpKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsKKyAgICAgICAgICAg IAorICAgICAgICAgICAgaWYgKG1fY2xpZW50Lm1vdXNlVXApCisgICAgICAgICAgICAgICAgcmV0 dXJuIG1fY2xpZW50Lm1vdXNlVXAodG9BUEkoJnBhZ2VPdmVybGF5KSwgdG9BUEkoZXZlbnQucG9z aXRpb24oKSksIHRvQVBJKGV2ZW50LmJ1dHRvbigpKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZv KTsKIAotICAgICAgICAgICAgcmV0dXJuIG1fY2xpZW50Lm1vdXNlVXAodG9BUEkoJnBhZ2VPdmVy bGF5KSwgdG9BUEkoZXZlbnQucG9zaXRpb24oKSksIHRvQVBJKGV2ZW50LmJ1dHRvbigpKSwgbV9j bGllbnQuYmFzZS5jbGllbnRJbmZvKTsKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAg ICAgfQogICAgICAgICBjYXNlIFBsYXRmb3JtTW91c2VFdmVudDo6VHlwZTo6TW91c2VNb3ZlZDog ewogICAgICAgICAgICAgaWYgKGV2ZW50LmJ1dHRvbigpID09IE1vdXNlQnV0dG9uOjpOb0J1dHRv bikgewotICAgICAgICAgICAgICAgIGlmICghbV9jbGllbnQubW91c2VNb3ZlZCkKLSAgICAgICAg ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgICAgICAgICAgICAgcmV0dXJuIG1fY2xp ZW50Lm1vdXNlTW92ZWQodG9BUEkoJnBhZ2VPdmVybGF5KSwgdG9BUEkoZXZlbnQucG9zaXRpb24o KSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CisgICAgICAgICAgICAgICAgaWYgKG1fY2xp ZW50Lm1vdXNlTW92ZWRXaXRoTW9kaWZpZXJzKQorICAgICAgICAgICAgICAgICAgICByZXR1cm4g bV9jbGllbnQubW91c2VNb3ZlZFdpdGhNb2RpZmllcnModG9BUEkoJnBhZ2VPdmVybGF5KSwgdG9B UEkoZXZlbnQucG9zaXRpb24oKSksIHRvQVBJKGV2ZW50Lm1vZGlmaWVycygpKSwgbV9jbGllbnQu YmFzZS5jbGllbnRJbmZvKTsKKyAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgICBpZiAo bV9jbGllbnQubW91c2VNb3ZlZCkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIG1fY2xpZW50 Lm1vdXNlTW92ZWQodG9BUEkoJnBhZ2VPdmVybGF5KSwgdG9BUEkoZXZlbnQucG9zaXRpb24oKSks IG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CisgICAgICAgICAgICAgICAgCisgICAgICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAvLyBUaGlz IGlzIGEgTW91c2VNb3ZlIGV2ZW50IHdpdGggYSBtb3VzZSBidXR0b24gcHJlc3NlZC4gQ2FsbCBt b3VzZURyYWdnZWQuCi0gICAgICAgICAgICBpZiAoIW1fY2xpZW50Lm1vdXNlRHJhZ2dlZCkKLSAg ICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICBpZiAobV9jbGllbnQubW91 c2VEcmFnZ2VkV2l0aE1vZGlmaWVycykKKyAgICAgICAgICAgICAgICByZXR1cm4gbV9jbGllbnQu bW91c2VEcmFnZ2VkV2l0aE1vZGlmaWVycyh0b0FQSSgmcGFnZU92ZXJsYXkpLCB0b0FQSShldmVu dC5wb3NpdGlvbigpKSwgdG9BUEkoZXZlbnQuYnV0dG9uKCkpLCB0b0FQSShldmVudC5tb2RpZmll cnMoKSksICBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOworICAgICAgICAgICAgCisgICAgICAg ICAgICBpZiAobV9jbGllbnQubW91c2VEcmFnZ2VkKQorICAgICAgICAgICAgICAgIHJldHVybiBt X2NsaWVudC5tb3VzZURyYWdnZWQodG9BUEkoJnBhZ2VPdmVybGF5KSwgdG9BUEkoZXZlbnQucG9z aXRpb24oKSksIHRvQVBJKGV2ZW50LmJ1dHRvbigpKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZv KTsKIAotICAgICAgICAgICAgcmV0dXJuIG1fY2xpZW50Lm1vdXNlRHJhZ2dlZCh0b0FQSSgmcGFn ZU92ZXJsYXkpLCB0b0FQSShldmVudC5wb3NpdGlvbigpKSwgdG9BUEkoZXZlbnQuYnV0dG9uKCkp LCBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOworICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgICAgICB9CiAKICAgICAgICAgZGVmYXVsdDoKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2VPdmVybGF5LmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVu ZGxlUGFnZU92ZXJsYXkuaAkocmV2aXNpb24gMjM2MDgyKQorKysgU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZU92ZXJsYXkuaAkod29ya2lu ZyBjb3B5KQpAQCAtNTQsNiArNTQsMTEgQEAgdHlwZWRlZiB2b2lkICgqV0tCdW5kbGVQYWdlT3Zl cmxheURhdGFEZQogdHlwZWRlZiB2b2lkICgqV0tCdW5kbGVQYWdlT3ZlcmxheURhdGFEZXRlY3Rv cnNEaWRDaGFuZ2VVSSkoV0tCdW5kbGVQYWdlT3ZlcmxheVJlZiBwYWdlT3ZlcmxheSwgY29uc3Qg dm9pZCogY2xpZW50SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpXS0J1bmRsZVBhZ2VPdmVybGF5RGF0 YURldGVjdG9yc0RpZEhpZGVVSSkoV0tCdW5kbGVQYWdlT3ZlcmxheVJlZiBwYWdlT3ZlcmxheSwg Y29uc3Qgdm9pZCogY2xpZW50SW5mbyk7CiAKK3R5cGVkZWYgYm9vbCAoKldLQnVuZGxlUGFnZU92 ZXJsYXlNb3VzZURvd25XaXRoTW9kaWZpZXJzQ2FsbGJhY2spKFdLQnVuZGxlUGFnZU92ZXJsYXlS ZWYgcGFnZU92ZXJsYXksIFdLUG9pbnQgcG9zaXRpb24sIFdLRXZlbnRNb3VzZUJ1dHRvbiBtb3Vz ZUJ1dHRvbiwgV0tFdmVudE1vZGlmaWVycyBtb2RpZmllcnMsIGNvbnN0IHZvaWQqIGNsaWVudElu Zm8pOwordHlwZWRlZiBib29sICgqV0tCdW5kbGVQYWdlT3ZlcmxheU1vdXNlVXBXaXRoTW9kaWZp ZXJzQ2FsbGJhY2spKFdLQnVuZGxlUGFnZU92ZXJsYXlSZWYgcGFnZU92ZXJsYXksIFdLUG9pbnQg cG9zaXRpb24sIFdLRXZlbnRNb3VzZUJ1dHRvbiBtb3VzZUJ1dHRvbiwgV0tFdmVudE1vZGlmaWVy cyBtb2RpZmllcnMsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwordHlwZWRlZiBib29sICgqV0tC dW5kbGVQYWdlT3ZlcmxheU1vdXNlTW92ZWRXaXRoTW9kaWZpZXJzQ2FsbGJhY2spKFdLQnVuZGxl UGFnZU92ZXJsYXlSZWYgcGFnZU92ZXJsYXksIFdLUG9pbnQgcG9zaXRpb24sIFdLRXZlbnRNb2Rp ZmllcnMgbW9kaWZpZXJzLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKK3R5cGVkZWYgYm9vbCAo KldLQnVuZGxlUGFnZU92ZXJsYXlNb3VzZURyYWdnZWRXaXRoTW9kaWZpZXJzQ2FsbGJhY2spKFdL QnVuZGxlUGFnZU92ZXJsYXlSZWYgcGFnZU92ZXJsYXksIFdLUG9pbnQgcG9zaXRpb24sIFdLRXZl bnRNb3VzZUJ1dHRvbiBtb3VzZUJ1dHRvbiwgV0tFdmVudE1vZGlmaWVycyBtb2RpZmllcnMsIGNv bnN0IHZvaWQqIGNsaWVudEluZm8pOworCiB0eXBlZGVmIHN0cnVjdCBXS0J1bmRsZVBhZ2VPdmVy bGF5Q2xpZW50QmFzZSB7CiAgICAgaW50ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2ZXJzaW9uOwogICAgIGNvbnN0IHZvaWQg KiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y2xpZW50SW5mbzsKQEAgLTg4LDYgKzkzLDI4IEBAIHR5cGVkZWYgc3RydWN0IFdLQnVuZGxlUGFn ZU92ZXJsYXlDbGllbnQKICAgICBXS0J1bmRsZVBhZ2VPdmVybGF5RGF0YURldGVjdG9yc0RpZEhp ZGVVSSAgICAgICAgICAgICAgICAgICAgICAgICAgIGRhdGFEZXRlY3RvcnNEaWRIaWRlVUk7CiB9 IFdLQnVuZGxlUGFnZU92ZXJsYXlDbGllbnRWMTsKIAordHlwZWRlZiBzdHJ1Y3QgV0tCdW5kbGVQ YWdlT3ZlcmxheUNsaWVudFYyIHsKKyAgICBXS0J1bmRsZVBhZ2VPdmVybGF5Q2xpZW50QmFzZSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJhc2U7CisKKyAgICBXS0J1bmRs ZVBhZ2VPdmVybGF5V2lsbE1vdmVUb1BhZ2VDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAg ICAgIHdpbGxNb3ZlVG9QYWdlOworICAgIFdLQnVuZGxlUGFnZU92ZXJsYXlEaWRNb3ZlVG9QYWdl Q2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlkTW92ZVRvUGFnZTsKKyAgICBX S0J1bmRsZVBhZ2VPdmVybGF5RHJhd1JlY3RDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGRyYXdSZWN0OworICAgIFdLQnVuZGxlUGFnZU92ZXJsYXlNb3VzZURvd25DYWxs YmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbW91c2VEb3duOworICAgIFdLQnVu ZGxlUGFnZU92ZXJsYXlNb3VzZVVwQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbW91c2VVcDsKKyAgICBXS0J1bmRsZVBhZ2VPdmVybGF5TW91c2VNb3ZlZENhbGxiYWNr ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1vdXNlTW92ZWQ7CisgICAgV0tCdW5kbGVQ YWdlT3ZlcmxheU1vdXNlRHJhZ2dlZENhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBtb3VzZURyYWdnZWQ7CisKKyAgICBXS0J1bmRsZVBhZ2VPdmVybGF5QWN0aW9uQ29udGV4dEZv clJlc3VsdEF0UG9pbnRDYWxsYmFjayAgICAgICAgICAgIGFjdGlvbkNvbnRleHRGb3JSZXN1bHRB dFBvaW50OworICAgIFdLQnVuZGxlUGFnZU92ZXJsYXlEYXRhRGV0ZWN0b3JzRGlkUHJlc2VudFVJ ICAgICAgICAgICAgICAgICAgICAgICAgZGF0YURldGVjdG9yc0RpZFByZXNlbnRVSTsKKyAgICBX S0J1bmRsZVBhZ2VPdmVybGF5RGF0YURldGVjdG9yc0RpZENoYW5nZVVJICAgICAgICAgICAgICAg ICAgICAgICAgIGRhdGFEZXRlY3RvcnNEaWRDaGFuZ2VVSTsKKyAgICBXS0J1bmRsZVBhZ2VPdmVy bGF5RGF0YURldGVjdG9yc0RpZEhpZGVVSSAgICAgICAgICAgICAgICAgICAgICAgICAgIGRhdGFE ZXRlY3RvcnNEaWRIaWRlVUk7CisKKyAgICBXS0J1bmRsZVBhZ2VPdmVybGF5TW91c2VEb3duV2l0 aE1vZGlmaWVyc0NhbGxiYWNrICAgICAgICAgICAgICAgICAgIG1vdXNlRG93bldpdGhNb2RpZmll cnM7CisgICAgV0tCdW5kbGVQYWdlT3ZlcmxheU1vdXNlVXBXaXRoTW9kaWZpZXJzQ2FsbGJhY2sg ICAgICAgICAgICAgICAgICAgICBtb3VzZVVwV2l0aE1vZGlmaWVyczsKKyAgICBXS0J1bmRsZVBh Z2VPdmVybGF5TW91c2VNb3ZlZFdpdGhNb2RpZmllcnNDYWxsYmFjayAgICAgICAgICAgICAgICAg IG1vdXNlTW92ZWRXaXRoTW9kaWZpZXJzOworICAgIFdLQnVuZGxlUGFnZU92ZXJsYXlNb3VzZURy YWdnZWRXaXRoTW9kaWZpZXJzQ2FsbGJhY2sgICAgICAgICAgICAgICAgbW91c2VEcmFnZ2VkV2l0 aE1vZGlmaWVyczsKK30gV0tCdW5kbGVQYWdlT3ZlcmxheUNsaWVudFYyOworCiB0eXBlZGVmIFdL VHlwZVJlZiAoKldLQWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVlQ2FsbGJhY2spKFdLQnVuZGxl UGFnZU92ZXJsYXlSZWYgcGFnZU92ZXJsYXksIFdLU3RyaW5nUmVmIGF0dHJpYnV0ZSwgV0tUeXBl UmVmIHBhcmFtZXRlciwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7CiB0eXBlZGVmIFdLQXJyYXlS ZWYgKCpXS0FjY2Vzc2liaWxpdHlBdHRyaWJ1dGVOYW1lc0NhbGxiYWNrKShXS0J1bmRsZVBhZ2VP dmVybGF5UmVmIHBhZ2VPdmVybGF5LCBib29sIHBhcmFtZXRlcml6ZWROYW1lcywgY29uc3Qgdm9p ZCogY2xpZW50SW5mbyk7CiAK 358441 2019-01-05 12:13:07 -0800 2019-02-14 09:30:28 -0800 Patch bug-189621-20190105121248.patch text/plain 2835 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzk2NTgpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE5LTAxLTA1ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBJdCBzaG91bGQgYmUgcG9zc2li bGUgdG8gZ2V0IHRoZSBtb3VzZSBldmVudCBtb2RpZmllcnMgZm9yIGEgcGFnZSBvdmVybGF5IGNs aWVudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4 OTYyMQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDQ0MzcyNzk+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBhY2Nlc3MgdG8gdGhlIFdpbmRv d1NlcnZlciBpcyBibG9ja2VkLCBbTlNFdmVudCBtb2RpZmllckZsYWdzXSBhbHdheXMgcmV0dXJu cyAwLgorICAgICAgICBUaGlzIGNhbiBiZSBmaXhlZCBieSBzd2l6emxpbmcgdGhlIGNsYXNzIG1l dGhvZCwgYW5kIGdldHRpbmcgdGhlIGNhY2hlZCBtb2RpZmllcnMgZnJvbQorICAgICAgICBQbGF0 Zm9ybUtleWJvYXJkRXZlbnQuCisgCisgICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9j ZXNzQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OmN1cnJlbnRNb2RpZmllckZsYWdzKToKKyAg ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplUHJvY2Vzcyk6CisK IDIwMTktMDEtMDQgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBVc2Ugc2F2ZSBzaGVldCBpbnN0ZWFkIG9mIGRpYWxvZyB3aGVy ZSBwb3NzaWJsZQpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nl c3NDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2Ev V2ViUHJvY2Vzc0NvY29hLm1tCShyZXZpc2lvbiAyMzk2NTcpCisrKyBTb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zNDks NiArMzQ5LDI3IEBAIHZvaWQgV2ViUHJvY2Vzczo6cmVnaXN0ZXJXaXRoU3RhdGVEdW1wZXIKIH0K ICNlbmRpZgogCisjaWYgUExBVEZPUk0oTUFDKSAmJiBFTkFCTEUoV0VCUFJPQ0VTU19XSU5ET1dT RVJWRVJfQkxPQ0tJTkcpCitzdGF0aWMgTlNFdmVudE1vZGlmaWVyRmxhZ3MgY3VycmVudE1vZGlm aWVyRmxhZ3MoaWQgc2VsZiwgU0VMIF9jbWQpCit7CisgICAgYXV0byBjdXJyZW50TW9kaWZpZXJz ID0gUGxhdGZvcm1LZXlib2FyZEV2ZW50OjpjdXJyZW50U3RhdGVPZk1vZGlmaWVyS2V5cygpOwor ICAgIE5TRXZlbnRNb2RpZmllckZsYWdzIG1vZGlmaWVycyA9IDA7CisKKyAgICBpZiAoY3VycmVu dE1vZGlmaWVycy5jb250YWlucyhQbGF0Zm9ybUV2ZW50OjpNb2RpZmllcjo6U2hpZnRLZXkpKQor ICAgICAgICBtb2RpZmllcnMgfD0gTlNFdmVudE1vZGlmaWVyRmxhZ1NoaWZ0OworICAgIGlmIChj dXJyZW50TW9kaWZpZXJzLmNvbnRhaW5zKFBsYXRmb3JtRXZlbnQ6Ok1vZGlmaWVyOjpDdHJsS2V5 KSkKKyAgICAgICAgbW9kaWZpZXJzIHw9IE5TRXZlbnRNb2RpZmllckZsYWdDb250cm9sOworICAg IGlmIChjdXJyZW50TW9kaWZpZXJzLmNvbnRhaW5zKFBsYXRmb3JtRXZlbnQ6Ok1vZGlmaWVyOjpB bHRLZXkpKQorICAgICAgICBtb2RpZmllcnMgfD0gTlNFdmVudE1vZGlmaWVyRmxhZ09wdGlvbjsK KyAgICBpZiAoY3VycmVudE1vZGlmaWVycy5jb250YWlucyhQbGF0Zm9ybUV2ZW50OjpNb2RpZmll cjo6TWV0YUtleSkpCisgICAgICAgIG1vZGlmaWVycyB8PSBOU0V2ZW50TW9kaWZpZXJGbGFnQ29t bWFuZDsKKyAgICBpZiAoY3VycmVudE1vZGlmaWVycy5jb250YWlucyhQbGF0Zm9ybUV2ZW50OjpN b2RpZmllcjo6Q2Fwc0xvY2tLZXkpKQorICAgICAgICBtb2RpZmllcnMgfD0gTlNFdmVudE1vZGlm aWVyRmxhZ0NhcHNMb2NrOworCisgICAgcmV0dXJuIG1vZGlmaWVyczsKK30KKyNlbmRpZgorCiB2 b2lkIFdlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVByb2Nlc3MoY29uc3QgQ2hpbGRQcm9j ZXNzSW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQogewogI2lmIFBMQVRGT1JN KE1BQykKQEAgLTM2NSw2ICszODYsMTAgQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRp YWxpemVQcm9jZQogICAgIC8vIFRoaXMgaXMgbmVjZXNzYXJ5IHNvIHRoYXQgd2UgYXJlIGFibGUg dG8gc2V0IHRoZSBwcm9jZXNzJyBkaXNwbGF5IG5hbWUuCiAgICAgX1JlZ2lzdGVyQXBwbGljYXRp b24obnVsbHB0ciwgbnVsbHB0cik7CiAKKyAgICAvLyBTd2l6emxlIFtOU0V2ZW50IG1vZGlmZXJG bGFnc10sIHNpbmNlIGl0IGFsd2F5cyByZXR1cm5zIDAgd2hlbiB0aGUgV2luZG93U2VydmVyIGlz IGJsb2NrZWQuCisgICAgTWV0aG9kIG1ldGhvZCA9IGNsYXNzX2dldENsYXNzTWV0aG9kKG9iamNf Z2V0Q2xhc3MoIk5TRXZlbnQiKSwgQHNlbGVjdG9yKG1vZGlmaWVyRmxhZ3MpKTsKKyAgICBtZXRo b2Rfc2V0SW1wbGVtZW50YXRpb24obWV0aG9kLCAoSU1QKWN1cnJlbnRNb2RpZmllckZsYWdzKTsK KwogI2Vsc2UKIAogICAgIGlmICghW05TQXBwIGlzUnVubmluZ10pIHsK 362309 2019-02-18 12:09:18 -0800 2019-02-18 14:43:13 -0800 Patch bug-189621-20190218120917.patch text/plain 3297 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDE3MzApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE5LTAyLTE1ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBJdCBzaG91bGQgYmUgcG9zc2li bGUgdG8gZ2V0IHRoZSBtb3VzZSBldmVudCBtb2RpZmllcnMgZm9yIGEgcGFnZSBvdmVybGF5IGNs aWVudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4 OTYyMQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDQ0MzcyNzk+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgRGFuaWVsIEJhdGVzLgorCisgICAgICAgIFdoZW4gYWNjZXNzIHRvIHRoZSBXaW5kb3dT ZXJ2ZXIgaXMgYmxvY2tlZCwgW05TRXZlbnQgbW9kaWZpZXJGbGFnc10gYWx3YXlzIHJldHVybnMg MC4KKyAgICAgICAgVGhpcyBjYW4gYmUgZml4ZWQgYnkgc3dpenpsaW5nIHRoZSBjbGFzcyBtZXRo b2QsIGFuZCBnZXR0aW5nIHRoZSBjYWNoZWQgbW9kaWZpZXJzIGZyb20KKyAgICAgICAgUGxhdGZv cm1LZXlib2FyZEV2ZW50LgorIAorICAgICAgICAqIFdlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vz c0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpjdXJyZW50TW9kaWZpZXJGbGFncyk6CisgICAg ICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVByb2Nlc3MpOgorCiAy MDE5LTAyLTE4ICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBpT1Mg U2FmYXJpIHdpbGwgbm90IGxvYWQgVVNEWiBpbiBRTFByZXZpZXcgd2hlbiBvcGVuaW5nIGFzIEJM T0IKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9tYWMvSW5q ZWN0ZWRCdW5kbGVNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L0luamVjdGVkQnVuZGxlL21hYy9JbmplY3RlZEJ1bmRsZU1hYy5tbQkocmV2aXNpb24gMjQxNzMw KQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL21hYy9JbmplY3Rl ZEJ1bmRsZU1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMzYsNiArMzYsNyBAQAogI2ltcG9ydCAi V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oIgogI2ltcG9ydCA8Q29yZUZvdW5kYXRpb24v Q0ZVUkwuaD4KICNpbXBvcnQgPEZvdW5kYXRpb24vTlNCdW5kbGUuaD4KKyNpbXBvcnQgPFdlYkNv cmUvUGxhdGZvcm1LZXlib2FyZEV2ZW50Lmg+CiAjaW1wb3J0IDxkbGZjbi5oPgogI2ltcG9ydCA8 b2JqYy9ydW50aW1lLmg+CiAjaW1wb3J0IDxwYWwvc3BpL2NvY29hL05TS2V5ZWRBcmNoaXZlclNQ SS5oPgpAQCAtNTEsNiArNTIsMjcgQEAgLSAoQ0ZCdW5kbGVSZWYpX2NmQnVuZGxlOwogbmFtZXNw YWNlIFdlYktpdCB7CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAorI2lmIEVOQUJMRShXRUJQ Uk9DRVNTX1dJTkRPV1NFUlZFUl9CTE9DS0lORykKK3N0YXRpYyBOU0V2ZW50TW9kaWZpZXJGbGFn cyBjdXJyZW50TW9kaWZpZXJGbGFncyhpZCBzZWxmLCBTRUwgX2NtZCkKK3sKKyAgICBhdXRvIGN1 cnJlbnRNb2RpZmllcnMgPSBQbGF0Zm9ybUtleWJvYXJkRXZlbnQ6OmN1cnJlbnRTdGF0ZU9mTW9k aWZpZXJLZXlzKCk7CisgICAgTlNFdmVudE1vZGlmaWVyRmxhZ3MgbW9kaWZpZXJzID0gMDsKKyAg ICAKKyAgICBpZiAoY3VycmVudE1vZGlmaWVycy5jb250YWlucyhQbGF0Zm9ybUV2ZW50OjpNb2Rp Zmllcjo6U2hpZnRLZXkpKQorICAgICAgICBtb2RpZmllcnMgfD0gTlNFdmVudE1vZGlmaWVyRmxh Z1NoaWZ0OworICAgIGlmIChjdXJyZW50TW9kaWZpZXJzLmNvbnRhaW5zKFBsYXRmb3JtRXZlbnQ6 Ok1vZGlmaWVyOjpDb250cm9sS2V5KSkKKyAgICAgICAgbW9kaWZpZXJzIHw9IE5TRXZlbnRNb2Rp ZmllckZsYWdDb250cm9sOworICAgIGlmIChjdXJyZW50TW9kaWZpZXJzLmNvbnRhaW5zKFBsYXRm b3JtRXZlbnQ6Ok1vZGlmaWVyOjpBbHRLZXkpKQorICAgICAgICBtb2RpZmllcnMgfD0gTlNFdmVu dE1vZGlmaWVyRmxhZ09wdGlvbjsKKyAgICBpZiAoY3VycmVudE1vZGlmaWVycy5jb250YWlucyhQ bGF0Zm9ybUV2ZW50OjpNb2RpZmllcjo6TWV0YUtleSkpCisgICAgICAgIG1vZGlmaWVycyB8PSBO U0V2ZW50TW9kaWZpZXJGbGFnQ29tbWFuZDsKKyAgICBpZiAoY3VycmVudE1vZGlmaWVycy5jb250 YWlucyhQbGF0Zm9ybUV2ZW50OjpNb2RpZmllcjo6Q2Fwc0xvY2tLZXkpKQorICAgICAgICBtb2Rp ZmllcnMgfD0gTlNFdmVudE1vZGlmaWVyRmxhZ0NhcHNMb2NrOworICAgIAorICAgIHJldHVybiBt b2RpZmllcnM7Cit9CisjZW5kaWYKKwogYm9vbCBJbmplY3RlZEJ1bmRsZTo6aW5pdGlhbGl6ZShj b25zdCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzLCBBUEk6Ok9iamVj dCogaW5pdGlhbGl6YXRpb25Vc2VyRGF0YSkKIHsKICAgICBpZiAobV9zYW5kYm94RXh0ZW5zaW9u KSB7CkBAIC0xMTcsNiArMTM5LDEyIEBAIGJvb2wgSW5qZWN0ZWRCdW5kbGU6OmluaXRpYWxpemUo Y29uc3QgV2UKICAgICB9CiAjZW5kaWYKICAgICAKKyNpZiBFTkFCTEUoV0VCUFJPQ0VTU19XSU5E T1dTRVJWRVJfQkxPQ0tJTkcpCisgICAgLy8gU3dpenpsZSBbTlNFdmVudCBtb2RpZmVyRmxhZ3Nd LCBzaW5jZSBpdCBhbHdheXMgcmV0dXJucyAwIHdoZW4gdGhlIFdpbmRvd1NlcnZlciBpcyBibG9j a2VkLgorICAgIE1ldGhvZCBtZXRob2QgPSBjbGFzc19nZXRDbGFzc01ldGhvZChbTlNFdmVudCBj bGFzc10sIEBzZWxlY3Rvcihtb2RpZmllckZsYWdzKSk7CisgICAgbWV0aG9kX3NldEltcGxlbWVu dGF0aW9uKG1ldGhvZCwgcmVpbnRlcnByZXRfY2FzdDxJTVA+KGN1cnJlbnRNb2RpZmllckZsYWdz KSk7CisjZW5kaWYKKyAgICAKICAgICBpZiAoIWluaXRpYWxpemVGdW5jdGlvbikKICAgICAgICAg aW5pdGlhbGl6ZUZ1bmN0aW9uID0gYml0d2lzZV9jYXN0PFdLQnVuZGxlSW5pdGlhbGl6ZUZ1bmN0 aW9uUHRyPihDRkJ1bmRsZUdldEZ1bmN0aW9uUG9pbnRlckZvck5hbWUoW21fcGxhdGZvcm1CdW5k bGUgX2NmQnVuZGxlXSwgQ0ZTVFIoIldLQnVuZGxlSW5pdGlhbGl6ZSIpKSk7CiAK