202059 2019-09-20 14:55:22 -0700 Move HSTS storage directory to LegacyGlobalSettings 2019-09-24 16:33:35 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen berto cdumez cgarcia ews-watchlist gustavo thorton webkit-bug-importer youennf oldest_to_newest 1572913 0 achristensen 2019-09-20 14:55:22 -0700 Move HSTS storage directory to LegacyGlobalSettings 1572914 1 379273 achristensen 2019-09-20 14:55:53 -0700 Created attachment 379273 Patch 1573041 2 379309 achristensen 2019-09-20 23:04:04 -0700 Created attachment 379309 Patch 1573042 3 ews-watchlist 2019-09-20 23:04:36 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1573262 4 379309 cgarcia 2019-09-23 02:47:46 -0700 Comment on attachment 379309 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379309&action=review > Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp:-331 > - if (!webkit_website_data_manager_is_ephemeral(priv->websiteDataManager.get())) > - configuration.setHSTSStorageDirectory(FileSystem::stringFromFileSystemRepresentation(webkit_website_data_manager_get_hsts_cache_directory(priv->websiteDataManager.get()))); I guess we still need to set this in LegacyGlobalSettings to keep it working for now. 1573629 5 379443 achristensen 2019-09-24 06:28:13 -0700 Created attachment 379443 Patch 1573630 6 achristensen 2019-09-24 06:29:35 -0700 All right. It would probably be beneficial for gtk to move it to not have anything to do with LegacyGlobalSettings, but that's your decision. 1573632 7 379445 achristensen 2019-09-24 06:33:42 -0700 Created attachment 379445 Patch 1573724 8 achristensen 2019-09-24 11:54:50 -0700 http://trac.webkit.org/r250312 1573725 9 webkit-bug-importer 2019-09-24 11:55:19 -0700 <rdar://problem/55671318> 1573889 10 thorton 2019-09-24 16:33:35 -0700 This seems wrong for the case where there are multiple webkit clients in a given process 379273 2019-09-20 14:55:53 -0700 2019-09-20 23:04:02 -0700 Patch bug-202059-20190920145552.patch text/plain 5828 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTAxNTkpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE5LTA5LTIwICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTW92ZSBIU1RTIHN0 b3JhZ2UgZGlyZWN0b3J5IHRvIExlZ2FjeUdsb2JhbFNldHRpbmdzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDIwNTkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJIGNvbnRpbnVlIG15IGxhbWVudGF0aW9u IGJlZ3VuIGluIHIyNDUwNzUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQ b29sQ29uZmlndXJhdGlvbi5jcHA6CisgICAgICAgIChBUEk6OlByb2Nlc3NQb29sQ29uZmlndXJh dGlvbjo6Y29weSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZp Z3VyYXRpb24uaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL19XS1Byb2Nlc3NQb29s Q29uZmlndXJhdGlvbi5tbToKKyAgICAgICAgKC1bX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9u IHNldEhTVFNTdG9yYWdlRGlyZWN0b3J5Ol0pOgorICAgICAgICAoLVtfV0tQcm9jZXNzUG9vbENv bmZpZ3VyYXRpb24gaHN0c1N0b3JhZ2VEaXJlY3RvcnldKToKKyAgICAgICAgKiBVSVByb2Nlc3Mv TGVnYWN5R2xvYmFsU2V0dGluZ3MuaDoKKyAgICAgICAgKFdlYktpdDo6TGVnYWN5R2xvYmFsU2V0 dGluZ3M6OnNldEhTVFNTdG9yYWdlRGlyZWN0b3J5KToKKyAgICAgICAgKFdlYktpdDo6TGVnYWN5 R2xvYmFsU2V0dGluZ3M6OmhzdHNTdG9yYWdlRGlyZWN0b3J5IGNvbnN0KToKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNz UG9vbDo6ZW5zdXJlTmV0d29ya1Byb2Nlc3MpOgorCiAyMDE5LTA5LTIwICBUaW0gSG9ydG9uICA8 dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFNhbml0aXplIHN1Z2dlc3RlZCBm aWxlbmFtZXMgdXNlZCBmb3Igc2F2aW5nIFBERnMKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0xlZ2FjeUdsb2JhbFNldHRpbmdzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9V SVByb2Nlc3MvTGVnYWN5R2xvYmFsU2V0dGluZ3MuaAkocmV2aXNpb24gMjUwMTQ4KQorKysgU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvTGVnYWN5R2xvYmFsU2V0dGluZ3MuaAkod29ya2luZyBjb3B5 KQpAQCAtMjcsNiArMjcsNyBAQAogCiAjaW5jbHVkZSAiQ2FjaGVNb2RlbC5oIgogI2luY2x1ZGUg PHd0Zi9Gb3J3YXJkLmg+CisjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKIG5hbWVz cGFjZSBXZWJLaXQgewogCkBAIC0zOCwxMSArMzksMTUgQEAgcHVibGljOgogICAgIHZvaWQgc2V0 Q2FjaGVNb2RlbChDYWNoZU1vZGVsKTsKICAgICBDYWNoZU1vZGVsIGNhY2hlTW9kZWwoKSBjb25z dCB7IHJldHVybiBtX2NhY2hlTW9kZWw7IH0KICAgICAKKyAgICB2b2lkIHNldEhTVFNTdG9yYWdl RGlyZWN0b3J5KFN0cmluZyYmIGRpcmVjdG9yeSkgeyBtX2hzdHNTdG9yYWdlRGlyZWN0b3J5ID0g V1RGTW92ZShkaXJlY3RvcnkpOyB9CisgICAgY29uc3QgU3RyaW5nJiBoc3RzU3RvcmFnZURpcmVj dG9yeSgpIGNvbnN0IHsgcmV0dXJuIG1faHN0c1N0b3JhZ2VEaXJlY3Rvcnk7IH0KKyAgICAKIHBy aXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIE5ldmVyRGVzdHJveWVkPExlZ2FjeUdsb2JhbFNldHRp bmdzPjsKICAgICBMZWdhY3lHbG9iYWxTZXR0aW5ncygpOwogICAgIAogICAgIENhY2hlTW9kZWwg bV9jYWNoZU1vZGVsIHsgQ2FjaGVNb2RlbDo6UHJpbWFyeVdlYkJyb3dzZXIgfTsKKyAgICBTdHJp bmcgbV9oc3RzU3RvcmFnZURpcmVjdG9yeTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJ bmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAkocmV2aXNp b24gMjUwMTQ4KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC01MjMsNyArNTIzLDcgQEAgTmV0d29ya1Byb2Nlc3NQcm94eSYg V2ViUHJvY2Vzc1Bvb2w6OmVucwogI2VuZGlmCiAjZW5kaWYKIAotICAgIHBhcmFtZXRlcnMuaHN0 c1N0b3JhZ2VEaXJlY3RvcnkgPSBtX2NvbmZpZ3VyYXRpb24tPmhzdHNTdG9yYWdlRGlyZWN0b3J5 KCk7CisgICAgcGFyYW1ldGVycy5oc3RzU3RvcmFnZURpcmVjdG9yeSA9IExlZ2FjeUdsb2JhbFNl dHRpbmdzOjpzaW5nbGV0b24oKS5oc3RzU3RvcmFnZURpcmVjdG9yeSgpOwogICAgIGlmICghcGFy YW1ldGVycy5oc3RzU3RvcmFnZURpcmVjdG9yeS5pc051bGwoKSkKICAgICAgICAgU2FuZGJveEV4 dGVuc2lvbjo6Y3JlYXRlSGFuZGxlRm9yUmVhZFdyaXRlRGlyZWN0b3J5KHBhcmFtZXRlcnMuaHN0 c1N0b3JhZ2VEaXJlY3RvcnksIHBhcmFtZXRlcnMuaHN0c1N0b3JhZ2VEaXJlY3RvcnlFeHRlbnNp b25IYW5kbGUpOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJUHJvY2Vz c1Bvb2xDb25maWd1cmF0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmNwcAkocmV2aXNpb24gMjUwMTQ4 KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29sQ29uZmlndXJh dGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc3LDcgKzc3LDYgQEAgUmVmPFByb2Nlc3NQb29s Q29uZmlndXJhdGlvbj4gUHJvY2Vzc1BvbwogI2VuZGlmCiAgICAgY29weS0+bV9jdXN0b21XZWJD b250ZW50U2VydmljZUJ1bmRsZUlkZW50aWZpZXIgPSB0aGlzLT5tX2N1c3RvbVdlYkNvbnRlbnRT ZXJ2aWNlQnVuZGxlSWRlbnRpZmllcjsKICAgICBjb3B5LT5tX3VzZXNTaW5nbGVXZWJQcm9jZXNz ID0gbV91c2VzU2luZ2xlV2ViUHJvY2VzczsKLSAgICBjb3B5LT5tX2hzdHNTdG9yYWdlRGlyZWN0 b3J5ID0gbV9oc3RzU3RvcmFnZURpcmVjdG9yeTsKIAogICAgIHJldHVybiBjb3B5OwogfQpJbmRl eDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29sQ29uZmlndXJhdGlv bi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNz UG9vbENvbmZpZ3VyYXRpb24uaAkocmV2aXNpb24gMjUwMTQ4KQorKysgU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5oCSh3b3JraW5nIGNvcHkp CkBAIC0xNDcsOSArMTQ3LDYgQEAgcHVibGljOgogCiAgICAgY29uc3QgV1RGOjpTdHJpbmcmIGN1 c3RvbVdlYkNvbnRlbnRTZXJ2aWNlQnVuZGxlSWRlbnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIG1f Y3VzdG9tV2ViQ29udGVudFNlcnZpY2VCdW5kbGVJZGVudGlmaWVyOyB9CiAgICAgdm9pZCBzZXRD dXN0b21XZWJDb250ZW50U2VydmljZUJ1bmRsZUlkZW50aWZpZXIoY29uc3QgV1RGOjpTdHJpbmcm IGN1c3RvbVdlYkNvbnRlbnRTZXJ2aWNlQnVuZGxlSWRlbnRpZmllcikgeyBtX2N1c3RvbVdlYkNv bnRlbnRTZXJ2aWNlQnVuZGxlSWRlbnRpZmllciA9IGN1c3RvbVdlYkNvbnRlbnRTZXJ2aWNlQnVu ZGxlSWRlbnRpZmllcjsgfQotCi0gICAgY29uc3QgV1RGOjpTdHJpbmcmIGhzdHNTdG9yYWdlRGly ZWN0b3J5KCkgY29uc3QgeyByZXR1cm4gbV9oc3RzU3RvcmFnZURpcmVjdG9yeTsgfQotICAgIHZv aWQgc2V0SFNUU1N0b3JhZ2VEaXJlY3RvcnkoV1RGOjpTdHJpbmcmJiBkaXJlY3RvcnkpIHsgbV9o c3RzU3RvcmFnZURpcmVjdG9yeSA9IFdURk1vdmUoZGlyZWN0b3J5KTsgfQogICAgIAogI2lmIFBM QVRGT1JNKENPQ09BKQogICAgIGJvb2wgc3VwcHJlc3Nlc0Nvbm5lY3Rpb25UZXJtaW5hdGlvbk9u U3lzdGVtQ2hhbmdlKCkgY29uc3QgeyByZXR1cm4gbV9zdXBwcmVzc2VzQ29ubmVjdGlvblRlcm1p bmF0aW9uT25TeXN0ZW1DaGFuZ2U7IH0KQEAgLTE4Nyw3ICsxODQsNiBAQCBwcml2YXRlOgogICAg IGJvb2wgbV9pc0pJVEVuYWJsZWQgeyB0cnVlIH07CiAgICAgYm9vbCBtX3VzZXNTaW5nbGVXZWJQ cm9jZXNzIHsgZmFsc2UgfTsKICAgICB1aW50MzJfdCBtX2Rvd25sb2FkTW9uaXRvclNwZWVkTXVs dGlwbGllciB7IDEgfTsKLSAgICBXVEY6OlN0cmluZyBtX2hzdHNTdG9yYWdlRGlyZWN0b3J5Owog CiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICBXVEY6OlN0cmluZyBtX2N0RGF0YUNvbm5l Y3Rpb25TZXJ2aWNlVHlwZTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9fV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24ubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5tbQko cmV2aXNpb24gMjUwMTQ4KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19X S1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5tbQkod29ya2luZyBjb3B5KQpAQCAtMzU4LDEyICsz NTgsMTIgQEAgLSAodm9pZClzZXRIU1RTU3RvcmFnZURpcmVjdG9yeTooTlNVUkwgKgogICAgICAg ICBbTlNFeGNlcHRpb24gcmFpc2U6TlNJbnZhbGlkQXJndW1lbnRFeGNlcHRpb24gZm9ybWF0OkAi JUAgaXMgbm90IGEgZmlsZSBVUkwiLCBkaXJlY3RvcnldOwogCiAgICAgLy8gRklYTUU6IE1vdmUg dGhpcyB0byBfV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiBvbmNlIHJkYXI6Ly9wcm9i bGVtLzUwMTA5NjMxIGlzIGZpeGVkLgotICAgIF9wcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24tPnNl dEhTVFNTdG9yYWdlRGlyZWN0b3J5KGRpcmVjdG9yeS5wYXRoKTsKKyAgICBXZWJLaXQ6OkxlZ2Fj eUdsb2JhbFNldHRpbmdzOjpzaW5nbGV0b24oKS5zZXRIU1RTU3RvcmFnZURpcmVjdG9yeShkaXJl Y3RvcnkucGF0aCk7CiB9CiAKIC0gKE5TVVJMICopaHN0c1N0b3JhZ2VEaXJlY3RvcnkKIHsKLSAg ICByZXR1cm4gW05TVVJMIGZpbGVVUkxXaXRoUGF0aDpfcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9u LT5oc3RzU3RvcmFnZURpcmVjdG9yeSgpIGlzRGlyZWN0b3J5OllFU107CisgICAgcmV0dXJuIFtO U1VSTCBmaWxlVVJMV2l0aFBhdGg6V2ViS2l0OjpMZWdhY3lHbG9iYWxTZXR0aW5nczo6c2luZ2xl dG9uKCkuaHN0c1N0b3JhZ2VEaXJlY3RvcnkoKSBpc0RpcmVjdG9yeTpZRVNdOwogfQogCiAtICh2 b2lkKXNldERvd25sb2FkTW9uaXRvclNwZWVkTXVsdGlwbGllckZvclRlc3Rpbmc6KE5TVUludGVn ZXIpbXVsdGlwbGllcgo= 379309 2019-09-20 23:04:04 -0700 2019-09-24 06:28:11 -0700 Patch bug-202059-20190920230403.patch text/plain 6961 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTAxNzApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE5LTA5LTIwICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTW92ZSBIU1RTIHN0 b3JhZ2UgZGlyZWN0b3J5IHRvIExlZ2FjeUdsb2JhbFNldHRpbmdzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDIwNTkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJIGNvbnRpbnVlIG15IGxhbWVudGF0aW9u IGJlZ3VuIGluIHIyNDUwNzUuCisgICAgICAgIFJlbW92ZSB0aGUgZ2xpYiBzZXR0aW5nIG9mIGl0 IG9uIHRoZSBXZWJLaXRXZWJDb250ZXh0IGJlY2F1c2UgdGhleSB1c2UgaXQgb24gdGhlIFdlYnNp dGVEYXRhU3RvcmUuICBXZSBzaG91bGQgZG8gdGhhdCB0b28gd2hlbiB3ZSBjYW4uCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5jcHA6CisgICAg ICAgIChBUEk6OlByb2Nlc3NQb29sQ29uZmlndXJhdGlvbjo6Y29weSk6CisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uaDoKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL0NvY29hL19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5tbToKKyAgICAgICAg KC1bX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIHNldEhTVFNTdG9yYWdlRGlyZWN0b3J5Ol0p OgorICAgICAgICAoLVtfV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gaHN0c1N0b3JhZ2VEaXJl Y3RvcnldKToKKyAgICAgICAgKiBVSVByb2Nlc3MvTGVnYWN5R2xvYmFsU2V0dGluZ3MuaDoKKyAg ICAgICAgKFdlYktpdDo6TGVnYWN5R2xvYmFsU2V0dGluZ3M6OnNldEhTVFNTdG9yYWdlRGlyZWN0 b3J5KToKKyAgICAgICAgKFdlYktpdDo6TGVnYWN5R2xvYmFsU2V0dGluZ3M6OmhzdHNTdG9yYWdl RGlyZWN0b3J5IGNvbnN0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6ZW5zdXJlTmV0d29ya1Byb2Nlc3Mp OgorCiAyMDE5LTA5LTIwICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5v cmc+CiAKICAgICAgICAgUmVtb3ZlIHVubmVjZXNzYXJ5IGFic3RyYWN0aW9ucyBhcm91bmQgV2Vi c2l0ZURhdGFTdG9yZQpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTGVnYWN5R2xvYmFs U2V0dGluZ3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9MZWdhY3lH bG9iYWxTZXR0aW5ncy5oCShyZXZpc2lvbiAyNTAxNzApCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9MZWdhY3lHbG9iYWxTZXR0aW5ncy5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNyw2ICsyNyw3 IEBACiAKICNpbmNsdWRlICJDYWNoZU1vZGVsLmgiCiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4K KyNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogbmFtZXNwYWNlIFdlYktpdCB7CiAK QEAgLTM4LDExICszOSwxNSBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRDYWNoZU1vZGVsKENhY2hl TW9kZWwpOwogICAgIENhY2hlTW9kZWwgY2FjaGVNb2RlbCgpIGNvbnN0IHsgcmV0dXJuIG1fY2Fj aGVNb2RlbDsgfQogICAgIAorICAgIHZvaWQgc2V0SFNUU1N0b3JhZ2VEaXJlY3RvcnkoU3RyaW5n JiYgZGlyZWN0b3J5KSB7IG1faHN0c1N0b3JhZ2VEaXJlY3RvcnkgPSBXVEZNb3ZlKGRpcmVjdG9y eSk7IH0KKyAgICBjb25zdCBTdHJpbmcmIGhzdHNTdG9yYWdlRGlyZWN0b3J5KCkgY29uc3QgeyBy ZXR1cm4gbV9oc3RzU3RvcmFnZURpcmVjdG9yeTsgfQorICAgIAogcHJpdmF0ZToKICAgICBmcmll bmQgY2xhc3MgTmV2ZXJEZXN0cm95ZWQ8TGVnYWN5R2xvYmFsU2V0dGluZ3M+OwogICAgIExlZ2Fj eUdsb2JhbFNldHRpbmdzKCk7CiAgICAgCiAgICAgQ2FjaGVNb2RlbCBtX2NhY2hlTW9kZWwgeyBD YWNoZU1vZGVsOjpQcmltYXJ5V2ViQnJvd3NlciB9OworICAgIFN0cmluZyBtX2hzdHNTdG9yYWdl RGlyZWN0b3J5OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCShyZXZpc2lvbiAyNTAxNzApCisrKyBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTUyMyw3ICs1MjMsNyBAQCBOZXR3b3JrUHJvY2Vzc1Byb3h5JiBXZWJQcm9jZXNzUG9vbDo6 ZW5zCiAjZW5kaWYKICNlbmRpZgogCi0gICAgcGFyYW1ldGVycy5oc3RzU3RvcmFnZURpcmVjdG9y eSA9IG1fY29uZmlndXJhdGlvbi0+aHN0c1N0b3JhZ2VEaXJlY3RvcnkoKTsKKyAgICBwYXJhbWV0 ZXJzLmhzdHNTdG9yYWdlRGlyZWN0b3J5ID0gTGVnYWN5R2xvYmFsU2V0dGluZ3M6OnNpbmdsZXRv bigpLmhzdHNTdG9yYWdlRGlyZWN0b3J5KCk7CiAgICAgaWYgKCFwYXJhbWV0ZXJzLmhzdHNTdG9y YWdlRGlyZWN0b3J5LmlzTnVsbCgpKQogICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVI YW5kbGVGb3JSZWFkV3JpdGVEaXJlY3RvcnkocGFyYW1ldGVycy5oc3RzU3RvcmFnZURpcmVjdG9y eSwgcGFyYW1ldGVycy5oc3RzU3RvcmFnZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7CiAKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRp b24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElQcm9j ZXNzUG9vbENvbmZpZ3VyYXRpb24uY3BwCShyZXZpc2lvbiAyNTAxNzApCisrKyBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNzcsNyArNzcsNiBAQCBSZWY8UHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uPiBQ cm9jZXNzUG9vCiAjZW5kaWYKICAgICBjb3B5LT5tX2N1c3RvbVdlYkNvbnRlbnRTZXJ2aWNlQnVu ZGxlSWRlbnRpZmllciA9IHRoaXMtPm1fY3VzdG9tV2ViQ29udGVudFNlcnZpY2VCdW5kbGVJZGVu dGlmaWVyOwogICAgIGNvcHktPm1fdXNlc1NpbmdsZVdlYlByb2Nlc3MgPSBtX3VzZXNTaW5nbGVX ZWJQcm9jZXNzOwotICAgIGNvcHktPm1faHN0c1N0b3JhZ2VEaXJlY3RvcnkgPSBtX2hzdHNTdG9y YWdlRGlyZWN0b3J5OwogCiAgICAgcmV0dXJuIGNvcHk7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29sQ29uZmlndXJhdGlv bi5oCShyZXZpc2lvbiAyNTAxNzApCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJ UHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTE0Nyw5ICsxNDcs NiBAQCBwdWJsaWM6CiAKICAgICBjb25zdCBXVEY6OlN0cmluZyYgY3VzdG9tV2ViQ29udGVudFNl cnZpY2VCdW5kbGVJZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9jdXN0b21XZWJDb250ZW50 U2VydmljZUJ1bmRsZUlkZW50aWZpZXI7IH0KICAgICB2b2lkIHNldEN1c3RvbVdlYkNvbnRlbnRT ZXJ2aWNlQnVuZGxlSWRlbnRpZmllcihjb25zdCBXVEY6OlN0cmluZyYgY3VzdG9tV2ViQ29udGVu dFNlcnZpY2VCdW5kbGVJZGVudGlmaWVyKSB7IG1fY3VzdG9tV2ViQ29udGVudFNlcnZpY2VCdW5k bGVJZGVudGlmaWVyID0gY3VzdG9tV2ViQ29udGVudFNlcnZpY2VCdW5kbGVJZGVudGlmaWVyOyB9 Ci0KLSAgICBjb25zdCBXVEY6OlN0cmluZyYgaHN0c1N0b3JhZ2VEaXJlY3RvcnkoKSBjb25zdCB7 IHJldHVybiBtX2hzdHNTdG9yYWdlRGlyZWN0b3J5OyB9Ci0gICAgdm9pZCBzZXRIU1RTU3RvcmFn ZURpcmVjdG9yeShXVEY6OlN0cmluZyYmIGRpcmVjdG9yeSkgeyBtX2hzdHNTdG9yYWdlRGlyZWN0 b3J5ID0gV1RGTW92ZShkaXJlY3RvcnkpOyB9CiAgICAgCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAg ICAgYm9vbCBzdXBwcmVzc2VzQ29ubmVjdGlvblRlcm1pbmF0aW9uT25TeXN0ZW1DaGFuZ2UoKSBj b25zdCB7IHJldHVybiBtX3N1cHByZXNzZXNDb25uZWN0aW9uVGVybWluYXRpb25PblN5c3RlbUNo YW5nZTsgfQpAQCAtMTg3LDcgKzE4NCw2IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2lzSklURW5h YmxlZCB7IHRydWUgfTsKICAgICBib29sIG1fdXNlc1NpbmdsZVdlYlByb2Nlc3MgeyBmYWxzZSB9 OwogICAgIHVpbnQzMl90IG1fZG93bmxvYWRNb25pdG9yU3BlZWRNdWx0aXBsaWVyIHsgMSB9Owot ICAgIFdURjo6U3RyaW5nIG1faHN0c1N0b3JhZ2VEaXJlY3Rvcnk7CiAKICNpZiBQTEFURk9STShJ T1NfRkFNSUxZKQogICAgIFdURjo6U3RyaW5nIG1fY3REYXRhQ29ubmVjdGlvblNlcnZpY2VUeXBl OwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1Byb2Nlc3NQb29s Q29uZmlndXJhdGlvbi5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQ29jb2EvX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLm1tCShyZXZpc2lvbiAyNTAxNzAp CisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLUHJvY2Vzc1Bvb2xDb25m aWd1cmF0aW9uLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zNTgsMTIgKzM1OCwxMiBAQCAtICh2b2lk KXNldEhTVFNTdG9yYWdlRGlyZWN0b3J5OihOU1VSTCAqCiAgICAgICAgIFtOU0V4Y2VwdGlvbiBy YWlzZTpOU0ludmFsaWRBcmd1bWVudEV4Y2VwdGlvbiBmb3JtYXQ6QCIlQCBpcyBub3QgYSBmaWxl IFVSTCIsIGRpcmVjdG9yeV07CiAKICAgICAvLyBGSVhNRTogTW92ZSB0aGlzIHRvIF9XS1dlYnNp dGVEYXRhU3RvcmVDb25maWd1cmF0aW9uIG9uY2UgcmRhcjovL3Byb2JsZW0vNTAxMDk2MzEgaXMg Zml4ZWQuCi0gICAgX3Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi0+c2V0SFNUU1N0b3JhZ2VEaXJl Y3RvcnkoZGlyZWN0b3J5LnBhdGgpOworICAgIFdlYktpdDo6TGVnYWN5R2xvYmFsU2V0dGluZ3M6 OnNpbmdsZXRvbigpLnNldEhTVFNTdG9yYWdlRGlyZWN0b3J5KGRpcmVjdG9yeS5wYXRoKTsKIH0K IAogLSAoTlNVUkwgKiloc3RzU3RvcmFnZURpcmVjdG9yeQogewotICAgIHJldHVybiBbTlNVUkwg ZmlsZVVSTFdpdGhQYXRoOl9wcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24tPmhzdHNTdG9yYWdlRGly ZWN0b3J5KCkgaXNEaXJlY3Rvcnk6WUVTXTsKKyAgICByZXR1cm4gW05TVVJMIGZpbGVVUkxXaXRo UGF0aDpXZWJLaXQ6OkxlZ2FjeUdsb2JhbFNldHRpbmdzOjpzaW5nbGV0b24oKS5oc3RzU3RvcmFn ZURpcmVjdG9yeSgpIGlzRGlyZWN0b3J5OllFU107CiB9CiAKIC0gKHZvaWQpc2V0RG93bmxvYWRN b25pdG9yU3BlZWRNdWx0aXBsaWVyRm9yVGVzdGluZzooTlNVSW50ZWdlciltdWx0aXBsaWVyCklu ZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRXZWJDb250ZXh0LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRX ZWJDb250ZXh0LmNwcAkocmV2aXNpb24gMjUwMTcwKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL2dsaWIvV2ViS2l0V2ViQ29udGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMyNyw5 ICszMjcsNiBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJDb250ZXh0Q29uc3RydWN0ZWQoCiAgICAg aWYgKCFwcml2LT53ZWJzaXRlRGF0YU1hbmFnZXIpCiAgICAgICAgIHByaXYtPndlYnNpdGVEYXRh TWFuYWdlciA9IGFkb3B0R1JlZih3ZWJraXRfd2Vic2l0ZV9kYXRhX21hbmFnZXJfbmV3KCJsb2Nh bC1zdG9yYWdlLWRpcmVjdG9yeSIsIHByaXYtPmxvY2FsU3RvcmFnZURpcmVjdG9yeS5kYXRhKCks IG51bGxwdHIpKTsKIAotICAgIGlmICghd2Via2l0X3dlYnNpdGVfZGF0YV9tYW5hZ2VyX2lzX2Vw aGVtZXJhbChwcml2LT53ZWJzaXRlRGF0YU1hbmFnZXIuZ2V0KCkpKQotICAgICAgICBjb25maWd1 cmF0aW9uLnNldEhTVFNTdG9yYWdlRGlyZWN0b3J5KEZpbGVTeXN0ZW06OnN0cmluZ0Zyb21GaWxl U3lzdGVtUmVwcmVzZW50YXRpb24od2Via2l0X3dlYnNpdGVfZGF0YV9tYW5hZ2VyX2dldF9oc3Rz X2NhY2hlX2RpcmVjdG9yeShwcml2LT53ZWJzaXRlRGF0YU1hbmFnZXIuZ2V0KCkpKSk7Ci0KICAg ICBwcml2LT5wcm9jZXNzUG9vbCA9IFdlYlByb2Nlc3NQb29sOjpjcmVhdGUoY29uZmlndXJhdGlv bik7CiAgICAgcHJpdi0+cHJvY2Vzc1Bvb2wtPnNldFByaW1hcnlEYXRhU3RvcmUod2Via2l0V2Vi c2l0ZURhdGFNYW5hZ2VyR2V0RGF0YVN0b3JlKHByaXYtPndlYnNpdGVEYXRhTWFuYWdlci5nZXQo KSkpOwogCg== 379443 2019-09-24 06:28:13 -0700 2019-09-24 06:33:40 -0700 Patch bug-202059-20190924062812.patch text/plain 7149 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTAyNjcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE5LTA5LTI0ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTW92ZSBIU1RTIHN0 b3JhZ2UgZGlyZWN0b3J5IHRvIExlZ2FjeUdsb2JhbFNldHRpbmdzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDIwNTkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJIGNvbnRpbnVlIG15IGxhbWVudGF0aW9u IGJlZ3VuIGluIHIyNDUwNzUuCisgICAgICAgIFJlbW92ZSB0aGUgZ2xpYiBzZXR0aW5nIG9mIGl0 IG9uIHRoZSBXZWJLaXRXZWJDb250ZXh0IGJlY2F1c2UgdGhleSB1c2UgaXQgb24gdGhlIFdlYnNp dGVEYXRhU3RvcmUuICBXZSBzaG91bGQgZG8gdGhhdCB0b28gd2hlbiB3ZSBjYW4uCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5jcHA6CisgICAg ICAgIChBUEk6OlByb2Nlc3NQb29sQ29uZmlndXJhdGlvbjo6Y29weSk6CisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uaDoKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL0NvY29hL19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5tbToKKyAgICAgICAg KC1bX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIHNldEhTVFNTdG9yYWdlRGlyZWN0b3J5Ol0p OgorICAgICAgICAoLVtfV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gaHN0c1N0b3JhZ2VEaXJl Y3RvcnldKToKKyAgICAgICAgKiBVSVByb2Nlc3MvTGVnYWN5R2xvYmFsU2V0dGluZ3MuaDoKKyAg ICAgICAgKFdlYktpdDo6TGVnYWN5R2xvYmFsU2V0dGluZ3M6OnNldEhTVFNTdG9yYWdlRGlyZWN0 b3J5KToKKyAgICAgICAgKFdlYktpdDo6TGVnYWN5R2xvYmFsU2V0dGluZ3M6OmhzdHNTdG9yYWdl RGlyZWN0b3J5IGNvbnN0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6ZW5zdXJlTmV0d29ya1Byb2Nlc3Mp OgorCiAyMDE5LTA5LTIzICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgog CiAgICAgICAgIG1hY09TOiA8ZGF0YWxpc3Q+IGRyb3Bkb3duIHNoYWRvdyBpcyBjcm9wcGVkLCBs b29rcyBub3RoaW5nIGxpa2UgTlNDb21ib0JveApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nl c3MvTGVnYWN5R2xvYmFsU2V0dGluZ3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9MZWdhY3lHbG9iYWxTZXR0aW5ncy5oCShyZXZpc2lvbiAyNTAyNTQpCisrKyBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9MZWdhY3lHbG9iYWxTZXR0aW5ncy5oCSh3b3JraW5nIGNvcHkp CkBAIC0yNyw2ICsyNyw3IEBACiAKICNpbmNsdWRlICJDYWNoZU1vZGVsLmgiCiAjaW5jbHVkZSA8 d3RmL0ZvcndhcmQuaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogbmFtZXNw YWNlIFdlYktpdCB7CiAKQEAgLTM4LDExICszOSwxNSBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRD YWNoZU1vZGVsKENhY2hlTW9kZWwpOwogICAgIENhY2hlTW9kZWwgY2FjaGVNb2RlbCgpIGNvbnN0 IHsgcmV0dXJuIG1fY2FjaGVNb2RlbDsgfQogICAgIAorICAgIHZvaWQgc2V0SFNUU1N0b3JhZ2VE aXJlY3RvcnkoU3RyaW5nJiYgZGlyZWN0b3J5KSB7IG1faHN0c1N0b3JhZ2VEaXJlY3RvcnkgPSBX VEZNb3ZlKGRpcmVjdG9yeSk7IH0KKyAgICBjb25zdCBTdHJpbmcmIGhzdHNTdG9yYWdlRGlyZWN0 b3J5KCkgY29uc3QgeyByZXR1cm4gbV9oc3RzU3RvcmFnZURpcmVjdG9yeTsgfQorICAgIAogcHJp dmF0ZToKICAgICBmcmllbmQgY2xhc3MgTmV2ZXJEZXN0cm95ZWQ8TGVnYWN5R2xvYmFsU2V0dGlu Z3M+OwogICAgIExlZ2FjeUdsb2JhbFNldHRpbmdzKCk7CiAgICAgCiAgICAgQ2FjaGVNb2RlbCBt X2NhY2hlTW9kZWwgeyBDYWNoZU1vZGVsOjpQcmltYXJ5V2ViQnJvd3NlciB9OworICAgIFN0cmlu ZyBtX2hzdHNTdG9yYWdlRGlyZWN0b3J5OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cklu ZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCShyZXZpc2lv biAyNTAyNTQpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTUyMyw3ICs1MjMsNyBAQCBOZXR3b3JrUHJvY2Vzc1Byb3h5JiBX ZWJQcm9jZXNzUG9vbDo6ZW5zCiAjZW5kaWYKICNlbmRpZgogCi0gICAgcGFyYW1ldGVycy5oc3Rz U3RvcmFnZURpcmVjdG9yeSA9IG1fY29uZmlndXJhdGlvbi0+aHN0c1N0b3JhZ2VEaXJlY3Rvcnko KTsKKyAgICBwYXJhbWV0ZXJzLmhzdHNTdG9yYWdlRGlyZWN0b3J5ID0gTGVnYWN5R2xvYmFsU2V0 dGluZ3M6OnNpbmdsZXRvbigpLmhzdHNTdG9yYWdlRGlyZWN0b3J5KCk7CiAgICAgaWYgKCFwYXJh bWV0ZXJzLmhzdHNTdG9yYWdlRGlyZWN0b3J5LmlzTnVsbCgpKQogICAgICAgICBTYW5kYm94RXh0 ZW5zaW9uOjpjcmVhdGVIYW5kbGVGb3JSZWFkV3JpdGVEaXJlY3RvcnkocGFyYW1ldGVycy5oc3Rz U3RvcmFnZURpcmVjdG9yeSwgcGFyYW1ldGVycy5oc3RzU3RvcmFnZURpcmVjdG9yeUV4dGVuc2lv bkhhbmRsZSk7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNz UG9vbENvbmZpZ3VyYXRpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uY3BwCShyZXZpc2lvbiAyNTAyNTQp CisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0 aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzcsNyArNzcsNiBAQCBSZWY8UHJvY2Vzc1Bvb2xD b25maWd1cmF0aW9uPiBQcm9jZXNzUG9vCiAjZW5kaWYKICAgICBjb3B5LT5tX2N1c3RvbVdlYkNv bnRlbnRTZXJ2aWNlQnVuZGxlSWRlbnRpZmllciA9IHRoaXMtPm1fY3VzdG9tV2ViQ29udGVudFNl cnZpY2VCdW5kbGVJZGVudGlmaWVyOwogICAgIGNvcHktPm1fdXNlc1NpbmdsZVdlYlByb2Nlc3Mg PSBtX3VzZXNTaW5nbGVXZWJQcm9jZXNzOwotICAgIGNvcHktPm1faHN0c1N0b3JhZ2VEaXJlY3Rv cnkgPSBtX2hzdHNTdG9yYWdlRGlyZWN0b3J5OwogCiAgICAgcmV0dXJuIGNvcHk7CiB9CkluZGV4 OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9u LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQ b29sQ29uZmlndXJhdGlvbi5oCShyZXZpc2lvbiAyNTAyNTQpCisrKyBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmgJKHdvcmtpbmcgY29weSkK QEAgLTE0Nyw5ICsxNDcsNiBAQCBwdWJsaWM6CiAKICAgICBjb25zdCBXVEY6OlN0cmluZyYgY3Vz dG9tV2ViQ29udGVudFNlcnZpY2VCdW5kbGVJZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9j dXN0b21XZWJDb250ZW50U2VydmljZUJ1bmRsZUlkZW50aWZpZXI7IH0KICAgICB2b2lkIHNldEN1 c3RvbVdlYkNvbnRlbnRTZXJ2aWNlQnVuZGxlSWRlbnRpZmllcihjb25zdCBXVEY6OlN0cmluZyYg Y3VzdG9tV2ViQ29udGVudFNlcnZpY2VCdW5kbGVJZGVudGlmaWVyKSB7IG1fY3VzdG9tV2ViQ29u dGVudFNlcnZpY2VCdW5kbGVJZGVudGlmaWVyID0gY3VzdG9tV2ViQ29udGVudFNlcnZpY2VCdW5k bGVJZGVudGlmaWVyOyB9Ci0KLSAgICBjb25zdCBXVEY6OlN0cmluZyYgaHN0c1N0b3JhZ2VEaXJl Y3RvcnkoKSBjb25zdCB7IHJldHVybiBtX2hzdHNTdG9yYWdlRGlyZWN0b3J5OyB9Ci0gICAgdm9p ZCBzZXRIU1RTU3RvcmFnZURpcmVjdG9yeShXVEY6OlN0cmluZyYmIGRpcmVjdG9yeSkgeyBtX2hz dHNTdG9yYWdlRGlyZWN0b3J5ID0gV1RGTW92ZShkaXJlY3RvcnkpOyB9CiAgICAgCiAjaWYgUExB VEZPUk0oQ09DT0EpCiAgICAgYm9vbCBzdXBwcmVzc2VzQ29ubmVjdGlvblRlcm1pbmF0aW9uT25T eXN0ZW1DaGFuZ2UoKSBjb25zdCB7IHJldHVybiBtX3N1cHByZXNzZXNDb25uZWN0aW9uVGVybWlu YXRpb25PblN5c3RlbUNoYW5nZTsgfQpAQCAtMTg3LDcgKzE4NCw2IEBAIHByaXZhdGU6CiAgICAg Ym9vbCBtX2lzSklURW5hYmxlZCB7IHRydWUgfTsKICAgICBib29sIG1fdXNlc1NpbmdsZVdlYlBy b2Nlc3MgeyBmYWxzZSB9OwogICAgIHVpbnQzMl90IG1fZG93bmxvYWRNb25pdG9yU3BlZWRNdWx0 aXBsaWVyIHsgMSB9OwotICAgIFdURjo6U3RyaW5nIG1faHN0c1N0b3JhZ2VEaXJlY3Rvcnk7CiAK ICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIFdURjo6U3RyaW5nIG1fY3REYXRhQ29ubmVj dGlvblNlcnZpY2VUeXBlOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLm1tCShy ZXZpc2lvbiAyNTAyNTQpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dL UHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zNTgsMTIgKzM1 OCwxMiBAQCAtICh2b2lkKXNldEhTVFNTdG9yYWdlRGlyZWN0b3J5OihOU1VSTCAqCiAgICAgICAg IFtOU0V4Y2VwdGlvbiByYWlzZTpOU0ludmFsaWRBcmd1bWVudEV4Y2VwdGlvbiBmb3JtYXQ6QCIl QCBpcyBub3QgYSBmaWxlIFVSTCIsIGRpcmVjdG9yeV07CiAKICAgICAvLyBGSVhNRTogTW92ZSB0 aGlzIHRvIF9XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uIG9uY2UgcmRhcjovL3Byb2Js ZW0vNTAxMDk2MzEgaXMgZml4ZWQuCi0gICAgX3Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi0+c2V0 SFNUU1N0b3JhZ2VEaXJlY3RvcnkoZGlyZWN0b3J5LnBhdGgpOworICAgIFdlYktpdDo6TGVnYWN5 R2xvYmFsU2V0dGluZ3M6OnNpbmdsZXRvbigpLnNldEhTVFNTdG9yYWdlRGlyZWN0b3J5KGRpcmVj dG9yeS5wYXRoKTsKIH0KIAogLSAoTlNVUkwgKiloc3RzU3RvcmFnZURpcmVjdG9yeQogewotICAg IHJldHVybiBbTlNVUkwgZmlsZVVSTFdpdGhQYXRoOl9wcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24t PmhzdHNTdG9yYWdlRGlyZWN0b3J5KCkgaXNEaXJlY3Rvcnk6WUVTXTsKKyAgICByZXR1cm4gW05T VVJMIGZpbGVVUkxXaXRoUGF0aDpXZWJLaXQ6OkxlZ2FjeUdsb2JhbFNldHRpbmdzOjpzaW5nbGV0 b24oKS5oc3RzU3RvcmFnZURpcmVjdG9yeSgpIGlzRGlyZWN0b3J5OllFU107CiB9CiAKIC0gKHZv aWQpc2V0RG93bmxvYWRNb25pdG9yU3BlZWRNdWx0aXBsaWVyRm9yVGVzdGluZzooTlNVSW50ZWdl ciltdWx0aXBsaWVyCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJL aXRXZWJDb250ZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvZ2xpYi9XZWJLaXRXZWJDb250ZXh0LmNwcAkocmV2aXNpb24gMjUwMjU0KQorKysgU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0V2ViQ29udGV4dC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTMyOCw3ICszMjgsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJDb250ZXh0Q29u c3RydWN0ZWQoCiAgICAgICAgIHByaXYtPndlYnNpdGVEYXRhTWFuYWdlciA9IGFkb3B0R1JlZih3 ZWJraXRfd2Vic2l0ZV9kYXRhX21hbmFnZXJfbmV3KCJsb2NhbC1zdG9yYWdlLWRpcmVjdG9yeSIs IHByaXYtPmxvY2FsU3RvcmFnZURpcmVjdG9yeS5kYXRhKCksIG51bGxwdHIpKTsKIAogICAgIGlm ICghd2Via2l0X3dlYnNpdGVfZGF0YV9tYW5hZ2VyX2lzX2VwaGVtZXJhbChwcml2LT53ZWJzaXRl RGF0YU1hbmFnZXIuZ2V0KCkpKQotICAgICAgICBjb25maWd1cmF0aW9uLnNldEhTVFNTdG9yYWdl RGlyZWN0b3J5KEZpbGVTeXN0ZW06OnN0cmluZ0Zyb21GaWxlU3lzdGVtUmVwcmVzZW50YXRpb24o d2Via2l0X3dlYnNpdGVfZGF0YV9tYW5hZ2VyX2dldF9oc3RzX2NhY2hlX2RpcmVjdG9yeShwcml2 LT53ZWJzaXRlRGF0YU1hbmFnZXIuZ2V0KCkpKSk7CisgICAgICAgIFdlYktpdDo6TGVnYWN5R2xv YmFsU2V0dGluZ3M6OnNpbmdsZXRvbigpLi5zZXRIU1RTU3RvcmFnZURpcmVjdG9yeShGaWxlU3lz dGVtOjpzdHJpbmdGcm9tRmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKHdlYmtpdF93ZWJzaXRlX2Rh dGFfbWFuYWdlcl9nZXRfaHN0c19jYWNoZV9kaXJlY3RvcnkocHJpdi0+d2Vic2l0ZURhdGFNYW5h Z2VyLmdldCgpKSkpOwogCiAgICAgcHJpdi0+cHJvY2Vzc1Bvb2wgPSBXZWJQcm9jZXNzUG9vbDo6 Y3JlYXRlKGNvbmZpZ3VyYXRpb24pOwogICAgIHByaXYtPnByb2Nlc3NQb29sLT5zZXRQcmltYXJ5 RGF0YVN0b3JlKHdlYmtpdFdlYnNpdGVEYXRhTWFuYWdlckdldERhdGFTdG9yZShwcml2LT53ZWJz aXRlRGF0YU1hbmFnZXIuZ2V0KCkpKTsK 379445 2019-09-24 06:33:42 -0700 2019-09-24 11:52:33 -0700 Patch bug-202059-20190924063341.patch text/plain 7148 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTAyNjcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE5LTA5LTI0ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTW92ZSBIU1RTIHN0 b3JhZ2UgZGlyZWN0b3J5IHRvIExlZ2FjeUdsb2JhbFNldHRpbmdzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDIwNTkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJIGNvbnRpbnVlIG15IGxhbWVudGF0aW9u IGJlZ3VuIGluIHIyNDUwNzUuCisgICAgICAgIFJlbW92ZSB0aGUgZ2xpYiBzZXR0aW5nIG9mIGl0 IG9uIHRoZSBXZWJLaXRXZWJDb250ZXh0IGJlY2F1c2UgdGhleSB1c2UgaXQgb24gdGhlIFdlYnNp dGVEYXRhU3RvcmUuICBXZSBzaG91bGQgZG8gdGhhdCB0b28gd2hlbiB3ZSBjYW4uCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5jcHA6CisgICAg ICAgIChBUEk6OlByb2Nlc3NQb29sQ29uZmlndXJhdGlvbjo6Y29weSk6CisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uaDoKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL0NvY29hL19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5tbToKKyAgICAgICAg KC1bX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIHNldEhTVFNTdG9yYWdlRGlyZWN0b3J5Ol0p OgorICAgICAgICAoLVtfV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gaHN0c1N0b3JhZ2VEaXJl Y3RvcnldKToKKyAgICAgICAgKiBVSVByb2Nlc3MvTGVnYWN5R2xvYmFsU2V0dGluZ3MuaDoKKyAg ICAgICAgKFdlYktpdDo6TGVnYWN5R2xvYmFsU2V0dGluZ3M6OnNldEhTVFNTdG9yYWdlRGlyZWN0 b3J5KToKKyAgICAgICAgKFdlYktpdDo6TGVnYWN5R2xvYmFsU2V0dGluZ3M6OmhzdHNTdG9yYWdl RGlyZWN0b3J5IGNvbnN0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6ZW5zdXJlTmV0d29ya1Byb2Nlc3Mp OgorCiAyMDE5LTA5LTIzICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgog CiAgICAgICAgIG1hY09TOiA8ZGF0YWxpc3Q+IGRyb3Bkb3duIHNoYWRvdyBpcyBjcm9wcGVkLCBs b29rcyBub3RoaW5nIGxpa2UgTlNDb21ib0JveApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nl c3MvTGVnYWN5R2xvYmFsU2V0dGluZ3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9MZWdhY3lHbG9iYWxTZXR0aW5ncy5oCShyZXZpc2lvbiAyNTAyNTQpCisrKyBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9MZWdhY3lHbG9iYWxTZXR0aW5ncy5oCSh3b3JraW5nIGNvcHkp CkBAIC0yNyw2ICsyNyw3IEBACiAKICNpbmNsdWRlICJDYWNoZU1vZGVsLmgiCiAjaW5jbHVkZSA8 d3RmL0ZvcndhcmQuaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogbmFtZXNw YWNlIFdlYktpdCB7CiAKQEAgLTM4LDExICszOSwxNSBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRD YWNoZU1vZGVsKENhY2hlTW9kZWwpOwogICAgIENhY2hlTW9kZWwgY2FjaGVNb2RlbCgpIGNvbnN0 IHsgcmV0dXJuIG1fY2FjaGVNb2RlbDsgfQogICAgIAorICAgIHZvaWQgc2V0SFNUU1N0b3JhZ2VE aXJlY3RvcnkoU3RyaW5nJiYgZGlyZWN0b3J5KSB7IG1faHN0c1N0b3JhZ2VEaXJlY3RvcnkgPSBX VEZNb3ZlKGRpcmVjdG9yeSk7IH0KKyAgICBjb25zdCBTdHJpbmcmIGhzdHNTdG9yYWdlRGlyZWN0 b3J5KCkgY29uc3QgeyByZXR1cm4gbV9oc3RzU3RvcmFnZURpcmVjdG9yeTsgfQorICAgIAogcHJp dmF0ZToKICAgICBmcmllbmQgY2xhc3MgTmV2ZXJEZXN0cm95ZWQ8TGVnYWN5R2xvYmFsU2V0dGlu Z3M+OwogICAgIExlZ2FjeUdsb2JhbFNldHRpbmdzKCk7CiAgICAgCiAgICAgQ2FjaGVNb2RlbCBt X2NhY2hlTW9kZWwgeyBDYWNoZU1vZGVsOjpQcmltYXJ5V2ViQnJvd3NlciB9OworICAgIFN0cmlu ZyBtX2hzdHNTdG9yYWdlRGlyZWN0b3J5OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cklu ZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCShyZXZpc2lv biAyNTAyNTQpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTUyMyw3ICs1MjMsNyBAQCBOZXR3b3JrUHJvY2Vzc1Byb3h5JiBX ZWJQcm9jZXNzUG9vbDo6ZW5zCiAjZW5kaWYKICNlbmRpZgogCi0gICAgcGFyYW1ldGVycy5oc3Rz U3RvcmFnZURpcmVjdG9yeSA9IG1fY29uZmlndXJhdGlvbi0+aHN0c1N0b3JhZ2VEaXJlY3Rvcnko KTsKKyAgICBwYXJhbWV0ZXJzLmhzdHNTdG9yYWdlRGlyZWN0b3J5ID0gTGVnYWN5R2xvYmFsU2V0 dGluZ3M6OnNpbmdsZXRvbigpLmhzdHNTdG9yYWdlRGlyZWN0b3J5KCk7CiAgICAgaWYgKCFwYXJh bWV0ZXJzLmhzdHNTdG9yYWdlRGlyZWN0b3J5LmlzTnVsbCgpKQogICAgICAgICBTYW5kYm94RXh0 ZW5zaW9uOjpjcmVhdGVIYW5kbGVGb3JSZWFkV3JpdGVEaXJlY3RvcnkocGFyYW1ldGVycy5oc3Rz U3RvcmFnZURpcmVjdG9yeSwgcGFyYW1ldGVycy5oc3RzU3RvcmFnZURpcmVjdG9yeUV4dGVuc2lv bkhhbmRsZSk7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNz UG9vbENvbmZpZ3VyYXRpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uY3BwCShyZXZpc2lvbiAyNTAyNTQp CisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0 aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzcsNyArNzcsNiBAQCBSZWY8UHJvY2Vzc1Bvb2xD b25maWd1cmF0aW9uPiBQcm9jZXNzUG9vCiAjZW5kaWYKICAgICBjb3B5LT5tX2N1c3RvbVdlYkNv bnRlbnRTZXJ2aWNlQnVuZGxlSWRlbnRpZmllciA9IHRoaXMtPm1fY3VzdG9tV2ViQ29udGVudFNl cnZpY2VCdW5kbGVJZGVudGlmaWVyOwogICAgIGNvcHktPm1fdXNlc1NpbmdsZVdlYlByb2Nlc3Mg PSBtX3VzZXNTaW5nbGVXZWJQcm9jZXNzOwotICAgIGNvcHktPm1faHN0c1N0b3JhZ2VEaXJlY3Rv cnkgPSBtX2hzdHNTdG9yYWdlRGlyZWN0b3J5OwogCiAgICAgcmV0dXJuIGNvcHk7CiB9CkluZGV4 OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9u LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQ b29sQ29uZmlndXJhdGlvbi5oCShyZXZpc2lvbiAyNTAyNTQpCisrKyBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmgJKHdvcmtpbmcgY29weSkK QEAgLTE0Nyw5ICsxNDcsNiBAQCBwdWJsaWM6CiAKICAgICBjb25zdCBXVEY6OlN0cmluZyYgY3Vz dG9tV2ViQ29udGVudFNlcnZpY2VCdW5kbGVJZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9j dXN0b21XZWJDb250ZW50U2VydmljZUJ1bmRsZUlkZW50aWZpZXI7IH0KICAgICB2b2lkIHNldEN1 c3RvbVdlYkNvbnRlbnRTZXJ2aWNlQnVuZGxlSWRlbnRpZmllcihjb25zdCBXVEY6OlN0cmluZyYg Y3VzdG9tV2ViQ29udGVudFNlcnZpY2VCdW5kbGVJZGVudGlmaWVyKSB7IG1fY3VzdG9tV2ViQ29u dGVudFNlcnZpY2VCdW5kbGVJZGVudGlmaWVyID0gY3VzdG9tV2ViQ29udGVudFNlcnZpY2VCdW5k bGVJZGVudGlmaWVyOyB9Ci0KLSAgICBjb25zdCBXVEY6OlN0cmluZyYgaHN0c1N0b3JhZ2VEaXJl Y3RvcnkoKSBjb25zdCB7IHJldHVybiBtX2hzdHNTdG9yYWdlRGlyZWN0b3J5OyB9Ci0gICAgdm9p ZCBzZXRIU1RTU3RvcmFnZURpcmVjdG9yeShXVEY6OlN0cmluZyYmIGRpcmVjdG9yeSkgeyBtX2hz dHNTdG9yYWdlRGlyZWN0b3J5ID0gV1RGTW92ZShkaXJlY3RvcnkpOyB9CiAgICAgCiAjaWYgUExB VEZPUk0oQ09DT0EpCiAgICAgYm9vbCBzdXBwcmVzc2VzQ29ubmVjdGlvblRlcm1pbmF0aW9uT25T eXN0ZW1DaGFuZ2UoKSBjb25zdCB7IHJldHVybiBtX3N1cHByZXNzZXNDb25uZWN0aW9uVGVybWlu YXRpb25PblN5c3RlbUNoYW5nZTsgfQpAQCAtMTg3LDcgKzE4NCw2IEBAIHByaXZhdGU6CiAgICAg Ym9vbCBtX2lzSklURW5hYmxlZCB7IHRydWUgfTsKICAgICBib29sIG1fdXNlc1NpbmdsZVdlYlBy b2Nlc3MgeyBmYWxzZSB9OwogICAgIHVpbnQzMl90IG1fZG93bmxvYWRNb25pdG9yU3BlZWRNdWx0 aXBsaWVyIHsgMSB9OwotICAgIFdURjo6U3RyaW5nIG1faHN0c1N0b3JhZ2VEaXJlY3Rvcnk7CiAK ICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIFdURjo6U3RyaW5nIG1fY3REYXRhQ29ubmVj dGlvblNlcnZpY2VUeXBlOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLm1tCShy ZXZpc2lvbiAyNTAyNTQpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dL UHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zNTgsMTIgKzM1 OCwxMiBAQCAtICh2b2lkKXNldEhTVFNTdG9yYWdlRGlyZWN0b3J5OihOU1VSTCAqCiAgICAgICAg IFtOU0V4Y2VwdGlvbiByYWlzZTpOU0ludmFsaWRBcmd1bWVudEV4Y2VwdGlvbiBmb3JtYXQ6QCIl QCBpcyBub3QgYSBmaWxlIFVSTCIsIGRpcmVjdG9yeV07CiAKICAgICAvLyBGSVhNRTogTW92ZSB0 aGlzIHRvIF9XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uIG9uY2UgcmRhcjovL3Byb2Js ZW0vNTAxMDk2MzEgaXMgZml4ZWQuCi0gICAgX3Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi0+c2V0 SFNUU1N0b3JhZ2VEaXJlY3RvcnkoZGlyZWN0b3J5LnBhdGgpOworICAgIFdlYktpdDo6TGVnYWN5 R2xvYmFsU2V0dGluZ3M6OnNpbmdsZXRvbigpLnNldEhTVFNTdG9yYWdlRGlyZWN0b3J5KGRpcmVj dG9yeS5wYXRoKTsKIH0KIAogLSAoTlNVUkwgKiloc3RzU3RvcmFnZURpcmVjdG9yeQogewotICAg IHJldHVybiBbTlNVUkwgZmlsZVVSTFdpdGhQYXRoOl9wcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24t PmhzdHNTdG9yYWdlRGlyZWN0b3J5KCkgaXNEaXJlY3Rvcnk6WUVTXTsKKyAgICByZXR1cm4gW05T VVJMIGZpbGVVUkxXaXRoUGF0aDpXZWJLaXQ6OkxlZ2FjeUdsb2JhbFNldHRpbmdzOjpzaW5nbGV0 b24oKS5oc3RzU3RvcmFnZURpcmVjdG9yeSgpIGlzRGlyZWN0b3J5OllFU107CiB9CiAKIC0gKHZv aWQpc2V0RG93bmxvYWRNb25pdG9yU3BlZWRNdWx0aXBsaWVyRm9yVGVzdGluZzooTlNVSW50ZWdl ciltdWx0aXBsaWVyCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJL aXRXZWJDb250ZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvZ2xpYi9XZWJLaXRXZWJDb250ZXh0LmNwcAkocmV2aXNpb24gMjUwMjU0KQorKysgU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0V2ViQ29udGV4dC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTMyOCw3ICszMjgsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJDb250ZXh0Q29u c3RydWN0ZWQoCiAgICAgICAgIHByaXYtPndlYnNpdGVEYXRhTWFuYWdlciA9IGFkb3B0R1JlZih3 ZWJraXRfd2Vic2l0ZV9kYXRhX21hbmFnZXJfbmV3KCJsb2NhbC1zdG9yYWdlLWRpcmVjdG9yeSIs IHByaXYtPmxvY2FsU3RvcmFnZURpcmVjdG9yeS5kYXRhKCksIG51bGxwdHIpKTsKIAogICAgIGlm ICghd2Via2l0X3dlYnNpdGVfZGF0YV9tYW5hZ2VyX2lzX2VwaGVtZXJhbChwcml2LT53ZWJzaXRl RGF0YU1hbmFnZXIuZ2V0KCkpKQotICAgICAgICBjb25maWd1cmF0aW9uLnNldEhTVFNTdG9yYWdl RGlyZWN0b3J5KEZpbGVTeXN0ZW06OnN0cmluZ0Zyb21GaWxlU3lzdGVtUmVwcmVzZW50YXRpb24o d2Via2l0X3dlYnNpdGVfZGF0YV9tYW5hZ2VyX2dldF9oc3RzX2NhY2hlX2RpcmVjdG9yeShwcml2 LT53ZWJzaXRlRGF0YU1hbmFnZXIuZ2V0KCkpKSk7CisgICAgICAgIFdlYktpdDo6TGVnYWN5R2xv YmFsU2V0dGluZ3M6OnNpbmdsZXRvbigpLnNldEhTVFNTdG9yYWdlRGlyZWN0b3J5KEZpbGVTeXN0 ZW06OnN0cmluZ0Zyb21GaWxlU3lzdGVtUmVwcmVzZW50YXRpb24od2Via2l0X3dlYnNpdGVfZGF0 YV9tYW5hZ2VyX2dldF9oc3RzX2NhY2hlX2RpcmVjdG9yeShwcml2LT53ZWJzaXRlRGF0YU1hbmFn ZXIuZ2V0KCkpKSk7CiAKICAgICBwcml2LT5wcm9jZXNzUG9vbCA9IFdlYlByb2Nlc3NQb29sOjpj cmVhdGUoY29uZmlndXJhdGlvbik7CiAgICAgcHJpdi0+cHJvY2Vzc1Bvb2wtPnNldFByaW1hcnlE YXRhU3RvcmUod2Via2l0V2Vic2l0ZURhdGFNYW5hZ2VyR2V0RGF0YVN0b3JlKHByaXYtPndlYnNp dGVEYXRhTWFuYWdlci5nZXQoKSkpOwo=