209755 2020-03-30 11:04:58 -0700 Known app-bound domain protocols should not check the app-bound domain list 2020-03-30 16:06:08 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney bfulgham cdumez oldest_to_newest 1635598 0 katherine_cheney 2020-03-30 11:04:58 -0700 It is wasteful to check the app-bound domain list and wait for a response when some protocols are automatically considered app-bound. 1635599 1 katherine_cheney 2020-03-30 11:05:32 -0700 <rdar://problem/60875376> 1635602 2 394936 katherine_cheney 2020-03-30 11:08:44 -0700 Created attachment 394936 Patch 1635605 3 394937 katherine_cheney 2020-03-30 11:13:17 -0700 Created attachment 394937 Patch 1635666 4 394937 cdumez 2020-03-30 13:08:37 -0700 Comment on attachment 394937 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394937&action=review > Source/WebKit/UIProcess/WebPageProxy.cpp:5115 > +#if PLATFORM(COCOA) && PLATFORM(IOS_FAMILY) PLATFORM(COCOA) && seems redundant > Source/WebKit/UIProcess/WebPageProxy.cpp:5116 > + if (!shouldBeTreatedAsAppBound(request.url())) Not sure I understand why the ! here. 1635674 5 394937 katherine_cheney 2020-03-30 13:19:45 -0700 Comment on attachment 394937 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394937&action=review >> Source/WebKit/UIProcess/WebPageProxy.cpp:5115 >> +#if PLATFORM(COCOA) && PLATFORM(IOS_FAMILY) > > PLATFORM(COCOA) && seems redundant Removing. >> Source/WebKit/UIProcess/WebPageProxy.cpp:5116 >> + if (!shouldBeTreatedAsAppBound(request.url())) > > Not sure I understand why the ! here. If shouldExpectAppBoundDomainResult is Yes, we make the call to check the app-bound domain list (see below). We only want to check the app-bound domain list if the request url is not one of these special, automatic app-bound domain protocols. Keeping it as ShouldExpectAppBoundDomainResult::No for the app-bound domain protocols makes sure we don't dispatch and wait for the list to be checked. ShouldExpectAppBoundDomainResult::No now automatically returns NavigatingToAppBoundDomain::Yes in the WebFramePolicyListener constructor. 1635677 6 katherine_cheney 2020-03-30 13:20:32 -0700 (In reply to katherine_cheney from comment #5) > Comment on attachment 394937 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=394937&action=review > > >> Source/WebKit/UIProcess/WebPageProxy.cpp:5115 > >> +#if PLATFORM(COCOA) && PLATFORM(IOS_FAMILY) > > > > PLATFORM(COCOA) && seems redundant > > Removing. > > >> Source/WebKit/UIProcess/WebPageProxy.cpp:5116 > >> + if (!shouldBeTreatedAsAppBound(request.url())) > > > > Not sure I understand why the ! here. > > If shouldExpectAppBoundDomainResult is Yes, we make the call to check the > app-bound domain list (see below). We only want to check the app-bound > domain list if the request url is not one of these special, automatic > app-bound domain protocols. > By "see below," I meant this line in the patch: + if (shouldExpectAppBoundDomainResult == ShouldExpectAppBoundDomainResult::Yes) + m_websiteDataStore->beginAppBoundDomainCheck(RegistrableDomain { request.url() }, listener); > Keeping it as ShouldExpectAppBoundDomainResult::No for the app-bound domain > protocols makes sure we don't dispatch and wait for the list to be checked. > ShouldExpectAppBoundDomainResult::No now automatically returns > NavigatingToAppBoundDomain::Yes in the WebFramePolicyListener constructor. 1635678 7 394952 katherine_cheney 2020-03-30 13:24:01 -0700 Created attachment 394952 Patch 1635679 8 cdumez 2020-03-30 13:25:11 -0700 While I believe you that the patch does the right thing, it seems to do the right thing in a confusing way and it would be nice to refactor the code so that it is clearer. Right now, at best it would need a comment. But if code requires a comment, then it likely means the code is not clear enough to be self documenting. 1635680 9 394952 cdumez 2020-03-30 13:27:19 -0700 Comment on attachment 394952 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394952&action=review > Source/WebKit/UIProcess/WebPageProxy.cpp:-5177 > - m_websiteDataStore->beginAppBoundDomainCheck(RegistrableDomain { request.url() }, listener); Can beginAppBoundDomainCheck() take a URL and do an early return if the protocol is definitely app bound? Seems like it might be clearer than all this special casing at the call site. We'd always do an app bound check but the check would be super cheap in some cases. 1635684 10 394952 cdumez 2020-03-30 13:31:40 -0700 Comment on attachment 394952 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394952&action=review >> Source/WebKit/UIProcess/WebPageProxy.cpp:-5177 >> - m_websiteDataStore->beginAppBoundDomainCheck(RegistrableDomain { request.url() }, listener); > > Can beginAppBoundDomainCheck() take a URL and do an early return if the protocol is definitely app bound? Seems like it might be clearer than all this special casing at the call site. We'd always do an app bound check but the check would be super cheap in some cases. Also, please rename shouldBeTreatedAsAppBound() to something like shouldTreatURLProtocolAsAppBound() 1635728 11 394961 katherine_cheney 2020-03-30 14:30:58 -0700 Created attachment 394961 Patch 1635793 12 394961 cdumez 2020-03-30 15:56:06 -0700 Comment on attachment 394961 Patch me likee 1635797 13 katherine_cheney 2020-03-30 16:02:37 -0700 (In reply to Chris Dumez from comment #12) > Comment on attachment 394961 [details] > Patch > > me likee :) thanks! 1635800 14 ews-feeder 2020-03-30 16:06:07 -0700 Committed r259240: <https://trac.webkit.org/changeset/259240> All reviewed patches have been landed. Closing bug and clearing flags on attachment 394961. 394936 2020-03-30 11:08:44 -0700 2020-03-30 11:13:16 -0700 Patch bug-209755-20200330110844.patch text/plain 5257 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDVhMmM5ZTZlODlkYzI2Yjg1 NDMwYzg3NTk4N2NjNzYzNjNhZTZiOGEuLjQzODE4NDM1NjZhNmI0YjRlYjhjNDU5OWQ1YjQyMzUx MGM4MTM5ZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMjAtMDMtMzAgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgS25vd24gYXBwLWJv dW5kIGRvbWFpbiBwcm90b2NvbHMgc2hvdWxkIG5vdCBjaGVjayB0aGUgYXBwLWJvdW5kIGRvbWFp biBsaXN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MDk3NTUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYwODc1Mzc2PiAKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGNoZWNrcyBpZiBh IHVybCBzaG91bGQgYmUgdHJlYXRlZCBhcyBhcHAtYm91bmQgYmFzZWQgb24KKyAgICAgICAgcHJv dG9jb2wgYmVmb3JlIGRlY2lkaW5nIHRvIGNoZWNrIHRoZSBhcHAtYm91bmQgZG9tYWluIGxpc3Qu CisgICAgICAgIEl0IGlzIHdhc3RlZnVsIHRvIGNoZWNrIHRoZSBhcHAtYm91bmQgZG9tYWluIGxp c3QgYW5kIHdhaXQgZm9yIGEKKyAgICAgICAgcmVzcG9uc2Ugd2hlbiBzb21lIHByb3RvY29scyBh cmUgYXV0b21hdGljYWxseSBjb25zaWRlcmVkIGFwcC1ib3VuZC4KKworICAgICAgICBFeGlzdGlu ZyBiZWhhdmlvciBzaG91bGQgYmUgbWFpbnRhaW5lZCwgdGhpcyBpcyB0ZXN0ZWQgYnkgZXhpc3Rp bmcKKyAgICAgICAgSW4tQXBwIEJyb3dzZXIgUHJpdmFjeSBsYXlvdXQgYW5kIEFQSSB0ZXN0cy4K KworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHk6OldlYkZyYW1lUG9s aWN5TGlzdGVuZXJQcm94eSk6CisgICAgICAgIFVwZGF0aW5nIHRoZSBjb25zdHJ1Y3RvciB0byBz ZW5kICJ0cnVlIiBpZiBubyBhcHAtYm91bmQgZG9tYWluIHJlc3VsdAorICAgICAgICBpcyBleHBl Y3RlZC4gVGhpcyBpcyBva2F5IGJlY2F1c2UgdGhlIG9ubHkgdGltZXMgd2UgZG8gbm90IGV4cGVj dCBhCisgICAgICAgIHJlc3VsdCBpcyB3aGVuIHdlIGRvIG5vdCBjaGVjayB0aGUgbGlzdGVuZXIg cmVzdWx0LCBvciB3ZSBoYXZlIGFscmVhZHkKKyAgICAgICAgY2hlY2tlZCB0aGUgdXJsIGFuZCBo YXZlIGRldGVybWluZWQgaXQgdG8gYmUgYXBwLWJvdW5kLgorCisgICAgICAgICogVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2V0SXNO YXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbik6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94 eTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbik6CisgICAgICAgIE5vIG5lZWQgdG8g Y2hlY2sgZm9yIHNob3VsZEJlVHJlYXRlZEFzQXBwQm91bmQodXJsKSBoZXJlLCBpdCB3aWxsIG5v dworICAgICAgICBiZSBjaGVja2VkIGluIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24o KS4KKwogMjAyMC0wMy0zMCAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW0NvY29hXSBTbGVlcCBkaXNhYmxpbmcgc2hvdWxkIGJlIHBlcmZvcm1lZCBpbiB0 aGUgVUkgcHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJh bWVQb2xpY3lMaXN0ZW5lclByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZy YW1lUG9saWN5TGlzdGVuZXJQcm94eS5jcHAKaW5kZXggY2IwNDQ0ZTdkMTgwODk4ZjY3OWQyNjc1 M2M2M2MzY2VjNzZiYjc4ZC4uMDE0Y2QzODQwZjc4ZmY5Zjc0ZmFlYzZmMmRiZDNjMGE0ODEwNmEy YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQb2xpY3lMaXN0 ZW5lclByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVBvbGlj eUxpc3RlbmVyUHJveHkuY3BwCkBAIC00MSw3ICs0MSw3IEBAIFdlYkZyYW1lUG9saWN5TGlzdGVu ZXJQcm94eTo6V2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5KFJlcGx5JiYgcmVwbHksIFNob3Vs ZEV4CiAgICAgaWYgKGV4cGVjdFNhZmVCcm93c2luZ1Jlc3VsdCA9PSBTaG91bGRFeHBlY3RTYWZl QnJvd3NpbmdSZXN1bHQ6Ok5vKQogICAgICAgICBkaWRSZWNlaXZlU2FmZUJyb3dzaW5nUmVzdWx0 cyh7IH0pOwogICAgIGlmIChleHBlY3RBcHBCb3VuZERvbWFpblJlc3VsdCA9PSBTaG91bGRFeHBl Y3RBcHBCb3VuZERvbWFpblJlc3VsdDo6Tm8pCi0gICAgICAgIGRpZFJlY2VpdmVBcHBCb3VuZERv bWFpblJlc3VsdCh7IH0pOworICAgICAgICBkaWRSZWNlaXZlQXBwQm91bmREb21haW5SZXN1bHQo dHJ1ZSk7CiB9CiAKIFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eTo6fldlYkZyYW1lUG9saWN5 TGlzdGVuZXJQcm94eSgpID0gZGVmYXVsdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCmluZGV4IGE5OWVhODIwOTk4OWQ5NDk4OWRhODFjMmFjMzhiYmZjMWI4NDY3ZTUu LjRiZjhmNGQxNDQ3NzEyNzJmZmZiNWEwODM2NzY1NjhiYmI3MDE1N2QgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMzEzOSw5ICszMTM5LDYgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OnNldElzTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW4oYm9vbCBpc01haW5G cmFtZSwgY29uc3QgVVJMJgogICAgICAgICBpZiAobV9pZ25vcmVzQXBwQm91bmREb21haW5zKQog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBXRUJfUEFHRV9QUk9YWV9BRERJVElPTlNfU0VU SVNOQVZJR0FUSU5HVE9BUFBCT1VORERPTUFJTgotICAgICAgICBpZiAoaXNOYXZpZ2F0aW5nVG9B cHBCb3VuZERvbWFpbiA9PSBOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbjo6Tm8gJiYgc2hvdWxk QmVUcmVhdGVkQXNBcHBCb3VuZChyZXF1ZXN0VVJMKSkKLSAgICAgICAgICAgIGlzTmF2aWdhdGlu Z1RvQXBwQm91bmREb21haW4gPSBOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbjo6WWVzOwotCiAg ICAgICAgIGlmIChpc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluID09IE5hdmlnYXRpbmdUb0Fw cEJvdW5kRG9tYWluOjpObykgewogICAgICAgICAgICAgbV9jb25maWd1cmF0aW9uLT5zZXRXZWJW aWV3Q2F0ZWdvcnkoV2ViVmlld0NhdGVnb3J5OjpJbkFwcEJyb3dzZXIpOwogICAgICAgICAgICAg bV9pc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluID0gTmF2aWdhdGluZ1RvQXBwQm91bmREb21h aW46Ok5vOwpAQCAtNTExNiw3ICs1MTEzLDggQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBv bGljeUZvck5hdmlnYXRpb25BY3Rpb24oUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXMKIAog ICAgIFNob3VsZEV4cGVjdEFwcEJvdW5kRG9tYWluUmVzdWx0IHNob3VsZEV4cGVjdEFwcEJvdW5k RG9tYWluUmVzdWx0ID0gU2hvdWxkRXhwZWN0QXBwQm91bmREb21haW5SZXN1bHQ6Ok5vOwogI2lm IFBMQVRGT1JNKENPQ09BKQotICAgIHNob3VsZEV4cGVjdEFwcEJvdW5kRG9tYWluUmVzdWx0ID0g U2hvdWxkRXhwZWN0QXBwQm91bmREb21haW5SZXN1bHQ6OlllczsKKyAgICBpZiAoIXNob3VsZEJl VHJlYXRlZEFzQXBwQm91bmQocmVxdWVzdC51cmwoKSkpCisgICAgICAgIHNob3VsZEV4cGVjdEFw cEJvdW5kRG9tYWluUmVzdWx0ID0gU2hvdWxkRXhwZWN0QXBwQm91bmREb21haW5SZXN1bHQ6Olll czsKICNlbmRpZgogICAgIAogICAgIGF1dG8gbGlzdGVuZXIgPSBtYWtlUmVmKGZyYW1lLnNldFVw UG9saWN5TGlzdGVuZXJQcm94eShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMp LCBmcmFtZSA9IG1ha2VSZWYoZnJhbWUpLCBzZW5kZXIgPSBXVEZNb3ZlKHNlbmRlciksIG5hdmln YXRpb25dIChQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uLCBBUEk6OldlYnNpdGVQb2xpY2llcyog cG9saWNpZXMsIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0 ZWRCeUNsaWVudCwgUmVmUHRyPFNhZmVCcm93c2luZ1dhcm5pbmc+JiYgc2FmZUJyb3dzaW5nV2Fy bmluZywgTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW4gaXNBcHBCb3VuZERvbWFpbikgbXV0YWJs ZSB7CkBAIC01MTc0LDcgKzUxNzIsOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5 Rm9yTmF2aWdhdGlvbkFjdGlvbihSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2NlcwogICAgIGlm IChzaG91bGRFeHBlY3RTYWZlQnJvd3NpbmdSZXN1bHQgPT0gU2hvdWxkRXhwZWN0U2FmZUJyb3dz aW5nUmVzdWx0OjpZZXMpCiAgICAgICAgIGJlZ2luU2FmZUJyb3dzaW5nQ2hlY2socmVxdWVzdC51 cmwoKSwgZnJhbWUuaXNNYWluRnJhbWUoKSwgbGlzdGVuZXIpOwogI2lmIFBMQVRGT1JNKENPQ09B KQotICAgIG1fd2Vic2l0ZURhdGFTdG9yZS0+YmVnaW5BcHBCb3VuZERvbWFpbkNoZWNrKFJlZ2lz dHJhYmxlRG9tYWluIHsgcmVxdWVzdC51cmwoKSB9LCBsaXN0ZW5lcik7CisgICAgaWYgKHNob3Vs ZEV4cGVjdEFwcEJvdW5kRG9tYWluUmVzdWx0ID09IFNob3VsZEV4cGVjdEFwcEJvdW5kRG9tYWlu UmVzdWx0OjpZZXMpCisgICAgICAgIG1fd2Vic2l0ZURhdGFTdG9yZS0+YmVnaW5BcHBCb3VuZERv bWFpbkNoZWNrKFJlZ2lzdHJhYmxlRG9tYWluIHsgcmVxdWVzdC51cmwoKSB9LCBsaXN0ZW5lcik7 CiAjZW5kaWYKICAgICBBUEk6Ok5hdmlnYXRpb24qIG1haW5GcmFtZU5hdmlnYXRpb24gPSBmcmFt ZS5pc01haW5GcmFtZSgpID8gbmF2aWdhdGlvbi5nZXQoKSA6IG51bGxwdHI7CiAgICAgV2ViRnJh bWVQcm94eSogb3JpZ2luYXRpbmdGcmFtZSA9IG9yaWdpbmF0aW5nRnJhbWVJbmZvRGF0YS5mcmFt ZUlEID8gcHJvY2Vzcy0+d2ViRnJhbWUoKm9yaWdpbmF0aW5nRnJhbWVJbmZvRGF0YS5mcmFtZUlE KSA6IG51bGxwdHI7Cg== 394937 2020-03-30 11:13:17 -0700 2020-03-30 13:24:00 -0700 Patch bug-209755-20200330111316.patch text/plain 5380 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDVhMmM5ZTZlODlkYzI2Yjg1 NDMwYzg3NTk4N2NjNzYzNjNhZTZiOGEuLjQzODE4NDM1NjZhNmI0YjRlYjhjNDU5OWQ1YjQyMzUx MGM4MTM5ZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMjAtMDMtMzAgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgS25vd24gYXBwLWJv dW5kIGRvbWFpbiBwcm90b2NvbHMgc2hvdWxkIG5vdCBjaGVjayB0aGUgYXBwLWJvdW5kIGRvbWFp biBsaXN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MDk3NTUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYwODc1Mzc2PiAKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGNoZWNrcyBpZiBh IHVybCBzaG91bGQgYmUgdHJlYXRlZCBhcyBhcHAtYm91bmQgYmFzZWQgb24KKyAgICAgICAgcHJv dG9jb2wgYmVmb3JlIGRlY2lkaW5nIHRvIGNoZWNrIHRoZSBhcHAtYm91bmQgZG9tYWluIGxpc3Qu CisgICAgICAgIEl0IGlzIHdhc3RlZnVsIHRvIGNoZWNrIHRoZSBhcHAtYm91bmQgZG9tYWluIGxp c3QgYW5kIHdhaXQgZm9yIGEKKyAgICAgICAgcmVzcG9uc2Ugd2hlbiBzb21lIHByb3RvY29scyBh cmUgYXV0b21hdGljYWxseSBjb25zaWRlcmVkIGFwcC1ib3VuZC4KKworICAgICAgICBFeGlzdGlu ZyBiZWhhdmlvciBzaG91bGQgYmUgbWFpbnRhaW5lZCwgdGhpcyBpcyB0ZXN0ZWQgYnkgZXhpc3Rp bmcKKyAgICAgICAgSW4tQXBwIEJyb3dzZXIgUHJpdmFjeSBsYXlvdXQgYW5kIEFQSSB0ZXN0cy4K KworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHk6OldlYkZyYW1lUG9s aWN5TGlzdGVuZXJQcm94eSk6CisgICAgICAgIFVwZGF0aW5nIHRoZSBjb25zdHJ1Y3RvciB0byBz ZW5kICJ0cnVlIiBpZiBubyBhcHAtYm91bmQgZG9tYWluIHJlc3VsdAorICAgICAgICBpcyBleHBl Y3RlZC4gVGhpcyBpcyBva2F5IGJlY2F1c2UgdGhlIG9ubHkgdGltZXMgd2UgZG8gbm90IGV4cGVj dCBhCisgICAgICAgIHJlc3VsdCBpcyB3aGVuIHdlIGRvIG5vdCBjaGVjayB0aGUgbGlzdGVuZXIg cmVzdWx0LCBvciB3ZSBoYXZlIGFscmVhZHkKKyAgICAgICAgY2hlY2tlZCB0aGUgdXJsIGFuZCBo YXZlIGRldGVybWluZWQgaXQgdG8gYmUgYXBwLWJvdW5kLgorCisgICAgICAgICogVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2V0SXNO YXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbik6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94 eTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbik6CisgICAgICAgIE5vIG5lZWQgdG8g Y2hlY2sgZm9yIHNob3VsZEJlVHJlYXRlZEFzQXBwQm91bmQodXJsKSBoZXJlLCBpdCB3aWxsIG5v dworICAgICAgICBiZSBjaGVja2VkIGluIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24o KS4KKwogMjAyMC0wMy0zMCAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW0NvY29hXSBTbGVlcCBkaXNhYmxpbmcgc2hvdWxkIGJlIHBlcmZvcm1lZCBpbiB0 aGUgVUkgcHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJh bWVQb2xpY3lMaXN0ZW5lclByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZy YW1lUG9saWN5TGlzdGVuZXJQcm94eS5jcHAKaW5kZXggY2IwNDQ0ZTdkMTgwODk4ZjY3OWQyNjc1 M2M2M2MzY2VjNzZiYjc4ZC4uMDE0Y2QzODQwZjc4ZmY5Zjc0ZmFlYzZmMmRiZDNjMGE0ODEwNmEy YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQb2xpY3lMaXN0 ZW5lclByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVBvbGlj eUxpc3RlbmVyUHJveHkuY3BwCkBAIC00MSw3ICs0MSw3IEBAIFdlYkZyYW1lUG9saWN5TGlzdGVu ZXJQcm94eTo6V2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5KFJlcGx5JiYgcmVwbHksIFNob3Vs ZEV4CiAgICAgaWYgKGV4cGVjdFNhZmVCcm93c2luZ1Jlc3VsdCA9PSBTaG91bGRFeHBlY3RTYWZl QnJvd3NpbmdSZXN1bHQ6Ok5vKQogICAgICAgICBkaWRSZWNlaXZlU2FmZUJyb3dzaW5nUmVzdWx0 cyh7IH0pOwogICAgIGlmIChleHBlY3RBcHBCb3VuZERvbWFpblJlc3VsdCA9PSBTaG91bGRFeHBl Y3RBcHBCb3VuZERvbWFpblJlc3VsdDo6Tm8pCi0gICAgICAgIGRpZFJlY2VpdmVBcHBCb3VuZERv bWFpblJlc3VsdCh7IH0pOworICAgICAgICBkaWRSZWNlaXZlQXBwQm91bmREb21haW5SZXN1bHQo dHJ1ZSk7CiB9CiAKIFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eTo6fldlYkZyYW1lUG9saWN5 TGlzdGVuZXJQcm94eSgpID0gZGVmYXVsdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCmluZGV4IGE5OWVhODIwOTk4OWQ5NDk4OWRhODFjMmFjMzhiYmZjMWI4NDY3ZTUu Ljc1NDM4N2VlYjgwZWU1MDk4ODhlMzM0MmI3MTZiYWJlZDNmYmI1MGQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMzEzOSw5ICszMTM5LDYgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OnNldElzTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW4oYm9vbCBpc01haW5G cmFtZSwgY29uc3QgVVJMJgogICAgICAgICBpZiAobV9pZ25vcmVzQXBwQm91bmREb21haW5zKQog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBXRUJfUEFHRV9QUk9YWV9BRERJVElPTlNfU0VU SVNOQVZJR0FUSU5HVE9BUFBCT1VORERPTUFJTgotICAgICAgICBpZiAoaXNOYXZpZ2F0aW5nVG9B cHBCb3VuZERvbWFpbiA9PSBOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbjo6Tm8gJiYgc2hvdWxk QmVUcmVhdGVkQXNBcHBCb3VuZChyZXF1ZXN0VVJMKSkKLSAgICAgICAgICAgIGlzTmF2aWdhdGlu Z1RvQXBwQm91bmREb21haW4gPSBOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbjo6WWVzOwotCiAg ICAgICAgIGlmIChpc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluID09IE5hdmlnYXRpbmdUb0Fw cEJvdW5kRG9tYWluOjpObykgewogICAgICAgICAgICAgbV9jb25maWd1cmF0aW9uLT5zZXRXZWJW aWV3Q2F0ZWdvcnkoV2ViVmlld0NhdGVnb3J5OjpJbkFwcEJyb3dzZXIpOwogICAgICAgICAgICAg bV9pc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluID0gTmF2aWdhdGluZ1RvQXBwQm91bmREb21h aW46Ok5vOwpAQCAtNTExNSw4ICs1MTEyLDkgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBv bGljeUZvck5hdmlnYXRpb25BY3Rpb24oUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXMKICAg ICAgICAgc2hvdWxkRXhwZWN0U2FmZUJyb3dzaW5nUmVzdWx0ID0gU2hvdWxkRXhwZWN0U2FmZUJy b3dzaW5nUmVzdWx0OjpObzsKIAogICAgIFNob3VsZEV4cGVjdEFwcEJvdW5kRG9tYWluUmVzdWx0 IHNob3VsZEV4cGVjdEFwcEJvdW5kRG9tYWluUmVzdWx0ID0gU2hvdWxkRXhwZWN0QXBwQm91bmRE b21haW5SZXN1bHQ6Ok5vOwotI2lmIFBMQVRGT1JNKENPQ09BKQotICAgIHNob3VsZEV4cGVjdEFw cEJvdW5kRG9tYWluUmVzdWx0ID0gU2hvdWxkRXhwZWN0QXBwQm91bmREb21haW5SZXN1bHQ6Olll czsKKyNpZiBQTEFURk9STShDT0NPQSkgJiYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKyAgICBpZiAo IXNob3VsZEJlVHJlYXRlZEFzQXBwQm91bmQocmVxdWVzdC51cmwoKSkpCisgICAgICAgIHNob3Vs ZEV4cGVjdEFwcEJvdW5kRG9tYWluUmVzdWx0ID0gU2hvdWxkRXhwZWN0QXBwQm91bmREb21haW5S ZXN1bHQ6OlllczsKICNlbmRpZgogICAgIAogICAgIGF1dG8gbGlzdGVuZXIgPSBtYWtlUmVmKGZy YW1lLnNldFVwUG9saWN5TGlzdGVuZXJQcm94eShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VS ZWYoKnRoaXMpLCBmcmFtZSA9IG1ha2VSZWYoZnJhbWUpLCBzZW5kZXIgPSBXVEZNb3ZlKHNlbmRl ciksIG5hdmlnYXRpb25dIChQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uLCBBUEk6OldlYnNpdGVQ b2xpY2llcyogcG9saWNpZXMsIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3 YXBSZXF1ZXN0ZWRCeUNsaWVudCwgUmVmUHRyPFNhZmVCcm93c2luZ1dhcm5pbmc+JiYgc2FmZUJy b3dzaW5nV2FybmluZywgTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW4gaXNBcHBCb3VuZERvbWFp bikgbXV0YWJsZSB7CkBAIC01MTc0LDcgKzUxNzIsOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGVj aWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nl cwogICAgIGlmIChzaG91bGRFeHBlY3RTYWZlQnJvd3NpbmdSZXN1bHQgPT0gU2hvdWxkRXhwZWN0 U2FmZUJyb3dzaW5nUmVzdWx0OjpZZXMpCiAgICAgICAgIGJlZ2luU2FmZUJyb3dzaW5nQ2hlY2so cmVxdWVzdC51cmwoKSwgZnJhbWUuaXNNYWluRnJhbWUoKSwgbGlzdGVuZXIpOwogI2lmIFBMQVRG T1JNKENPQ09BKQotICAgIG1fd2Vic2l0ZURhdGFTdG9yZS0+YmVnaW5BcHBCb3VuZERvbWFpbkNo ZWNrKFJlZ2lzdHJhYmxlRG9tYWluIHsgcmVxdWVzdC51cmwoKSB9LCBsaXN0ZW5lcik7CisgICAg aWYgKHNob3VsZEV4cGVjdEFwcEJvdW5kRG9tYWluUmVzdWx0ID09IFNob3VsZEV4cGVjdEFwcEJv dW5kRG9tYWluUmVzdWx0OjpZZXMpCisgICAgICAgIG1fd2Vic2l0ZURhdGFTdG9yZS0+YmVnaW5B cHBCb3VuZERvbWFpbkNoZWNrKFJlZ2lzdHJhYmxlRG9tYWluIHsgcmVxdWVzdC51cmwoKSB9LCBs aXN0ZW5lcik7CiAjZW5kaWYKICAgICBBUEk6Ok5hdmlnYXRpb24qIG1haW5GcmFtZU5hdmlnYXRp b24gPSBmcmFtZS5pc01haW5GcmFtZSgpID8gbmF2aWdhdGlvbi5nZXQoKSA6IG51bGxwdHI7CiAg ICAgV2ViRnJhbWVQcm94eSogb3JpZ2luYXRpbmdGcmFtZSA9IG9yaWdpbmF0aW5nRnJhbWVJbmZv RGF0YS5mcmFtZUlEID8gcHJvY2Vzcy0+d2ViRnJhbWUoKm9yaWdpbmF0aW5nRnJhbWVJbmZvRGF0 YS5mcmFtZUlEKSA6IG51bGxwdHI7Cg== 394952 2020-03-30 13:24:01 -0700 2020-03-30 14:30:56 -0700 Patch bug-209755-20200330132400.patch text/plain 5361 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDVhMmM5ZTZlODlkYzI2Yjg1 NDMwYzg3NTk4N2NjNzYzNjNhZTZiOGEuLjQzODE4NDM1NjZhNmI0YjRlYjhjNDU5OWQ1YjQyMzUx MGM4MTM5ZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMjAtMDMtMzAgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgS25vd24gYXBwLWJv dW5kIGRvbWFpbiBwcm90b2NvbHMgc2hvdWxkIG5vdCBjaGVjayB0aGUgYXBwLWJvdW5kIGRvbWFp biBsaXN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MDk3NTUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYwODc1Mzc2PiAKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGNoZWNrcyBpZiBh IHVybCBzaG91bGQgYmUgdHJlYXRlZCBhcyBhcHAtYm91bmQgYmFzZWQgb24KKyAgICAgICAgcHJv dG9jb2wgYmVmb3JlIGRlY2lkaW5nIHRvIGNoZWNrIHRoZSBhcHAtYm91bmQgZG9tYWluIGxpc3Qu CisgICAgICAgIEl0IGlzIHdhc3RlZnVsIHRvIGNoZWNrIHRoZSBhcHAtYm91bmQgZG9tYWluIGxp c3QgYW5kIHdhaXQgZm9yIGEKKyAgICAgICAgcmVzcG9uc2Ugd2hlbiBzb21lIHByb3RvY29scyBh cmUgYXV0b21hdGljYWxseSBjb25zaWRlcmVkIGFwcC1ib3VuZC4KKworICAgICAgICBFeGlzdGlu ZyBiZWhhdmlvciBzaG91bGQgYmUgbWFpbnRhaW5lZCwgdGhpcyBpcyB0ZXN0ZWQgYnkgZXhpc3Rp bmcKKyAgICAgICAgSW4tQXBwIEJyb3dzZXIgUHJpdmFjeSBsYXlvdXQgYW5kIEFQSSB0ZXN0cy4K KworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHk6OldlYkZyYW1lUG9s aWN5TGlzdGVuZXJQcm94eSk6CisgICAgICAgIFVwZGF0aW5nIHRoZSBjb25zdHJ1Y3RvciB0byBz ZW5kICJ0cnVlIiBpZiBubyBhcHAtYm91bmQgZG9tYWluIHJlc3VsdAorICAgICAgICBpcyBleHBl Y3RlZC4gVGhpcyBpcyBva2F5IGJlY2F1c2UgdGhlIG9ubHkgdGltZXMgd2UgZG8gbm90IGV4cGVj dCBhCisgICAgICAgIHJlc3VsdCBpcyB3aGVuIHdlIGRvIG5vdCBjaGVjayB0aGUgbGlzdGVuZXIg cmVzdWx0LCBvciB3ZSBoYXZlIGFscmVhZHkKKyAgICAgICAgY2hlY2tlZCB0aGUgdXJsIGFuZCBo YXZlIGRldGVybWluZWQgaXQgdG8gYmUgYXBwLWJvdW5kLgorCisgICAgICAgICogVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2V0SXNO YXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbik6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94 eTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbik6CisgICAgICAgIE5vIG5lZWQgdG8g Y2hlY2sgZm9yIHNob3VsZEJlVHJlYXRlZEFzQXBwQm91bmQodXJsKSBoZXJlLCBpdCB3aWxsIG5v dworICAgICAgICBiZSBjaGVja2VkIGluIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24o KS4KKwogMjAyMC0wMy0zMCAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW0NvY29hXSBTbGVlcCBkaXNhYmxpbmcgc2hvdWxkIGJlIHBlcmZvcm1lZCBpbiB0 aGUgVUkgcHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJh bWVQb2xpY3lMaXN0ZW5lclByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZy YW1lUG9saWN5TGlzdGVuZXJQcm94eS5jcHAKaW5kZXggY2IwNDQ0ZTdkMTgwODk4ZjY3OWQyNjc1 M2M2M2MzY2VjNzZiYjc4ZC4uMDE0Y2QzODQwZjc4ZmY5Zjc0ZmFlYzZmMmRiZDNjMGE0ODEwNmEy YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQb2xpY3lMaXN0 ZW5lclByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVBvbGlj eUxpc3RlbmVyUHJveHkuY3BwCkBAIC00MSw3ICs0MSw3IEBAIFdlYkZyYW1lUG9saWN5TGlzdGVu ZXJQcm94eTo6V2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5KFJlcGx5JiYgcmVwbHksIFNob3Vs ZEV4CiAgICAgaWYgKGV4cGVjdFNhZmVCcm93c2luZ1Jlc3VsdCA9PSBTaG91bGRFeHBlY3RTYWZl QnJvd3NpbmdSZXN1bHQ6Ok5vKQogICAgICAgICBkaWRSZWNlaXZlU2FmZUJyb3dzaW5nUmVzdWx0 cyh7IH0pOwogICAgIGlmIChleHBlY3RBcHBCb3VuZERvbWFpblJlc3VsdCA9PSBTaG91bGRFeHBl Y3RBcHBCb3VuZERvbWFpblJlc3VsdDo6Tm8pCi0gICAgICAgIGRpZFJlY2VpdmVBcHBCb3VuZERv bWFpblJlc3VsdCh7IH0pOworICAgICAgICBkaWRSZWNlaXZlQXBwQm91bmREb21haW5SZXN1bHQo dHJ1ZSk7CiB9CiAKIFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eTo6fldlYkZyYW1lUG9saWN5 TGlzdGVuZXJQcm94eSgpID0gZGVmYXVsdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCmluZGV4IGE5OWVhODIwOTk4OWQ5NDk4OWRhODFjMmFjMzhiYmZjMWI4NDY3ZTUu LjM4ZjM1MmM3YTRiM2U1ZWYwNmQ4YWY2NDg2MThmMGE5NjJlM2VmNzkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMzEzOSw5ICszMTM5LDYgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OnNldElzTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW4oYm9vbCBpc01haW5G cmFtZSwgY29uc3QgVVJMJgogICAgICAgICBpZiAobV9pZ25vcmVzQXBwQm91bmREb21haW5zKQog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBXRUJfUEFHRV9QUk9YWV9BRERJVElPTlNfU0VU SVNOQVZJR0FUSU5HVE9BUFBCT1VORERPTUFJTgotICAgICAgICBpZiAoaXNOYXZpZ2F0aW5nVG9B cHBCb3VuZERvbWFpbiA9PSBOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbjo6Tm8gJiYgc2hvdWxk QmVUcmVhdGVkQXNBcHBCb3VuZChyZXF1ZXN0VVJMKSkKLSAgICAgICAgICAgIGlzTmF2aWdhdGlu Z1RvQXBwQm91bmREb21haW4gPSBOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbjo6WWVzOwotCiAg ICAgICAgIGlmIChpc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluID09IE5hdmlnYXRpbmdUb0Fw cEJvdW5kRG9tYWluOjpObykgewogICAgICAgICAgICAgbV9jb25maWd1cmF0aW9uLT5zZXRXZWJW aWV3Q2F0ZWdvcnkoV2ViVmlld0NhdGVnb3J5OjpJbkFwcEJyb3dzZXIpOwogICAgICAgICAgICAg bV9pc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluID0gTmF2aWdhdGluZ1RvQXBwQm91bmREb21h aW46Ok5vOwpAQCAtNTExNSw4ICs1MTEyLDkgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBv bGljeUZvck5hdmlnYXRpb25BY3Rpb24oUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXMKICAg ICAgICAgc2hvdWxkRXhwZWN0U2FmZUJyb3dzaW5nUmVzdWx0ID0gU2hvdWxkRXhwZWN0U2FmZUJy b3dzaW5nUmVzdWx0OjpObzsKIAogICAgIFNob3VsZEV4cGVjdEFwcEJvdW5kRG9tYWluUmVzdWx0 IHNob3VsZEV4cGVjdEFwcEJvdW5kRG9tYWluUmVzdWx0ID0gU2hvdWxkRXhwZWN0QXBwQm91bmRE b21haW5SZXN1bHQ6Ok5vOwotI2lmIFBMQVRGT1JNKENPQ09BKQotICAgIHNob3VsZEV4cGVjdEFw cEJvdW5kRG9tYWluUmVzdWx0ID0gU2hvdWxkRXhwZWN0QXBwQm91bmREb21haW5SZXN1bHQ6Olll czsKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgIGlmICghc2hvdWxkQmVUcmVhdGVkQXNB cHBCb3VuZChyZXF1ZXN0LnVybCgpKSkKKyAgICAgICAgc2hvdWxkRXhwZWN0QXBwQm91bmREb21h aW5SZXN1bHQgPSBTaG91bGRFeHBlY3RBcHBCb3VuZERvbWFpblJlc3VsdDo6WWVzOwogI2VuZGlm CiAgICAgCiAgICAgYXV0byBsaXN0ZW5lciA9IG1ha2VSZWYoZnJhbWUuc2V0VXBQb2xpY3lMaXN0 ZW5lclByb3h5KFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGZyYW1lID0g bWFrZVJlZihmcmFtZSksIHNlbmRlciA9IFdURk1vdmUoc2VuZGVyKSwgbmF2aWdhdGlvbl0gKFBv bGljeUFjdGlvbiBwb2xpY3lBY3Rpb24sIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiBwb2xpY2llcywg UHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50 LCBSZWZQdHI8U2FmZUJyb3dzaW5nV2FybmluZz4mJiBzYWZlQnJvd3NpbmdXYXJuaW5nLCBOYXZp Z2F0aW5nVG9BcHBCb3VuZERvbWFpbiBpc0FwcEJvdW5kRG9tYWluKSBtdXRhYmxlIHsKQEAgLTUx NzQsNyArNTE3Miw4IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0 aW9uQWN0aW9uKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJvY2VzCiAgICAgaWYgKHNob3VsZEV4 cGVjdFNhZmVCcm93c2luZ1Jlc3VsdCA9PSBTaG91bGRFeHBlY3RTYWZlQnJvd3NpbmdSZXN1bHQ6 OlllcykKICAgICAgICAgYmVnaW5TYWZlQnJvd3NpbmdDaGVjayhyZXF1ZXN0LnVybCgpLCBmcmFt ZS5pc01haW5GcmFtZSgpLCBsaXN0ZW5lcik7CiAjaWYgUExBVEZPUk0oQ09DT0EpCi0gICAgbV93 ZWJzaXRlRGF0YVN0b3JlLT5iZWdpbkFwcEJvdW5kRG9tYWluQ2hlY2soUmVnaXN0cmFibGVEb21h aW4geyByZXF1ZXN0LnVybCgpIH0sIGxpc3RlbmVyKTsKKyAgICBpZiAoc2hvdWxkRXhwZWN0QXBw Qm91bmREb21haW5SZXN1bHQgPT0gU2hvdWxkRXhwZWN0QXBwQm91bmREb21haW5SZXN1bHQ6Olll cykKKyAgICAgICAgbV93ZWJzaXRlRGF0YVN0b3JlLT5iZWdpbkFwcEJvdW5kRG9tYWluQ2hlY2so UmVnaXN0cmFibGVEb21haW4geyByZXF1ZXN0LnVybCgpIH0sIGxpc3RlbmVyKTsKICNlbmRpZgog ICAgIEFQSTo6TmF2aWdhdGlvbiogbWFpbkZyYW1lTmF2aWdhdGlvbiA9IGZyYW1lLmlzTWFpbkZy YW1lKCkgPyBuYXZpZ2F0aW9uLmdldCgpIDogbnVsbHB0cjsKICAgICBXZWJGcmFtZVByb3h5KiBv cmlnaW5hdGluZ0ZyYW1lID0gb3JpZ2luYXRpbmdGcmFtZUluZm9EYXRhLmZyYW1lSUQgPyBwcm9j ZXNzLT53ZWJGcmFtZSgqb3JpZ2luYXRpbmdGcmFtZUluZm9EYXRhLmZyYW1lSUQpIDogbnVsbHB0 cjsK 394961 2020-03-30 14:30:58 -0700 2020-03-30 16:06:08 -0700 Patch bug-209755-20200330143057.patch text/plain 7038 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGEwMzg2ODU0MTQwMWIwNTI4 NmQ5N2MzNmQ1MzRkMDY5NWE4OWJjNjIuLjkyNTk1ZDA1ODY4OTM1YzcyOGQ2NWM0YzNjODg4M2Q5 NjFiZDI1YzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMjAtMDMtMzAgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgS25vd24gYXBwLWJv dW5kIGRvbWFpbiBwcm90b2NvbHMgc2hvdWxkIG5vdCBjaGVjayB0aGUgYXBwLWJvdW5kIGRvbWFp biBsaXN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MDk3NTUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYwODc1Mzc2PiAKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGNoZWNrcyBpZiBh IHVybCBzaG91bGQgYmUgdHJlYXRlZCBhcyBhcHAtYm91bmQgYmFzZWQgb24KKyAgICAgICAgcHJv dG9jb2wgYmVmb3JlIGRlY2lkaW5nIHRvIGNoZWNrIHRoZSBhcHAtYm91bmQgZG9tYWluIGxpc3Qu CisgICAgICAgIEl0IGlzIHdhc3RlZnVsIHRvIGNoZWNrIHRoZSBhcHAtYm91bmQgZG9tYWluIGxp c3Qgd2hlbiBzb21lIHByb3RvY29scworICAgICAgICBhcmUgYXV0b21hdGljYWxseSBjb25zaWRl cmVkIGFwcC1ib3VuZC4KKworICAgICAgICBFeGlzdGluZyBiZWhhdmlvciBzaG91bGQgYmUgbWFp bnRhaW5lZCwgdGhpcyBpcyB0ZXN0ZWQgYnkgZXhpc3RpbmcKKyAgICAgICAgSW4tQXBwIEJyb3dz ZXIgUHJpdmFjeSBsYXlvdXQgYW5kIEFQSSB0ZXN0cy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnNldElzTmF2 aWdhdGluZ1RvQXBwQm91bmREb21haW4pOgorICAgICAgICAoV2ViS2l0OjpzaG91bGRCZVRyZWF0 ZWRBc0FwcEJvdW5kKTogRGVsZXRlZC4KKyAgICAgICAgV2UgY2FuIHJlbW92ZSB0aGUgY2hlY2sg Zm9yIHRoZSB1cmwgcHJvdG9jb2wgaGVyZSBiZWNhdXNlIHdlIGFyZQorICAgICAgICBkb2luZyBp dCBpbnN0ZWFkIGluIFdlYnNpdGVEYXRhU3RvcmU6OmJlZ2luQXBwQm91bmREb21haW5DaGVjay4K KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9u QWN0aW9uKToKKyAgICAgICAgQ2hhbmdlZCBpZiBQTEFURk9STShDT0NPQSkgdG8gaWYgUExBVEZP Uk0oSU9TX0ZBTUlMWSkgYmVjYXVzZSBpdAorICAgICAgICBpcyB1bm5lY2Vzc2FyeSB0byBjaGVj ayB0aGUgYXBwLWJvdW5kIGRvbWFpbiBsaXN0IGZvciBvdGhlcgorICAgICAgICBwbGF0Zm9ybXMg KHRoZSB2YWx1ZXMgcmV0dXJuZWQgd291bGQgYmUgaWdub3JlZCBpbgorICAgICAgICBzZXRJc05h dmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRl RGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OnNo b3VsZFRyZWF0VVJMUHJvdG9jb2xBc0FwcEJvdW5kKToKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0 ZURhdGFTdG9yZTo6YmVnaW5BcHBCb3VuZERvbWFpbkNoZWNrKToKKyAgICAgICAgKiBVSVByb2Nl c3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oOgorCiAyMDIwLTAzLTMwICBXZW5zb24g SHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFttYWNPU10gRGF0YWxp c3QgZHJvcGRvd24gc3VnZ2VzdGlvbnMgdGFibGUgY2FuIGJlIHNjcm9sbGVkIHRvbyBmYXIKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IGE5OWVhODIwOTk4OWQ5 NDk4OWRhODFjMmFjMzhiYmZjMWI4NDY3ZTUuLjIxODFkNDgwMzI4NTgzM2ZlYmQ1ZTYwODJiMWQ2 ZWZmYmQyOGJmZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApA QCAtMzEyNSwxMyArMzEyNSw2IEBAIHByaXZhdGU6CiAgICAgUG9saWN5Q2hlY2tJZGVudGlmaWVy IG1faWRlbnRpZmllcjsKIH07CiAKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotc3RhdGljIGJv b2wgc2hvdWxkQmVUcmVhdGVkQXNBcHBCb3VuZChjb25zdCBVUkwmIHJlcXVlc3RVUkwpCi17Ci0g ICAgcmV0dXJuIHJlcXVlc3RVUkwucHJvdG9jb2xJc0Fib3V0KCkgfHwgcmVxdWVzdFVSTC5wcm90 b2NvbElzRGF0YSgpIHx8IHJlcXVlc3RVUkwucHJvdG9jb2xJc0Jsb2IoKSB8fCByZXF1ZXN0VVJM LmlzTG9jYWxGaWxlKCk7Ci19Ci0jZW5kaWYKLQogdm9pZCBXZWJQYWdlUHJveHk6OnNldElzTmF2 aWdhdGluZ1RvQXBwQm91bmREb21haW4oYm9vbCBpc01haW5GcmFtZSwgY29uc3QgVVJMJiByZXF1 ZXN0VVJMLCBOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbiBpc05hdmlnYXRpbmdUb0FwcEJvdW5k RG9tYWluKQogewogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCkBAIC0zMTM5LDkgKzMxMzIsNiBA QCB2b2lkIFdlYlBhZ2VQcm94eTo6c2V0SXNOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbihib29s IGlzTWFpbkZyYW1lLCBjb25zdCBVUkwmCiAgICAgICAgIGlmIChtX2lnbm9yZXNBcHBCb3VuZERv bWFpbnMpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIFdFQl9QQUdFX1BST1hZX0FERElU SU9OU19TRVRJU05BVklHQVRJTkdUT0FQUEJPVU5ERE9NQUlOCi0gICAgICAgIGlmIChpc05hdmln YXRpbmdUb0FwcEJvdW5kRG9tYWluID09IE5hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluOjpObyAm JiBzaG91bGRCZVRyZWF0ZWRBc0FwcEJvdW5kKHJlcXVlc3RVUkwpKQotICAgICAgICAgICAgaXNO YXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbiA9IE5hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluOjpZ ZXM7Ci0KICAgICAgICAgaWYgKGlzTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW4gPT0gTmF2aWdh dGluZ1RvQXBwQm91bmREb21haW46Ok5vKSB7CiAgICAgICAgICAgICBtX2NvbmZpZ3VyYXRpb24t PnNldFdlYlZpZXdDYXRlZ29yeShXZWJWaWV3Q2F0ZWdvcnk6OkluQXBwQnJvd3Nlcik7CiAgICAg ICAgICAgICBtX2lzTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW4gPSBOYXZpZ2F0aW5nVG9BcHBC b3VuZERvbWFpbjo6Tm87CkBAIC01MTE1LDcgKzUxMDUsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6 ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHBy b2NlcwogICAgICAgICBzaG91bGRFeHBlY3RTYWZlQnJvd3NpbmdSZXN1bHQgPSBTaG91bGRFeHBl Y3RTYWZlQnJvd3NpbmdSZXN1bHQ6Ok5vOwogCiAgICAgU2hvdWxkRXhwZWN0QXBwQm91bmREb21h aW5SZXN1bHQgc2hvdWxkRXhwZWN0QXBwQm91bmREb21haW5SZXN1bHQgPSBTaG91bGRFeHBlY3RB cHBCb3VuZERvbWFpblJlc3VsdDo6Tm87Ci0jaWYgUExBVEZPUk0oQ09DT0EpCisjaWYgUExBVEZP Uk0oSU9TX0ZBTUlMWSkKICAgICBzaG91bGRFeHBlY3RBcHBCb3VuZERvbWFpblJlc3VsdCA9IFNo b3VsZEV4cGVjdEFwcEJvdW5kRG9tYWluUmVzdWx0OjpZZXM7CiAjZW5kaWYKICAgICAKQEAgLTUx NzMsOCArNTE2Myw4IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0 aW9uQWN0aW9uKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJvY2VzCiAgICAgfSwgc2hvdWxkRXhw ZWN0U2FmZUJyb3dzaW5nUmVzdWx0LCBzaG91bGRFeHBlY3RBcHBCb3VuZERvbWFpblJlc3VsdCkp OwogICAgIGlmIChzaG91bGRFeHBlY3RTYWZlQnJvd3NpbmdSZXN1bHQgPT0gU2hvdWxkRXhwZWN0 U2FmZUJyb3dzaW5nUmVzdWx0OjpZZXMpCiAgICAgICAgIGJlZ2luU2FmZUJyb3dzaW5nQ2hlY2so cmVxdWVzdC51cmwoKSwgZnJhbWUuaXNNYWluRnJhbWUoKSwgbGlzdGVuZXIpOwotI2lmIFBMQVRG T1JNKENPQ09BKQotICAgIG1fd2Vic2l0ZURhdGFTdG9yZS0+YmVnaW5BcHBCb3VuZERvbWFpbkNo ZWNrKFJlZ2lzdHJhYmxlRG9tYWluIHsgcmVxdWVzdC51cmwoKSB9LCBsaXN0ZW5lcik7CisjaWYg UExBVEZPUk0oSU9TX0ZBTUlMWSkKKyAgICBtX3dlYnNpdGVEYXRhU3RvcmUtPmJlZ2luQXBwQm91 bmREb21haW5DaGVjayhyZXF1ZXN0LnVybCgpLCBsaXN0ZW5lcik7CiAjZW5kaWYKICAgICBBUEk6 Ok5hdmlnYXRpb24qIG1haW5GcmFtZU5hdmlnYXRpb24gPSBmcmFtZS5pc01haW5GcmFtZSgpID8g bmF2aWdhdGlvbi5nZXQoKSA6IG51bGxwdHI7CiAgICAgV2ViRnJhbWVQcm94eSogb3JpZ2luYXRp bmdGcmFtZSA9IG9yaWdpbmF0aW5nRnJhbWVJbmZvRGF0YS5mcmFtZUlEID8gcHJvY2Vzcy0+d2Vi RnJhbWUoKm9yaWdpbmF0aW5nRnJhbWVJbmZvRGF0YS5mcmFtZUlEKSA6IG51bGxwdHI7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9Db2NvYS9XZWJzaXRl RGF0YVN0b3JlQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9D b2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0KaW5kZXggNjUyZjQ3ZTA4ODdmOGM3OGNiNTgy ODAzNjBkMzM1MjcwY2M1OWI4Yy4uMDE2ZDEyYzkwMWEwOGY2NWFmZWUwYmZjZGE2YWI3ZDBjOWUy ODMwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29j b2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYnNpdGVEYXRhL0NvY29hL1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbQpAQCAtNTEwLDExICs1 MTAsMjEgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjplbnN1cmVBcHBCb3VuZERvbWFpbnMoQ29t cGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBIYXNoU2UKICAgICB9KTsKIH0KIAotdm9pZCBXZWJz aXRlRGF0YVN0b3JlOjpiZWdpbkFwcEJvdW5kRG9tYWluQ2hlY2soV2ViQ29yZTo6UmVnaXN0cmFi bGVEb21haW4mJiBkb21haW4sIFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eSYgbGlzdGVuZXIp CitzdGF0aWMgYm9vbCBzaG91bGRUcmVhdFVSTFByb3RvY29sQXNBcHBCb3VuZChjb25zdCBVUkwm IHJlcXVlc3RVUkwpCit7CisgICAgcmV0dXJuIHJlcXVlc3RVUkwucHJvdG9jb2xJc0Fib3V0KCkg fHwgcmVxdWVzdFVSTC5wcm90b2NvbElzRGF0YSgpIHx8IHJlcXVlc3RVUkwucHJvdG9jb2xJc0Js b2IoKSB8fCByZXF1ZXN0VVJMLmlzTG9jYWxGaWxlKCk7Cit9CisKK3ZvaWQgV2Vic2l0ZURhdGFT dG9yZTo6YmVnaW5BcHBCb3VuZERvbWFpbkNoZWNrKGNvbnN0IFVSTCYgcmVxdWVzdFVSTCwgV2Vi RnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5JiBsaXN0ZW5lcikKIHsKICAgICBBU1NFUlQoUnVuTG9v cDo6aXNNYWluKCkpOwogCi0gICAgZW5zdXJlQXBwQm91bmREb21haW5zKFtkb21haW4gPSBXVEZN b3ZlKGRvbWFpbiksIGxpc3RlbmVyID0gbWFrZVJlZihsaXN0ZW5lcildIChhdXRvJiBkb21haW5z KSBtdXRhYmxlIHsKKyAgICBpZiAoc2hvdWxkVHJlYXRVUkxQcm90b2NvbEFzQXBwQm91bmQocmVx dWVzdFVSTCkpIHsKKyAgICAgICAgbGlzdGVuZXIuZGlkUmVjZWl2ZUFwcEJvdW5kRG9tYWluUmVz dWx0KHRydWUpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgZW5zdXJlQXBwQm91bmRE b21haW5zKFtkb21haW4gPSBXZWJDb3JlOjpSZWdpc3RyYWJsZURvbWFpbihyZXF1ZXN0VVJMKSwg bGlzdGVuZXIgPSBtYWtlUmVmKGxpc3RlbmVyKV0gKGF1dG8mIGRvbWFpbnMpIG11dGFibGUgewog ICAgICAgICBsaXN0ZW5lci0+ZGlkUmVjZWl2ZUFwcEJvdW5kRG9tYWluUmVzdWx0KGRvbWFpbnMu Y29udGFpbnMoZG9tYWluKSk7CiAgICAgfSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmggYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmgKaW5kZXggMTMzNmQ5ZWYx OWQ2ODZhYzc1OWU1MzliNDc0ZmYxOWY3ZmViNmRhYy4uNDUzZDhmMWViN2NiN2Y1N2IwZmNhMTRj MTRkNzQwZDE1YTdkMjk4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi c2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaApAQCAtMjg1LDcgKzI4NSw3IEBAIHB1Ymxp YzoKICAgICB2b2lkIGhhc0FwcEJvdW5kU2Vzc2lvbihDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJv b2wpPiYmKSBjb25zdDsKICAgICB2b2lkIHNldEluQXBwQnJvd3NlclByaXZhY3lFbmFibGVkKGJv b2wgZW5hYmxlZCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsKIAotICAgIHZvaWQgYmVn aW5BcHBCb3VuZERvbWFpbkNoZWNrKFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWluJiYsIFdlYkZy YW1lUG9saWN5TGlzdGVuZXJQcm94eSYpOworICAgIHZvaWQgYmVnaW5BcHBCb3VuZERvbWFpbkNo ZWNrKGNvbnN0IFVSTCYsIFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eSYpOwogICAgIHZvaWQg YXBwQm91bmREb21haW5zRm9yVGVzdGluZyhDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IEhh c2hTZXQ8V2ViQ29yZTo6UmVnaXN0cmFibGVEb21haW4+Jik+JiYpIGNvbnN0OwogICAgIHZvaWQg ZW5zdXJlQXBwQm91bmREb21haW5zKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgSGFzaFNl dDxXZWJDb3JlOjpSZWdpc3RyYWJsZURvbWFpbj4mKT4mJikgY29uc3Q7CiAgICAgdm9pZCByZWlu aXRpYWxpemVBcHBCb3VuZERvbWFpbnMoKTsK