199917 2019-07-18 14:53:08 -0700 Add SPI _WKProcessPoolConfiguration.javaScriptConfigurationDirectory 2019-07-22 11:12:44 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen commit-queue msaboff sam webkit-bug-importer oldest_to_newest 1554037 0 achristensen 2019-07-18 14:53:08 -0700 Add SPI _WKWebsiteDataStoreConfiguration.javaScriptConfigurationDirectory 1554038 1 374419 achristensen 2019-07-18 14:55:11 -0700 Created attachment 374419 Patch 1554056 2 374423 achristensen 2019-07-18 15:57:17 -0700 Created attachment 374423 Patch 1554071 3 sam 2019-07-18 16:33:13 -0700 Is it currently possible to have two WKWebView's with different WKWebSiteDataStores using the same WebProcess? If so, does this work in that case? 1554072 4 achristensen 2019-07-18 16:34:57 -0700 I don't think it's possible any more, but even if it is, this is only used for some internal engineers so I don't think this SPI is a big deal. 1554074 5 achristensen 2019-07-18 16:37:11 -0700 (I'm trying to keep the status quo as much as possible while giving a client the ability to move away from WKContextCreateWithInjectedBundlePath) 1554196 6 sam 2019-07-19 07:20:13 -0700 (In reply to Alex Christensen from comment #4) > I don't think it's possible any more, but even if it is, this is only used > for some internal engineers so I don't think this SPI is a big deal. Hm. Seems like it should be possible. What happens if you have a process pool created with _WKProcessPoolConfiguration.usesSingleWebProcess = YES, and then have two WKWebViews. Would it be acceptable to the client to have this be true for all processes in a process pool? If so, can it be moved to _WKProcessPoolConfiguration? Or would that break service workers? Either way, seems worth testing what happens in the shared web process case. 1554220 7 achristensen 2019-07-19 08:54:59 -0700 Those are existing problems. I agree that this SPI isn't in the perfect place, but that's not the problem I'm trying to solve right now. Right now I'm trying to solve the problem that we can't migrate from WKContextCreateWithInjectedBundlePath. I'm trying to make that transition as close to no change as possible to minimize risk of regressions when making the switch. Once the switch has been made, we can move the location of this SPI in a smaller, easier-to-review patch. I will add a FIXME comment indicating my intent. 1554230 8 374470 achristensen 2019-07-19 09:42:55 -0700 Created attachment 374470 Patch 1554239 9 sam 2019-07-19 10:15:38 -0700 (In reply to Alex Christensen from comment #7) > Those are existing problems. I agree that this SPI isn't in the perfect > place, but that's not the problem I'm trying to solve right now. Right now > I'm trying to solve the problem that we can't migrate from > WKContextCreateWithInjectedBundlePath. I'm trying to make that transition as > close to no change as possible to minimize risk of regressions when making > the switch. Once the switch has been made, we can move the location of this > SPI in a smaller, easier-to-review patch. I will add a FIXME comment > indicating my intent. Given this is SPI you don't want anyone to use except the clients you are trying to move off the C SPI, I suggest giving it a name that explains that and putting the FIXME comment in the SPI header. That said, if you are going to ask the clients to move to another SPI in the future, it might make sense to make the change now, so they only have to make the change once. That said, I still think you should be testing the shared web process case. 1554408 10 374526 achristensen 2019-07-19 17:11:00 -0700 Created attachment 374526 Patch 1554409 11 achristensen 2019-07-19 17:11:37 -0700 I moved the SPI to _WKProcessPoolConfiguration. Now the shared web process case is not relevant. 1554715 12 achristensen 2019-07-22 10:19:52 -0700 http://trac.webkit.org/r247685 1554718 13 webkit-bug-importer 2019-07-22 10:24:46 -0700 <rdar://problem/53403898> 1554736 14 achristensen 2019-07-22 11:12:44 -0700 All the tests were looking for (and not finding) the default JSC config file until http://trac.webkit.org/r247689 374419 2019-07-18 14:55:11 -0700 2019-07-18 15:57:16 -0700 Patch bug-199917-20190718145510.patch text/plain 6955 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDc1NjcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE5LTA3LTE4ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIFNQSSBfV0tX ZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5qYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVj dG9yeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5 OTE3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhp cyBpcyBhIHN0ZXAgdG93YXJkcyByZW1vdmluZyBXZWJzaXRlRGF0YVN0b3JlOjpsZWdhY3lEZWZh dWx0RGF0YVN0b3JlQ29uZmlndXJhdGlvbgorICAgICAgICBUaGUgZnVuY3Rpb25hbGl0eSBpcyBj b3ZlcmVkIGJ5IGEgdW5pdCB0ZXN0LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYnNpdGVEYXRhU3RvcmUubW06CisgICAgICAgICgtW1dLV2Vic2l0ZURhdGFTdG9yZSBfaW5p dFdpdGhDb25maWd1cmF0aW9uOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvX1dL V2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L0NvY29hL19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLm1tOgorICAgICAgICAoLVtf V0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiBqYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRp cmVjdG9yeV0pOgorICAgICAgICAoLVtfV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiBz ZXRKYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9yeTpdKToKKwogMjAxOS0wNy0xOCAgQWxl eCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIE1vdmUg TmV0d29ya0NhY2hlIG93bmVyc2hpcCBmcm9tIE5ldHdvcmtQcm9jZXNzIHRvIE5ldHdvcmtTZXNz aW9uCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0 YVN0b3JlLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYnNpdGVEYXRhU3RvcmUubW0JKHJldmlzaW9uIDI0NzU2NykKKysrIFNvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0JKHdvcmtpbmcgY29w eSkKQEAgLTI2MSw2ICsyNjEsOCBAQCAtIChpbnN0YW5jZXR5cGUpX2luaXRXaXRoQ29uZmlndXJh dGlvbjooCiAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCFjb25maWd1cmF0aW9uLm5ldHdvcmtDYWNo ZURpcmVjdG9yeSk7CiAgICAgfQogCisgICAgaWYgKGNvbmZpZ3VyYXRpb24uamF2YVNjcmlwdENv bmZpZ3VyYXRpb25EaXJlY3RvcnkpCisgICAgICAgIGNvbmZpZy0+c2V0SmF2YVNjcmlwdENvbmZp Z3VyYXRpb25EaXJlY3RvcnkoY29uZmlndXJhdGlvbi5qYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRp cmVjdG9yeS5wYXRoKTsKICAgICBpZiAoY29uZmlndXJhdGlvbi5zb3VyY2VBcHBsaWNhdGlvbkJ1 bmRsZUlkZW50aWZpZXIpCiAgICAgICAgIGNvbmZpZy0+c2V0U291cmNlQXBwbGljYXRpb25CdW5k bGVJZGVudGlmaWVyKGNvbmZpZ3VyYXRpb24uc291cmNlQXBwbGljYXRpb25CdW5kbGVJZGVudGlm aWVyKTsKICAgICBpZiAoY29uZmlndXJhdGlvbi5zb3VyY2VBcHBsaWNhdGlvblNlY29uZGFyeUlk ZW50aWZpZXIpCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vi c2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaAko cmV2aXNpb24gMjQ3NTY3KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19X S1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTU0LDYg KzU0LDcgQEAgV0tfQ0xBU1NfQVZBSUxBQkxFKG1hY29zKDEwLjEzKSwgaW9zKDExLgogQHByb3Bl cnR5IChub25hdG9taWMsIGNvcHksIHNldHRlcj1fc2V0Q2FjaGVTdG9yYWdlRGlyZWN0b3J5Oikg TlNVUkwgKl9jYWNoZVN0b3JhZ2VEaXJlY3RvcnkgV0tfQVBJX0FWQUlMQUJMRShtYWNvcygxMC4x My40KSwgaW9zKDExLjMpKTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBjb3B5LCBzZXR0ZXI9X3Nl dFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3Rvcnk6KSBOU1VSTCAqX3NlcnZpY2VXb3Jr ZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkgV0tfQVBJX0FWQUlMQUJMRShtYWNvcygxMC4xMy40KSwg aW9zKDExLjMpKTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxsYWJsZSwgY29weSkgTlNVUkwg Km5ldHdvcmtDYWNoZURpcmVjdG9yeSBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEp LCBpb3MoV0tfSU9TX1RCQSkpOworQHByb3BlcnR5IChub25hdG9taWMsIG51bGxhYmxlLCBjb3B5 KSBOU1VSTCAqamF2YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJlY3RvcnkgV0tfQVBJX0FWQUlMQUJM RShtYWNvcyhXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKIAogLy8gVGVzdGluZyBvbmx5 LgogQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgYWxsTG9hZHNCbG9ja2VkQnlEZXZpY2VNYW5h Z2VtZW50UmVzdHJpY3Rpb25zRm9yVGVzdGluZyBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01B Q19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLm1tCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3Jl Q29uZmlndXJhdGlvbi5tbQkocmV2aXNpb24gMjQ3NTY3KQorKysgU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLm1tCSh3b3Jr aW5nIGNvcHkpCkBAIC0yMTAsNiArMjEwLDE3IEBAIC0gKHZvaWQpc2V0U291cmNlQXBwbGljYXRp b25TZWNvbmRhcnlJZGUKICAgICBfY29uZmlndXJhdGlvbi0+c2V0U291cmNlQXBwbGljYXRpb25T ZWNvbmRhcnlJZGVudGlmaWVyKGlkZW50aWZpZXIpOwogfQogCistIChOU1VSTCAqKWphdmFTY3Jp cHRDb25maWd1cmF0aW9uRGlyZWN0b3J5Cit7CisgICAgcmV0dXJuIFtOU1VSTCBmaWxlVVJMV2l0 aFBhdGg6X2NvbmZpZ3VyYXRpb24tPmphdmFTY3JpcHRDb25maWd1cmF0aW9uRGlyZWN0b3J5KCkg aXNEaXJlY3Rvcnk6WUVTXTsKK30KKworLSAodm9pZClzZXRKYXZhU2NyaXB0Q29uZmlndXJhdGlv bkRpcmVjdG9yeTooTlNVUkwgKil1cmwKK3sKKyAgICBjaGVja1VSTEFyZ3VtZW50KHVybCk7Cisg ICAgX2NvbmZpZ3VyYXRpb24tPnNldEphdmFTY3JpcHRDb25maWd1cmF0aW9uRGlyZWN0b3J5KHVy bC5wYXRoKTsKK30KKwogLSAoQk9PTClkZXZpY2VNYW5hZ2VtZW50UmVzdHJpY3Rpb25zRW5hYmxl ZAogewogICAgIHJldHVybiBfY29uZmlndXJhdGlvbi0+ZGV2aWNlTWFuYWdlbWVudFJlc3RyaWN0 aW9uc0VuYWJsZWQoKTsKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0NzYyMCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE5LTA3LTE4ICBBbGV4IENocmlzdGVuc2VuICA8 YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIFNQSSBfV0tXZWJzaXRlRGF0 YVN0b3JlQ29uZmlndXJhdGlvbi5qYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9yeQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5OTE3CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbToKKyAg ICAgICAgKFRFU1QpOgorCiAyMDE5LTA3LTE4ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFw cGxlLmNvbT4KIAogICAgICAgICBbZXdzLWJ1aWxkXSBBZGQgYnVpbGQgc3RlcCB0byBBbmFseXpl TGF5b3V0VGVzdHNSZXN1bHRzCkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dENvY29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21Q YXRocy5tbQkocmV2aXNpb24gMjQ3NTY3KQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9XZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMubW0JKHdvcmtpbmcgY29weSkK QEAgLTU1NCwzICs1NTQsNDEgQEAgVEVTVChXZWJLaXQsIE5ldHdvcmtDYWNoZURpcmVjdG9yeSkK ICAgICBbZmlsZU1hbmFnZXIgcmVtb3ZlSXRlbUF0UGF0aDpwYXRoIGVycm9yOiZlcnJvcl07CiAg ICAgRVhQRUNUX0ZBTFNFKGVycm9yKTsKIH0KKworVEVTVChXZWJLaXQsIEphdmFTY3JpcHRDb25m aWd1cmF0aW9uKQoreworICAgIE5TRmlsZU1hbmFnZXIgKmZpbGVNYW5hZ2VyID0gW05TRmlsZU1h bmFnZXIgZGVmYXVsdE1hbmFnZXJdOworICAgIE5TVVJMICp0ZW1wRGlyID0gW05TVVJMIGZpbGVV UkxXaXRoUGF0aDpbTlNUZW1wb3JhcnlEaXJlY3RvcnkoKSBzdHJpbmdCeUFwcGVuZGluZ1BhdGhD b21wb25lbnQ6QCJDdXN0b21QYXRoc1Rlc3QiXSBpc0RpcmVjdG9yeTpZRVNdOworICAgIE5TRXJy b3IgKmVycm9yID0gbmlsOworICAgIEJPT0wgc3VjY2VzcyA9IFtmaWxlTWFuYWdlciBjcmVhdGVE aXJlY3RvcnlBdFVSTDp0ZW1wRGlyIHdpdGhJbnRlcm1lZGlhdGVEaXJlY3RvcmllczpZRVMgYXR0 cmlidXRlczpuaWwgZXJyb3I6JmVycm9yXTsKKyAgICBFWFBFQ1RfVFJVRShzdWNjZXNzKTsKKyAg ICBFWFBFQ1RfRkFMU0UoZXJyb3IpOworCisgICAgTlNEYXRhICpjb250ZW50cyA9IFtAIiIKKyAg ICAicHJvY2Vzc05hbWUgPX4gL1dlYkNvbnRlbnQvIHtcbiIKKyAgICAgICAgImxvZ0ZpbGUgPSBc IkxvZy50eHRcIlxuIgorICAgICAgICAianNjT3B0aW9ucyB7XG4iCisgICAgICAgICAgICAiZHVt cE9wdGlvbnMgPSAxXG4iCisgICAgICAgICAgICAiZHVtcERGR0Rpc2Fzc2VtYmx5ID0gdHJ1ZVxu IgorICAgICAgICAifVxuIgorICAgICJ9IgorICAgICIiIGRhdGFVc2luZ0VuY29kaW5nOk5TVVRG OFN0cmluZ0VuY29kaW5nXTsKKyAgICBCT09MIHJlc3VsdCA9IFtjb250ZW50cyB3cml0ZVRvVVJM Olt0ZW1wRGlyIFVSTEJ5QXBwZW5kaW5nUGF0aENvbXBvbmVudDpAIkpTQy5jb25maWciXSBhdG9t aWNhbGx5OllFU107CisgICAgRVhQRUNUX1RSVUUocmVzdWx0KTsKKworICAgIGF1dG8gd2Vic2l0 ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbX1dLV2Vic2l0ZURhdGFTdG9yZUNv bmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBbd2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3Vy YXRpb24gc2V0SmF2YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJlY3Rvcnk6dGVtcERpcl07CisgICAg YXV0byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0 aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXdDb25maWd1cmF0aW9uIHNldFdlYnNpdGVE YXRhU3RvcmU6W1tbV0tXZWJzaXRlRGF0YVN0b3JlIGFsbG9jXSBfaW5pdFdpdGhDb25maWd1cmF0 aW9uOndlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLmdldCgpXSBhdXRvcmVsZWFzZV1dOwor ICAgIAorICAgIFdLQ29udGV4dFNldEphdmFTY3JpcHRDb25maWd1cmF0aW9uRmlsZUVuYWJsZWQo KFdLQ29udGV4dFJlZilbd2ViVmlld0NvbmZpZ3VyYXRpb24gcHJvY2Vzc1Bvb2xdLCB0cnVlKTsK KyAgICAKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0 V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246d2ViVmll d0NvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAgICBbd2ViVmlldyBsb2FkSFRNTFN0cmluZzpAIjxo dG1sPmhlbGxvPC9odG1sPiIgYmFzZVVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImh0dHBzOi8v d2Via2l0Lm9yZy8iXV07CisgICAgCisgICAgTlNTdHJpbmcgKnBhdGggPSBbdGVtcERpciBVUkxC eUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6QCJMb2cudHh0Il0ucGF0aDsKKyAgICB3aGlsZSAoIVtm aWxlTWFuYWdlciBmaWxlRXhpc3RzQXRQYXRoOnBhdGhdKQorICAgICAgICBUZXN0V2ViS2l0QVBJ OjpVdGlsOjpzcGluUnVuTG9vcCgpOworICAgIFtmaWxlTWFuYWdlciByZW1vdmVJdGVtQXRQYXRo OnRlbXBEaXIucGF0aCBlcnJvcjomZXJyb3JdOworICAgIEVYUEVDVF9GQUxTRShlcnJvcik7Cit9 Cg== 374423 2019-07-18 15:57:17 -0700 2019-07-19 09:42:53 -0700 Patch bug-199917-20190718155717.patch text/plain 8586 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDc1NjcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE5LTA3LTE4ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIFNQSSBfV0tX ZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5qYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVj dG9yeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5 OTE3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhp cyBpcyBhIHN0ZXAgdG93YXJkcyByZW1vdmluZyBXZWJzaXRlRGF0YVN0b3JlOjpsZWdhY3lEZWZh dWx0RGF0YVN0b3JlQ29uZmlndXJhdGlvbgorICAgICAgICBUaGUgZnVuY3Rpb25hbGl0eSBpcyBj b3ZlcmVkIGJ5IGEgdW5pdCB0ZXN0LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYnNpdGVEYXRhU3RvcmUubW06CisgICAgICAgICgtW1dLV2Vic2l0ZURhdGFTdG9yZSBfaW5p dFdpdGhDb25maWd1cmF0aW9uOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvX1dL V2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L0NvY29hL19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLm1tOgorICAgICAgICAoLVtf V0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiBqYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRp cmVjdG9yeV0pOgorICAgICAgICAoLVtfV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiBz ZXRKYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9yeTpdKToKKwogMjAxOS0wNy0xOCAgQWxl eCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIE1vdmUg TmV0d29ya0NhY2hlIG93bmVyc2hpcCBmcm9tIE5ldHdvcmtQcm9jZXNzIHRvIE5ldHdvcmtTZXNz aW9uCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcm9jZXNzUG9v bC5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQ cm9jZXNzUG9vbC5tbQkocmV2aXNpb24gMjQ3NTY2KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0NvY29hL1dLUHJvY2Vzc1Bvb2wubW0JKHdvcmtpbmcgY29weSkKQEAgLTQyMCw2ICs0 MjAsMTYgQEAgLSAodm9pZClfY2xlYXJTdXBwb3J0ZWRQbHVnaW5zCiAgICAgX3Byb2Nlc3NQb29s LT5jbGVhclN1cHBvcnRlZFBsdWdpbnMoKTsKIH0KIAorLSAoQk9PTClfamF2YVNjcmlwdENvbmZp Z3VyYXRpb25GaWxlRW5hYmxlZAoreworICAgIHJldHVybiBfcHJvY2Vzc1Bvb2wtPmphdmFTY3Jp cHRDb25maWd1cmF0aW9uRmlsZUVuYWJsZWQoKTsKK30KKworLSAodm9pZClfc2V0SmF2YVNjcmlw dENvbmZpZ3VyYXRpb25GaWxlRW5hYmxlZDooQk9PTCllbmFibGVkCit7CisgICAgX3Byb2Nlc3NQ b29sLT5zZXRKYXZhU2NyaXB0Q29uZmlndXJhdGlvbkZpbGVFbmFibGVkKGVuYWJsZWQpOworfQor CiAtICh2b2lkKV90ZXJtaW5hdGVOZXR3b3JrUHJvY2VzcwogewogICAgIF9wcm9jZXNzUG9vbC0+ dGVybWluYXRlTmV0d29ya1Byb2Nlc3MoKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1Byb2Nlc3NQb29sUHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1Byb2Nlc3NQb29sUHJpdmF0ZS5oCShyZXZpc2lv biAyNDc1NjYpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcm9jZXNz UG9vbFByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtNzAsNiArNzAsOCBAQAogKyAoTlNVUkwg Kilfd2Vic2l0ZURhdGFVUkxGb3JDb250YWluZXJXaXRoVVJMOihOU1VSTCAqKWNvbnRhaW5lclVS TDsKICsgKE5TVVJMICopX3dlYnNpdGVEYXRhVVJMRm9yQ29udGFpbmVyV2l0aFVSTDooTlNVUkwg Kiljb250YWluZXJVUkwgYnVuZGxlSWRlbnRpZmllcklmTm90SW5Db250YWluZXI6KE5TU3RyaW5n ICopYnVuZGxlSWRlbnRpZmllcjsKIAorQHByb3BlcnR5IChub25hdG9taWMsIHNldHRlcj1fc2V0 SmF2YVNjcmlwdENvbmZpZ3VyYXRpb25GaWxlRW5hYmxlZDopIEJPT0wgX2phdmFTY3JpcHRDb25m aWd1cmF0aW9uRmlsZUVuYWJsZWQgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwg aW9zKFdLX0lPU19UQkEpKTsKKwogLSAodm9pZClfd2FybUluaXRpYWxQcm9jZXNzIFdLX0FQSV9B VkFJTEFCTEUobWFjb3MoMTAuMTIpLCBpb3MoMTAuMCkpOwogLSAodm9pZClfYXV0b21hdGlvbkNh cGFiaWxpdGllc0RpZENoYW5nZSBXS19BUElfQVZBSUxBQkxFKG1hY29zKDEwLjEyKSwgaW9zKDEw LjApKTsKIC0gKHZvaWQpX3NldEF1dG9tYXRpb25TZXNzaW9uOihfV0tBdXRvbWF0aW9uU2Vzc2lv biAqKWF1dG9tYXRpb25TZXNzaW9uIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTAuMTIpLCBpb3Mo MTAuMCkpOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0 ZURhdGFTdG9yZS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Q29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tCShyZXZpc2lvbiAyNDc1NjcpCisrKyBTb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tCSh3b3JraW5n IGNvcHkpCkBAIC0yNjEsNiArMjYxLDggQEAgLSAoaW5zdGFuY2V0eXBlKV9pbml0V2l0aENvbmZp Z3VyYXRpb246KAogICAgICAgICBSRUxFQVNFX0FTU0VSVCghY29uZmlndXJhdGlvbi5uZXR3b3Jr Q2FjaGVEaXJlY3RvcnkpOwogICAgIH0KIAorICAgIGlmIChjb25maWd1cmF0aW9uLmphdmFTY3Jp cHRDb25maWd1cmF0aW9uRGlyZWN0b3J5KQorICAgICAgICBjb25maWctPnNldEphdmFTY3JpcHRD b25maWd1cmF0aW9uRGlyZWN0b3J5KGNvbmZpZ3VyYXRpb24uamF2YVNjcmlwdENvbmZpZ3VyYXRp b25EaXJlY3RvcnkucGF0aCk7CiAgICAgaWYgKGNvbmZpZ3VyYXRpb24uc291cmNlQXBwbGljYXRp b25CdW5kbGVJZGVudGlmaWVyKQogICAgICAgICBjb25maWctPnNldFNvdXJjZUFwcGxpY2F0aW9u QnVuZGxlSWRlbnRpZmllcihjb25maWd1cmF0aW9uLnNvdXJjZUFwcGxpY2F0aW9uQnVuZGxlSWRl bnRpZmllcik7CiAgICAgaWYgKGNvbmZpZ3VyYXRpb24uc291cmNlQXBwbGljYXRpb25TZWNvbmRh cnlJZGVudGlmaWVyKQpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19X S1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9u LmgJKHJldmlzaW9uIDI0NzU2NykKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC01 NCw2ICs1NCw3IEBAIFdLX0NMQVNTX0FWQUlMQUJMRShtYWNvcygxMC4xMyksIGlvcygxMS4KIEBw cm9wZXJ0eSAobm9uYXRvbWljLCBjb3B5LCBzZXR0ZXI9X3NldENhY2hlU3RvcmFnZURpcmVjdG9y eTopIE5TVVJMICpfY2FjaGVTdG9yYWdlRGlyZWN0b3J5IFdLX0FQSV9BVkFJTEFCTEUobWFjb3Mo MTAuMTMuNCksIGlvcygxMS4zKSk7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgY29weSwgc2V0dGVy PV9zZXRTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5OikgTlNVUkwgKl9zZXJ2aWNl V29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5IFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTAuMTMu NCksIGlvcygxMS4zKSk7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgbnVsbGFibGUsIGNvcHkpIE5T VVJMICpuZXR3b3JrQ2FjaGVEaXJlY3RvcnkgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNf VEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxsYWJsZSwg Y29weSkgTlNVUkwgKmphdmFTY3JpcHRDb25maWd1cmF0aW9uRGlyZWN0b3J5IFdLX0FQSV9BVkFJ TEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CiAKIC8vIFRlc3Rpbmcg b25seS4KIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIGFsbExvYWRzQmxvY2tlZEJ5RGV2aWNl TWFuYWdlbWVudFJlc3RyaWN0aW9uc0ZvclRlc3RpbmcgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhX S19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5tbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFT dG9yZUNvbmZpZ3VyYXRpb24ubW0JKHJldmlzaW9uIDI0NzU2NykKKysrIFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5tbQko d29ya2luZyBjb3B5KQpAQCAtMjEwLDYgKzIxMCwxNyBAQCAtICh2b2lkKXNldFNvdXJjZUFwcGxp Y2F0aW9uU2Vjb25kYXJ5SWRlCiAgICAgX2NvbmZpZ3VyYXRpb24tPnNldFNvdXJjZUFwcGxpY2F0 aW9uU2Vjb25kYXJ5SWRlbnRpZmllcihpZGVudGlmaWVyKTsKIH0KIAorLSAoTlNVUkwgKilqYXZh U2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9yeQoreworICAgIHJldHVybiBbTlNVUkwgZmlsZVVS TFdpdGhQYXRoOl9jb25maWd1cmF0aW9uLT5qYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9y eSgpIGlzRGlyZWN0b3J5OllFU107Cit9CisKKy0gKHZvaWQpc2V0SmF2YVNjcmlwdENvbmZpZ3Vy YXRpb25EaXJlY3Rvcnk6KE5TVVJMICopdXJsCit7CisgICAgY2hlY2tVUkxBcmd1bWVudCh1cmwp OworICAgIF9jb25maWd1cmF0aW9uLT5zZXRKYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9y eSh1cmwucGF0aCk7Cit9CisKIC0gKEJPT0wpZGV2aWNlTWFuYWdlbWVudFJlc3RyaWN0aW9uc0Vu YWJsZWQKIHsKICAgICByZXR1cm4gX2NvbmZpZ3VyYXRpb24tPmRldmljZU1hbmFnZW1lbnRSZXN0 cmljdGlvbnNFbmFibGVkKCk7CkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDc2MjApCisrKyBUb29scy9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxOS0wNy0xOCAgQWxleCBDaHJpc3RlbnNl biAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisgICAgICAgIEFkZCBTUEkgX1dLV2Vic2l0 ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uamF2YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJlY3RvcnkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTkxNwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMubW06 CisgICAgICAgIChURVNUKToKKwogMjAxOS0wNy0xOCAgQWFrYXNoIEphaW4gIDxhYWthc2hfamFp bkBhcHBsZS5jb20+CiAKICAgICAgICAgW2V3cy1idWlsZF0gQWRkIGJ1aWxkIHN0ZXAgdG8gQW5h bHl6ZUxheW91dFRlc3RzUmVzdWx0cwpJbmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9XZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJzaXRlRGF0YVN0b3JlQ3Vz dG9tUGF0aHMubW0JKHJldmlzaW9uIDI0NzU2NykKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1tCSh3b3JraW5nIGNv cHkpCkBAIC01NTQsMyArNTU0LDQxIEBAIFRFU1QoV2ViS2l0LCBOZXR3b3JrQ2FjaGVEaXJlY3Rv cnkpCiAgICAgW2ZpbGVNYW5hZ2VyIHJlbW92ZUl0ZW1BdFBhdGg6cGF0aCBlcnJvcjomZXJyb3Jd OwogICAgIEVYUEVDVF9GQUxTRShlcnJvcik7CiB9CisKK1RFU1QoV2ViS2l0LCBKYXZhU2NyaXB0 Q29uZmlndXJhdGlvbikKK3sKKyAgICBOU0ZpbGVNYW5hZ2VyICpmaWxlTWFuYWdlciA9IFtOU0Zp bGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXTsKKyAgICBOU1VSTCAqdGVtcERpciA9IFtOU1VSTCBm aWxlVVJMV2l0aFBhdGg6W05TVGVtcG9yYXJ5RGlyZWN0b3J5KCkgc3RyaW5nQnlBcHBlbmRpbmdQ YXRoQ29tcG9uZW50OkAiQ3VzdG9tUGF0aHNUZXN0Il0gaXNEaXJlY3Rvcnk6WUVTXTsKKyAgICBO U0Vycm9yICplcnJvciA9IG5pbDsKKyAgICBCT09MIHN1Y2Nlc3MgPSBbZmlsZU1hbmFnZXIgY3Jl YXRlRGlyZWN0b3J5QXRVUkw6dGVtcERpciB3aXRoSW50ZXJtZWRpYXRlRGlyZWN0b3JpZXM6WUVT IGF0dHJpYnV0ZXM6bmlsIGVycm9yOiZlcnJvcl07CisgICAgRVhQRUNUX1RSVUUoc3VjY2Vzcyk7 CisgICAgRVhQRUNUX0ZBTFNFKGVycm9yKTsKKworICAgIE5TRGF0YSAqY29udGVudHMgPSBbQCIi CisgICAgInByb2Nlc3NOYW1lID1+IC9XZWJDb250ZW50LyB7XG4iCisgICAgICAgICJsb2dGaWxl ID0gXCJMb2cudHh0XCJcbiIKKyAgICAgICAgImpzY09wdGlvbnMge1xuIgorICAgICAgICAgICAg ImR1bXBPcHRpb25zID0gMVxuIgorICAgICAgICAgICAgImR1bXBERkdEaXNhc3NlbWJseSA9IHRy dWVcbiIKKyAgICAgICAgIn1cbiIKKyAgICAifSIKKyAgICAiIiBkYXRhVXNpbmdFbmNvZGluZzpO U1VURjhTdHJpbmdFbmNvZGluZ107CisgICAgQk9PTCByZXN1bHQgPSBbY29udGVudHMgd3JpdGVU b1VSTDpbdGVtcERpciBVUkxCeUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6QCJKU0MuY29uZmlnIl0g YXRvbWljYWxseTpZRVNdOworICAgIEVYUEVDVF9UUlVFKHJlc3VsdCk7CisKKyAgICBhdXRvIHdl YnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW19XS1dlYnNpdGVEYXRhU3Rv cmVDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYnNpdGVEYXRhU3RvcmVDb25m aWd1cmF0aW9uIHNldEphdmFTY3JpcHRDb25maWd1cmF0aW9uRGlyZWN0b3J5OnRlbXBEaXJdOwor ICAgIGF1dG8gd2ViVmlld0NvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmln dXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbiBzZXRXZWJz aXRlRGF0YVN0b3JlOltbW1dLV2Vic2l0ZURhdGFTdG9yZSBhbGxvY10gX2luaXRXaXRoQ29uZmln dXJhdGlvbjp3ZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5nZXQoKV0gYXV0b3JlbGVhc2Vd XTsKKyAgICAKKyAgICBbd2ViVmlld0NvbmZpZ3VyYXRpb24gcHJvY2Vzc1Bvb2xdLl9qYXZhU2Ny aXB0Q29uZmlndXJhdGlvbkZpbGVFbmFibGVkID0gWUVTOworICAgIAorICAgIGF1dG8gd2ViVmll dyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgw LCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjp3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQoKV0p OworICAgIFt3ZWJWaWV3IGxvYWRIVE1MU3RyaW5nOkAiPGh0bWw+aGVsbG88L2h0bWw+IiBiYXNl VVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAiaHR0cHM6Ly93ZWJraXQub3JnLyJdXTsKKyAgICAK KyAgICBOU1N0cmluZyAqcGF0aCA9IFt0ZW1wRGlyIFVSTEJ5QXBwZW5kaW5nUGF0aENvbXBvbmVu dDpAIkxvZy50eHQiXS5wYXRoOworICAgIHdoaWxlICghW2ZpbGVNYW5hZ2VyIGZpbGVFeGlzdHNB dFBhdGg6cGF0aF0pCisgICAgICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnNwaW5SdW5Mb29wKCk7 CisgICAgW2ZpbGVNYW5hZ2VyIHJlbW92ZUl0ZW1BdFBhdGg6dGVtcERpci5wYXRoIGVycm9yOiZl cnJvcl07CisgICAgRVhQRUNUX0ZBTFNFKGVycm9yKTsKK30K 374470 2019-07-19 09:42:55 -0700 2019-07-19 17:10:58 -0700 Patch bug-199917-20190719094254.patch text/plain 10111 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3NjQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQzZWU2YzczZGZlNzc3YTE4 NjdjOWY2YWQyNjAwMGUzMDM3OGVmNzQuLmVjOWI2OTYxZWUwNDMxYTNlMTdjNjhkOGI4ZWFmY2Zi YzA2MzgzNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTktMDctMTkgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBBZGQgU1BJIF9X S1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLmphdmFTY3JpcHRDb25maWd1cmF0aW9uRGly ZWN0b3J5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x OTk5MTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIGlzIGEgc3RlcCB0b3dhcmRzIHJlbW92aW5nIFdlYnNpdGVEYXRhU3RvcmU6OmxlZ2FjeURl ZmF1bHREYXRhU3RvcmVDb25maWd1cmF0aW9uCisgICAgICAgIFRoZSBmdW5jdGlvbmFsaXR5IGlz IGNvdmVyZWQgYnkgYSB1bml0IHRlc3QuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29h L1dLV2Vic2l0ZURhdGFTdG9yZS5tbToKKyAgICAgICAgKC1bV0tXZWJzaXRlRGF0YVN0b3JlIF9p bml0V2l0aENvbmZpZ3VyYXRpb246XSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9f V0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24ubW06CisgICAgICAgICgt W19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uIGphdmFTY3JpcHRDb25maWd1cmF0aW9u RGlyZWN0b3J5XSk6CisgICAgICAgICgtW19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9u IHNldEphdmFTY3JpcHRDb25maWd1cmF0aW9uRGlyZWN0b3J5Ol0pOgorCiAyMDE5LTA3LTE4ICBB bGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRml4 IHdhcm5pbmcgd2hlbiBpbXBvcnRpbmcgV2ViS2l0IGluIFN3aWZ0CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcm9jZXNzUG9vbC5tbSBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1Byb2Nlc3NQb29sLm1tCmluZGV4IGNhZTlkNzg5 NmJjOWIxMjNlNGM3YzA2NmE2MzMyMjliMjNiMDNhMTguLjIzOTY3NTcwNTljNmRlODcwODMyMTI1 N2EyNDQxZjI0ZGRhMDc5NzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1Byb2Nlc3NQb29sLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1Byb2Nlc3NQb29sLm1tCkBAIC00MjAsNiArNDIwLDE2IEBAIHN0YXRpYyBOU0Rp Y3Rpb25hcnkgKnBvbGljaWVzSGFzaE1hcFRvRGljdGlvbmFyeShjb25zdCBIYXNoTWFwPFN0cmlu ZywgSGFzaE1hcDxTCiAgICAgX3Byb2Nlc3NQb29sLT5jbGVhclN1cHBvcnRlZFBsdWdpbnMoKTsK IH0KIAorLSAoQk9PTClfamF2YVNjcmlwdENvbmZpZ3VyYXRpb25GaWxlRW5hYmxlZAoreworICAg IHJldHVybiBfcHJvY2Vzc1Bvb2wtPmphdmFTY3JpcHRDb25maWd1cmF0aW9uRmlsZUVuYWJsZWQo KTsKK30KKworLSAodm9pZClfc2V0SmF2YVNjcmlwdENvbmZpZ3VyYXRpb25GaWxlRW5hYmxlZDoo Qk9PTCllbmFibGVkCit7CisgICAgX3Byb2Nlc3NQb29sLT5zZXRKYXZhU2NyaXB0Q29uZmlndXJh dGlvbkZpbGVFbmFibGVkKGVuYWJsZWQpOworfQorCiAtICh2b2lkKV90ZXJtaW5hdGVOZXR3b3Jr UHJvY2VzcwogewogICAgIF9wcm9jZXNzUG9vbC0+dGVybWluYXRlTmV0d29ya1Byb2Nlc3MoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1Byb2Nlc3NQ b29sUHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJvY2Vz c1Bvb2xQcml2YXRlLmgKaW5kZXggY2IxNWEzZTRmNDRkN2EzZThjZGJiYmZlOWJkMWZjMjNmNzY2 ZWNlYi4uM2QwMTA2MTYzMWE3NGRjZTdiMjhlNDlhZGQxN2E3ZjEwZWU5YmI4MSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJvY2Vzc1Bvb2xQcml2YXRl LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJvY2Vzc1Bvb2xQ cml2YXRlLmgKQEAgLTcwLDYgKzcwLDggQEAKICsgKE5TVVJMICopX3dlYnNpdGVEYXRhVVJMRm9y Q29udGFpbmVyV2l0aFVSTDooTlNVUkwgKiljb250YWluZXJVUkw7CiArIChOU1VSTCAqKV93ZWJz aXRlRGF0YVVSTEZvckNvbnRhaW5lcldpdGhVUkw6KE5TVVJMICopY29udGFpbmVyVVJMIGJ1bmRs ZUlkZW50aWZpZXJJZk5vdEluQ29udGFpbmVyOihOU1N0cmluZyAqKWJ1bmRsZUlkZW50aWZpZXI7 CiAKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0ZXI9X3NldEphdmFTY3JpcHRDb25maWd1cmF0 aW9uRmlsZUVuYWJsZWQ6KSBCT09MIF9qYXZhU2NyaXB0Q29uZmlndXJhdGlvbkZpbGVFbmFibGVk IFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CisK IC0gKHZvaWQpX3dhcm1Jbml0aWFsUHJvY2VzcyBXS19BUElfQVZBSUxBQkxFKG1hY29zKDEwLjEy KSwgaW9zKDEwLjApKTsKIC0gKHZvaWQpX2F1dG9tYXRpb25DYXBhYmlsaXRpZXNEaWRDaGFuZ2Ug V0tfQVBJX0FWQUlMQUJMRShtYWNvcygxMC4xMiksIGlvcygxMC4wKSk7CiAtICh2b2lkKV9zZXRB dXRvbWF0aW9uU2Vzc2lvbjooX1dLQXV0b21hdGlvblNlc3Npb24gKilhdXRvbWF0aW9uU2Vzc2lv biBXS19BUElfQVZBSUxBQkxFKG1hY29zKDEwLjEyKSwgaW9zKDEwLjApKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0g Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1t CmluZGV4IDJkMTBhMGI3ZmMwZDU4NTQwOTQzMzQ5ZmQ3YWYyOThjYTAxOWMyNDkuLjU2ZGYxNDA4 MDIwOWIwN2ZiZmY3NTFjMTIyZTgzMzlkOGFjODg4MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0KKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbQpAQCAtMjY0 LDYgKzI2NCw4IEBAIHN0YXRpYyBWZWN0b3I8V2ViS2l0OjpXZWJzaXRlRGF0YVJlY29yZD4gdG9X ZWJzaXRlRGF0YVJlY29yZHMoTlNBcnJheSAqZGF0YVJlY29yCiAgICAgICAgIFJFTEVBU0VfQVNT RVJUKCFjb25maWd1cmF0aW9uLmRldmljZUlkSGFzaFNhbHRzU3RvcmFnZURpcmVjdG9yeSk7CiAg ICAgfQogCisgICAgaWYgKGNvbmZpZ3VyYXRpb24uamF2YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJl Y3RvcnkpCisgICAgICAgIGNvbmZpZy0+c2V0SmF2YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJlY3Rv cnkoY29uZmlndXJhdGlvbi5qYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9yeS5wYXRoKTsK ICAgICBpZiAoY29uZmlndXJhdGlvbi5zb3VyY2VBcHBsaWNhdGlvbkJ1bmRsZUlkZW50aWZpZXIp CiAgICAgICAgIGNvbmZpZy0+c2V0U291cmNlQXBwbGljYXRpb25CdW5kbGVJZGVudGlmaWVyKGNv bmZpZ3VyYXRpb24uc291cmNlQXBwbGljYXRpb25CdW5kbGVJZGVudGlmaWVyKTsKICAgICBpZiAo Y29uZmlndXJhdGlvbi5zb3VyY2VBcHBsaWNhdGlvblNlY29uZGFyeUlkZW50aWZpZXIpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFT dG9yZUNvbmZpZ3VyYXRpb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9f V0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5oCmluZGV4IDBkM2NjNjNjNTk5NDU0NmYw NzI4MzNhZmNhZTg0NWY1NzIwNGE0MWEuLjdjMWRlOWQ2ZDg4MWUwOGMzY2JiOTQwZDg0NGRkZjNi NzQ3M2U3NTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9f V0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5oCkBAIC00 Myw2ICs0Myw3IEBAIFdLX0NMQVNTX0FWQUlMQUJMRShtYWNvcygxMC4xMyksIGlvcygxMS4wKSkK IEBwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxsYWJsZSwgY29weSwgc2V0dGVyPXNldEhUVFBQcm94 eTopIE5TVVJMICpodHRwUHJveHkgV0tfQVBJX0FWQUlMQUJMRShtYWNvcygxMC4xNC40KSwgaW9z KDEyLjIpKTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxsYWJsZSwgY29weSwgc2V0dGVyPXNl dEhUVFBTUHJveHk6KSBOU1VSTCAqaHR0cHNQcm94eSBXS19BUElfQVZBSUxBQkxFKG1hY29zKDEw LjE0LjQpLCBpb3MoMTIuMikpOwogQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgZGV2aWNlTWFu YWdlbWVudFJlc3RyaWN0aW9uc0VuYWJsZWQgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNf VEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxsYWJsZSwg Y29weSkgTlNVUkwgKmphdmFTY3JpcHRDb25maWd1cmF0aW9uRGlyZWN0b3J5IFdLX0FQSV9BVkFJ TEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CiAKIC8vIFRoZXNlIHBy b3BlcnRpZXMgb25seSBtYWtlIHNlbnNlIGZvciBwZXJzaXN0ZW50IGRhdGEgc3RvcmVzLCBhbmQg d2lsbCB0aHJvdwogLy8gYW4gZXhjZXB0aW9uIGlmIHNldCBmb3Igbm9uLXBlcnNpc3RlbnQgc3Rv cmVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dl YnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLm1tCmluZGV4IGU4YWVj YmY2YWZiZDRlZTEyNzc2NjAzZWQ5OWE2NTRlZDkxMzI3ZjQuLmM1MTI5NGU0OTE3NTgwYTY3OTBj ZWU2MjBmOGE5OGEwMzY5M2I3MDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3Vy YXRpb24ubW0KQEAgLTIyMyw2ICsyMjMsMTggQEAgc3RhdGljIHZvaWQgY2hlY2tVUkxBcmd1bWVu dChOU1VSTCAqdXJsKQogICAgIF9jb25maWd1cmF0aW9uLT5zZXRTb3VyY2VBcHBsaWNhdGlvblNl Y29uZGFyeUlkZW50aWZpZXIoaWRlbnRpZmllcik7CiB9CiAKKy0gKE5TVVJMICopamF2YVNjcmlw dENvbmZpZ3VyYXRpb25EaXJlY3RvcnkKK3sKKyAgICByZXR1cm4gW05TVVJMIGZpbGVVUkxXaXRo UGF0aDpfY29uZmlndXJhdGlvbi0+amF2YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJlY3RvcnkoKSBp c0RpcmVjdG9yeTpZRVNdOworfQorCistICh2b2lkKXNldEphdmFTY3JpcHRDb25maWd1cmF0aW9u RGlyZWN0b3J5OihOU1VSTCAqKXVybAoreworICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgY29uc2lk ZXIgbW92aW5nIHRoaXMgdG8gV0tXZWJWaWV3Q29uZmlndXJhdGlvblByaXZhdGUgb3IgX1dLUHJv Y2Vzc1Bvb2xDb25maWd1cmF0aW9uIHNpbmNlIGl0J3MgY3VycmVudGx5IHByb2Nlc3MtZ2xvYmFs IGluIHRoZSB3ZWIgcHJvY2Vzcy4KKyAgICBjaGVja1VSTEFyZ3VtZW50KHVybCk7CisgICAgX2Nv bmZpZ3VyYXRpb24tPnNldEphdmFTY3JpcHRDb25maWd1cmF0aW9uRGlyZWN0b3J5KHVybC5wYXRo KTsKK30KKwogLSAoQk9PTClkZXZpY2VNYW5hZ2VtZW50UmVzdHJpY3Rpb25zRW5hYmxlZAogewog ICAgIHJldHVybiBfY29uZmlndXJhdGlvbi0+ZGV2aWNlTWFuYWdlbWVudFJlc3RyaWN0aW9uc0Vu YWJsZWQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlBy b2Nlc3NQb29sQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9j ZXNzUG9vbENvY29hLm1tCmluZGV4IDMxY2RmYmFiMGI2ZDFlNDIwMGFiMWE0MTk0NTFmNzYzYmE0 NjI5MmUuLjAzYzkyNzFmMzBmNmFlZjU0MzM5OGUyMTRmZDM3MGNmZDRiOGJmYTcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0K KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5t bQpAQCAtMzYzLDYgKzM2MywxMSBAQCBTdHJpbmcgV2ViUHJvY2Vzc1Bvb2w6OmNvbnRhaW5lclRl bXBvcmFyeURpcmVjdG9yeSgpIGNvbnN0CiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKIHZvaWQg V2ViUHJvY2Vzc1Bvb2w6OnNldEphdmFTY3JpcHRDb25maWd1cmF0aW9uRmlsZUVuYWJsZWRGcm9t RGVmYXVsdHMoKQogeworICAgIGlmIChqYXZhU2NyaXB0Q29uZmlndXJhdGlvbkZpbGVFbmFibGVk KCkpIHsKKyAgICAgICAgLy8gU1BJIGhhcyBhbHJlYWR5IHR1cm5lZCB0aGlzIG9uLiBSZXNwZWN0 IHRoYXQgb3ZlciBOU1VzZXJEZWZhdWx0cy4KKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAg IE5TVXNlckRlZmF1bHRzICpkZWZhdWx0cyA9IFtOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJE ZWZhdWx0c107CiAKICAgICBzZXRKYXZhU2NyaXB0Q29uZmlndXJhdGlvbkZpbGVFbmFibGVkKFtk ZWZhdWx0cyBib29sRm9yS2V5OkAiV2ViS2l0SmF2YVNjcmlwdENvcmVVc2VDb25maWdGaWxlIl0p OwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDgy YmY2YjQ1N2RlODg1YzZiZjhhNDRjMDFlZDkwMjIyNTAyY2IyMDkuLmQ4YjE4ZGFkNjJkMzcyM2Nj MDIzNDhjYzBhM2ZiYTA2OWQ2ZTY4MmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysg Yi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxOS0wNy0xOSAgQWxleCBDaHJp c3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisgICAgICAgIEFkZCBTUEkgX1dL V2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uamF2YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJl Y3RvcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 OTkxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0 aHMubW06CisgICAgICAgIChURVNUKToKKwogMjAxOS0wNy0xOSAgQ2FybG9zIEFsYmVydG8gTG9w ZXogUGVyZXogIDxjbG9wZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXVtXUEVdIHJ1bi13 ZWJraXQtdGVzdHMgc2hvdWxkIHJ1biB3aXRoIGEgdGVtcG9yYWwgaG9tZWRpcgpkaWZmIC0tZ2l0 IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJzaXRlRGF0YVN0b3Jl Q3VzdG9tUGF0aHMubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dl YnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbQppbmRleCA1ZjVjYTVlZTkwODk0M2ZkMjU1MWJl MjhhYWNiN2ViYmIxNTYyYzlkLi40MmQ0MzQ4NjQ2MTMwOWEyNmNmZjhlNzE0ZTFlMWJiNDRhY2Yx OGIwIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dl YnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbQpAQCAtNTU0LDMg KzU1NCw0MSBAQCBURVNUKFdlYktpdCwgTmV0d29ya0NhY2hlRGlyZWN0b3J5KQogICAgIFtmaWxl TWFuYWdlciByZW1vdmVJdGVtQXRQYXRoOnBhdGggZXJyb3I6JmVycm9yXTsKICAgICBFWFBFQ1Rf RkFMU0UoZXJyb3IpOwogfQorCitURVNUKFdlYktpdCwgSmF2YVNjcmlwdENvbmZpZ3VyYXRpb24p Cit7CisgICAgTlNGaWxlTWFuYWdlciAqZmlsZU1hbmFnZXIgPSBbTlNGaWxlTWFuYWdlciBkZWZh dWx0TWFuYWdlcl07CisgICAgTlNVUkwgKnRlbXBEaXIgPSBbTlNVUkwgZmlsZVVSTFdpdGhQYXRo OltOU1RlbXBvcmFyeURpcmVjdG9yeSgpIHN0cmluZ0J5QXBwZW5kaW5nUGF0aENvbXBvbmVudDpA IkN1c3RvbVBhdGhzVGVzdCJdIGlzRGlyZWN0b3J5OllFU107CisgICAgTlNFcnJvciAqZXJyb3Ig PSBuaWw7CisgICAgQk9PTCBzdWNjZXNzID0gW2ZpbGVNYW5hZ2VyIGNyZWF0ZURpcmVjdG9yeUF0 VVJMOnRlbXBEaXIgd2l0aEludGVybWVkaWF0ZURpcmVjdG9yaWVzOllFUyBhdHRyaWJ1dGVzOm5p bCBlcnJvcjomZXJyb3JdOworICAgIEVYUEVDVF9UUlVFKHN1Y2Nlc3MpOworICAgIEVYUEVDVF9G QUxTRShlcnJvcik7CisKKyAgICBOU0RhdGEgKmNvbnRlbnRzID0gW0AiIgorICAgICJwcm9jZXNz TmFtZSA9fiAvV2ViQ29udGVudC8ge1xuIgorICAgICAgICAibG9nRmlsZSA9IFwiTG9nLnR4dFwi XG4iCisgICAgICAgICJqc2NPcHRpb25zIHtcbiIKKyAgICAgICAgICAgICJkdW1wT3B0aW9ucyA9 IDFcbiIKKyAgICAgICAgICAgICJkdW1wREZHRGlzYXNzZW1ibHkgPSB0cnVlXG4iCisgICAgICAg ICJ9XG4iCisgICAgIn0iCisgICAgIiIgZGF0YVVzaW5nRW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5j b2RpbmddOworICAgIEJPT0wgcmVzdWx0ID0gW2NvbnRlbnRzIHdyaXRlVG9VUkw6W3RlbXBEaXIg VVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiSlNDLmNvbmZpZyJdIGF0b21pY2FsbHk6WUVT XTsKKyAgICBFWFBFQ1RfVFJVRShyZXN1bHQpOworCisgICAgYXV0byB3ZWJzaXRlRGF0YVN0b3Jl Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tfV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlv biBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiBzZXRK YXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9yeTp0ZW1wRGlyXTsKKyAgICBhdXRvIHdlYlZp ZXdDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2Nd IGluaXRdKTsKKyAgICBbd2ViVmlld0NvbmZpZ3VyYXRpb24gc2V0V2Vic2l0ZURhdGFTdG9yZTpb W1tXS1dlYnNpdGVEYXRhU3RvcmUgYWxsb2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246d2Vic2l0 ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uZ2V0KCldIGF1dG9yZWxlYXNlXV07CisgICAgCisgICAg W3dlYlZpZXdDb25maWd1cmF0aW9uIHByb2Nlc3NQb29sXS5famF2YVNjcmlwdENvbmZpZ3VyYXRp b25GaWxlRW5hYmxlZCA9IFlFUzsKKyAgICAKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtb V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDAp IGNvbmZpZ3VyYXRpb246d2ViVmlld0NvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAgICBbd2ViVmll dyBsb2FkSFRNTFN0cmluZzpAIjxodG1sPmhlbGxvPC9odG1sPiIgYmFzZVVSTDpbTlNVUkwgVVJM V2l0aFN0cmluZzpAImh0dHBzOi8vd2Via2l0Lm9yZy8iXV07CisgICAgCisgICAgTlNTdHJpbmcg KnBhdGggPSBbdGVtcERpciBVUkxCeUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6QCJMb2cudHh0Il0u cGF0aDsKKyAgICB3aGlsZSAoIVtmaWxlTWFuYWdlciBmaWxlRXhpc3RzQXRQYXRoOnBhdGhdKQor ICAgICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpzcGluUnVuTG9vcCgpOworICAgIFtmaWxlTWFu YWdlciByZW1vdmVJdGVtQXRQYXRoOnRlbXBEaXIucGF0aCBlcnJvcjomZXJyb3JdOworICAgIEVY UEVDVF9GQUxTRShlcnJvcik7Cit9Cg== 374526 2019-07-19 17:11:00 -0700 2019-07-22 10:19:43 -0700 Patch bug-199917-20190719171059.patch text/plain 8006 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3NjQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQzZWU2YzczZGZlNzc3YTE4 NjdjOWY2YWQyNjAwMGUzMDM3OGVmNzQuLjMxMzYxZWUzMmExN2Y1M2Q2Y2Q4MDc0MDg4YTc3OTI0 Mzc0NTIwMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTktMDctMTkgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBBZGQgU1BJIF9X S1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5qYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9y eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5OTE3 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL0NvY29hL19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLm1tOgorICAg ICAgICAoLVtfV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gamF2YVNjcmlwdENvbmZpZ3VyYXRp b25EaXJlY3RvcnldKToKKyAgICAgICAgKC1bX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIHNl dEphdmFTY3JpcHRDb25maWd1cmF0aW9uRGlyZWN0b3J5Ol0pOgorICAgICAgICAqIFVJUHJvY2Vz cy9XZWJQcm9jZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpz ZW5kV2ViUHJvY2Vzc0RhdGFTdG9yZVBhcmFtZXRlcnMpOgorCiAyMDE5LTA3LTE4ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRml4IHdhcm5p bmcgd2hlbiBpbXBvcnRpbmcgV2ViS2l0IGluIFN3aWZ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmggYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0 aW9uLmgKaW5kZXggZmRkNDExZjM5ODkyNmM2ZTI2NjA3MWQ2OTBhYTFhNGY0MWEzMDI4Ny4uZWVh NDI5NzAzZWM4ODJlZGQ1NThkMTFkMDA0M2RjZjIyNmYzOGViMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5o CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tQcm9jZXNzUG9vbENv bmZpZ3VyYXRpb24uaApAQCAtNDUsNiArNDUsOCBAQCBXS19DTEFTU19BVkFJTEFCTEUobWFjb3Mo MTAuMTApLCBpb3MoOC4wKSkKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBOU1VJbnRlZ2VyIHdpcmVs ZXNzQ29udGV4dElkZW50aWZpZXIgV0tfQVBJX0RFUFJFQ0FURUQoIlVzZSBvZiB0aGlzIEFQSSBp cyBubyBsb25nZXIgbmVjZXNzYXJ5IGFuZCBjYW4gYmUgcmVtb3ZlZCIsIGlvcygxMC4xMiwgV0tf SU9TX1RCQSkpOwogI2VuZGlmCiAKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxsYWJsZSwgY29w eSkgTlNVUkwgKmphdmFTY3JpcHRDb25maWd1cmF0aW9uRGlyZWN0b3J5IFdLX0FQSV9BVkFJTEFC TEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CisKIC8vIE5ldHdvcmsgUHJv Y2VzcyBwcm9wZXJ0aWVzCiAvLyBGSVhNRTogVGhlc2Ugc2hvdWxkIGJlIGJlIHBlci1zZXNzaW9u L2RhdGEgc3RvcmUgd2hlbiB3ZSBzdXBwb3J0IG11bHRpcGxlIG5vbi1wZXJzaXN0ZW50IHNlc3Np b25zL2RhdGEgc3RvcmVzLgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQ29jb2EvX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLm1tIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5tbQppbmRleCBk ZWM1NzRjYmRlMDlkMjQ1YTZkZmM5YTZkOGE4MTNhZjEwNjExMGI4Li4yMTkyZDg3ZDkwN2Q0YjYz MzFmNjRlZDAxODdlMDc5M2IzOTRlZjAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24u bW0KQEAgLTExMCw2ICsxMTAsMTggQEAKICAgICByZXR1cm4gX3Byb2Nlc3NQb29sQ29uZmlndXJh dGlvbi0+c2V0QXR0clN0eWxlRW5hYmxlZChlbmFibGVkKTsKIH0KIAorLSAoTlNVUkwgKilqYXZh U2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9yeQoreworICAgIHJldHVybiBbTlNVUkwgZmlsZVVS TFdpdGhQYXRoOl9wcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24tPmphdmFTY3JpcHRDb25maWd1cmF0 aW9uRGlyZWN0b3J5KCkgaXNEaXJlY3Rvcnk6WUVTXTsKK30KKworLSAodm9pZClzZXRKYXZhU2Ny aXB0Q29uZmlndXJhdGlvbkRpcmVjdG9yeTooTlNVUkwgKilkaXJlY3RvcnkKK3sKKyAgICBpZiAo ZGlyZWN0b3J5ICYmICFbZGlyZWN0b3J5IGlzRmlsZVVSTF0pCisgICAgICAgIFtOU0V4Y2VwdGlv biByYWlzZTpOU0ludmFsaWRBcmd1bWVudEV4Y2VwdGlvbiBmb3JtYXQ6QCIlQCBpcyBub3QgYSBm aWxlIFVSTCIsIGRpcmVjdG9yeV07CisgICAgX3Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi0+c2V0 SmF2YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJlY3RvcnkoZGlyZWN0b3J5LnBhdGgpOworfQorCiAt IChOU0FycmF5PE5TVVJMICo+ICopYWRkaXRpb25hbFJlYWRBY2Nlc3NBbGxvd2VkVVJMcwogewog ICAgIGF1dG8gcGF0aHMgPSBfcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLT5hZGRpdGlvbmFsUmVh ZEFjY2Vzc0FsbG93ZWRQYXRocygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUHJvY2Vzc1Bvb2wuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vz c1Bvb2wuY3BwCmluZGV4IGEyMGZhMjkyNDllOTI0MTIxMmEyNWVjNmQ4YWVhNzJjODY1ODU4Y2Yu LjViNDM5OTYwY2UxZTI0M2RiMWFmMTkyMDU2OGM2Nzk4NGUyZDc1MDcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKQEAgLTg5MCwxMSArODkwLDEzIEBAIHZv aWQgV2ViUHJvY2Vzc1Bvb2w6OnNlbmRXZWJQcm9jZXNzRGF0YVN0b3JlUGFyYW1ldGVycyhXZWJQ cm9jZXNzUHJveHkmIHByb2Nlc3MsCiAgICAgaWYgKCFwYXJhbWV0ZXJzLm1lZGlhS2V5U3RvcmFn ZURpcmVjdG9yeS5pc0VtcHR5KCkpCiAgICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhh bmRsZVdpdGhvdXRSZXNvbHZpbmdQYXRoKHBhcmFtZXRlcnMubWVkaWFLZXlTdG9yYWdlRGlyZWN0 b3J5LCBTYW5kYm94RXh0ZW5zaW9uOjpUeXBlOjpSZWFkV3JpdGUsIHBhcmFtZXRlcnMubWVkaWFL ZXlTdG9yYWdlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKIAotICAgIGlmIChqYXZhU2NyaXB0 Q29uZmlndXJhdGlvbkZpbGVFbmFibGVkKCkpIHsKKyAgICAKKyAgICBpZiAoYXV0byYgZGlyZWN0 b3J5ID0gY29uZmlndXJhdGlvbigpLmphdmFTY3JpcHRDb25maWd1cmF0aW9uRGlyZWN0b3J5KCk7 ICFkaXJlY3RvcnkuaXNFbXB0eSgpKQorICAgICAgICBwYXJhbWV0ZXJzLmphdmFTY3JpcHRDb25m aWd1cmF0aW9uRGlyZWN0b3J5ID0gZGlyZWN0b3J5OworICAgIGlmIChqYXZhU2NyaXB0Q29uZmln dXJhdGlvbkZpbGVFbmFibGVkKCkpCiAgICAgICAgIHBhcmFtZXRlcnMuamF2YVNjcmlwdENvbmZp Z3VyYXRpb25EaXJlY3RvcnkgPSB3ZWJzaXRlRGF0YVN0b3JlLnJlc29sdmVkSmF2YVNjcmlwdENv bmZpZ3VyYXRpb25EaXJlY3RvcnkoKTsKLSAgICAgICAgaWYgKCFwYXJhbWV0ZXJzLmphdmFTY3Jp cHRDb25maWd1cmF0aW9uRGlyZWN0b3J5LmlzRW1wdHkoKSkKLSAgICAgICAgICAgIFNhbmRib3hF eHRlbnNpb246OmNyZWF0ZUhhbmRsZVdpdGhvdXRSZXNvbHZpbmdQYXRoKHBhcmFtZXRlcnMuamF2 YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJlY3RvcnksIFNhbmRib3hFeHRlbnNpb246OlR5cGU6OlJl YWRXcml0ZSwgcGFyYW1ldGVycy5qYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9yeUV4dGVu c2lvbkhhbmRsZSk7Ci0gICAgfQorICAgIGlmICghcGFyYW1ldGVycy5qYXZhU2NyaXB0Q29uZmln dXJhdGlvbkRpcmVjdG9yeS5pc0VtcHR5KCkpCisgICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNy ZWF0ZUhhbmRsZVdpdGhvdXRSZXNvbHZpbmdQYXRoKHBhcmFtZXRlcnMuamF2YVNjcmlwdENvbmZp Z3VyYXRpb25EaXJlY3RvcnksIFNhbmRib3hFeHRlbnNpb246OlR5cGU6OlJlYWRXcml0ZSwgcGFy YW1ldGVycy5qYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7 CiAKICAgICBwYXJhbWV0ZXJzLnJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkID0gd2Vic2l0 ZURhdGFTdG9yZS5yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZCgpOwogCmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODJiZjZiNDU3ZGU4ODVj NmJmOGE0NGMwMWVkOTAyMjI1MDJjYjIwOS4uZGEzNmNhMTc4ZjA2MTJkOGJiODk4YjA3MTdhNjJj MzJiNDBiOGI4ZiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE5LTA3LTE5ICBBbGV4IENocmlzdGVuc2VuICA8YWNo cmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIFNQSSBfV0tQcm9jZXNzUG9vbENv bmZpZ3VyYXRpb24uamF2YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJlY3RvcnkKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTkxNworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXRDb2NvYS9XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5tbToKKyAgICAgICAgKFRF U1QpOgorCiAyMDE5LTA3LTE5ICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBp Z2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdW1dQRV0gcnVuLXdlYmtpdC10ZXN0cyBzaG91bGQg cnVuIHdpdGggYSB0ZW1wb3JhbCBob21lZGlyCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLm1tIGIvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1Byb2Nlc3NQb29sQ29uZmlndXJh dGlvbi5tbQppbmRleCBkM2I1MzBkOTAxZTY0N2EyNzYwNDRjNmE0OWViYjRlZTExODVmY2ZlLi5k NjE0M2FmODk4MWI1NDk5OWVhOGE3MDlkNWI2M2E5Mzg2ZWZjZWYzIDEwMDY0NAotLS0gYS9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0 aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tQcm9j ZXNzUG9vbENvbmZpZ3VyYXRpb24ubW0KQEAgLTI0LDggKzI0LDEwIEBACiAgKi8KIAogI2ltcG9y dCAiY29uZmlnLmgiCi0jaW1wb3J0IDxXZWJLaXQvV0tGb3VuZGF0aW9uLmg+CiAKKyNpbXBvcnQg IlV0aWxpdGllcy5oIgorI2ltcG9ydCA8V2ViS2l0L1dLRm91bmRhdGlvbi5oPgorI2ltcG9ydCA8 V2ViS2l0L1dLUHJvY2Vzc1Bvb2xQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvX1dLUHJvY2Vz c1Bvb2xDb25maWd1cmF0aW9uLmg+CiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CiAKQEAgLTgx LDMgKzgzLDM5IEBAIFRFU1QoV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24sIENvcHkpCiAgICAg RVhQRUNUX0VRKFtjb25maWd1cmF0aW9uIHBhZ2VDYWNoZUVuYWJsZWRdLCBbY29weSBwYWdlQ2Fj aGVFbmFibGVkXSk7CiAgICAgRVhQRUNUX0VRKFtjb25maWd1cmF0aW9uIHN1cHByZXNzZXNDb25u ZWN0aW9uVGVybWluYXRpb25PblN5c3RlbUNoYW5nZV0sIFtjb3B5IHN1cHByZXNzZXNDb25uZWN0 aW9uVGVybWluYXRpb25PblN5c3RlbUNoYW5nZV0pOwogfQorCitURVNUKFdLUHJvY2Vzc1Bvb2xD b25maWd1cmF0aW9uLCBKYXZhU2NyaXB0Q29uZmlndXJhdGlvbikKK3sKKyAgICBOU0ZpbGVNYW5h Z2VyICpmaWxlTWFuYWdlciA9IFtOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXTsKKyAgICBO U1VSTCAqdGVtcERpciA9IFtOU1VSTCBmaWxlVVJMV2l0aFBhdGg6W05TVGVtcG9yYXJ5RGlyZWN0 b3J5KCkgc3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiQ3VzdG9tUGF0aHNUZXN0Il0g aXNEaXJlY3Rvcnk6WUVTXTsKKyAgICBOU0Vycm9yICplcnJvciA9IG5pbDsKKyAgICBCT09MIHN1 Y2Nlc3MgPSBbZmlsZU1hbmFnZXIgY3JlYXRlRGlyZWN0b3J5QXRVUkw6dGVtcERpciB3aXRoSW50 ZXJtZWRpYXRlRGlyZWN0b3JpZXM6WUVTIGF0dHJpYnV0ZXM6bmlsIGVycm9yOiZlcnJvcl07Cisg ICAgRVhQRUNUX1RSVUUoc3VjY2Vzcyk7CisgICAgRVhQRUNUX0ZBTFNFKGVycm9yKTsKKworICAg IE5TRGF0YSAqY29udGVudHMgPSBbQCIiCisgICAgInByb2Nlc3NOYW1lID1+IC9XZWJDb250ZW50 LyB7XG4iCisgICAgICAgICJsb2dGaWxlID0gXCJMb2cudHh0XCJcbiIKKyAgICAgICAgImpzY09w dGlvbnMge1xuIgorICAgICAgICAgICAgImR1bXBPcHRpb25zID0gMVxuIgorICAgICAgICAgICAg ImR1bXBERkdEaXNhc3NlbWJseSA9IHRydWVcbiIKKyAgICAgICAgIn1cbiIKKyAgICAifSIKKyAg ICAiIiBkYXRhVXNpbmdFbmNvZGluZzpOU1VURjhTdHJpbmdFbmNvZGluZ107CisgICAgQk9PTCBy ZXN1bHQgPSBbY29udGVudHMgd3JpdGVUb1VSTDpbdGVtcERpciBVUkxCeUFwcGVuZGluZ1BhdGhD b21wb25lbnQ6QCJKU0MuY29uZmlnIl0gYXRvbWljYWxseTpZRVNdOworICAgIEVYUEVDVF9UUlVF KHJlc3VsdCk7CisKKyAgICBhdXRvIHBvb2xDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW19XS1By b2Nlc3NQb29sQ29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIFtwb29sQ29uZmlndXJh dGlvbiBzZXRKYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9yeTp0ZW1wRGlyXTsKKyAgICBh dXRvIHdlYlZpZXdDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRp b24gYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlld0NvbmZpZ3VyYXRpb24gc2V0UHJvY2Vzc1Bv b2w6W1tbV0tQcm9jZXNzUG9vbCBhbGxvY10gX2luaXRXaXRoQ29uZmlndXJhdGlvbjpwb29sQ29u ZmlndXJhdGlvbi5nZXQoKV0gYXV0b3JlbGVhc2VdXTsKKworICAgIGF1dG8gd2ViVmlldyA9IGFk b3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4 MDAsIDYwMCkgY29uZmlndXJhdGlvbjp3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQoKV0pOworICAg IFt3ZWJWaWV3IGxvYWRIVE1MU3RyaW5nOkAiPGh0bWw+aGVsbG88L2h0bWw+IiBiYXNlVVJMOltO U1VSTCBVUkxXaXRoU3RyaW5nOkAiaHR0cHM6Ly93ZWJraXQub3JnLyJdXTsKKworICAgIE5TU3Ry aW5nICpwYXRoID0gW3RlbXBEaXIgVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiTG9nLnR4 dCJdLnBhdGg7CisgICAgd2hpbGUgKCFbZmlsZU1hbmFnZXIgZmlsZUV4aXN0c0F0UGF0aDpwYXRo XSkKKyAgICAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6c3BpblJ1bkxvb3AoKTsKKyAgICBbZmls ZU1hbmFnZXIgcmVtb3ZlSXRlbUF0UGF0aDp0ZW1wRGlyLnBhdGggZXJyb3I6JmVycm9yXTsKKyAg ICBFWFBFQ1RfRkFMU0UoZXJyb3IpOworfQo=