217547 2020-10-09 18:00:12 -0700 DownloadProxy::cancel should take a CompletionHandler 2020-10-12 07:33:24 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen beidson berto cgarcia ews-watchlist gustavo webkit-bug-importer youennf oldest_to_newest 1696427 0 achristensen 2020-10-09 18:00:12 -0700 DownloadProxy::cancel should take a CompletionHandler 1696433 1 410992 achristensen 2020-10-09 18:04:25 -0700 Created attachment 410992 Patch 1696435 2 ews-watchlist 2020-10-09 18:05:32 -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 https://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1696838 3 ews-feeder 2020-10-12 07:32:04 -0700 Committed r268349: <https://trac.webkit.org/changeset/268349> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410992. 1696840 4 webkit-bug-importer 2020-10-12 07:33:24 -0700 <rdar://problem/70206059> 410992 2020-10-09 18:04:25 -0700 2020-10-12 07:32:05 -0700 Patch bug-217547-20201009180425.patch text/plain 11983 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjgzMDQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ1IEBACisyMDIwLTEwLTA5ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRG93bmxvYWRQcm94 eTo6Y2FuY2VsIHNob3VsZCB0YWtlIGEgQ29tcGxldGlvbkhhbmRsZXIKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzU0NworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF2ZXMgdGhlIHdheSBmb3Ig YSBuZXcgZG93bmxvYWQgY2FuY2VsIEFQSSB0aGF0IGxvb2tzIGxpa2UgdGhpczoKKyAgICAgICAg LSAodm9pZCljYW5jZWxCeVByb2R1Y2luZ1Jlc3VtZURhdGE6KHZvaWQgKF4pKE5TRGF0YSAqcmVz dW1lRGF0YSkpY29tcGxldGlvbkhhbmRsZXI7CisgICAgICAgIEluIG9yZGVyIHRvIGRvIHRoaXMs IHdlIHB1c2ggdGhlIGxlZ2FjeSBkaWRDYW5jZWwgY2xpZW50IGNhbGwgaW50byB0aGUgbGVnYWN5 IEFQSSBpbXBsZW1lbnRhdGlvbnMuCisKKyAgICAgICAgVGhlIHJlc3VtZSBkYXRhIHdpbGwgYmUg YWNjZXNzaWJsZSB0aHJvdWdoIHRoaXMgY29tcGxldGlvbiBoYW5kbGVyIGFuZCB0aGUgZGlkRmFp bCBjYWxsYmFjaworICAgICAgICBpbnN0ZWFkIG9mIHF1ZXJ5aW5nIHRoZSBEb3dubG9hZFByb3h5 IHdyYXBwZXIgZm9yIGl0LCBzbyBJIHJlbmFtZWQgaXQgdG8gbGVnYWN5UmVzdW1lRGF0YS4KKwor ICAgICAgICBObyBjaGFuZ2UgaW4gYmVoYXZpb3IsIGFzIHZlcmlmaWVkIGJ5IGV4aXN0aW5nIHRl c3RzLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9BUElEb3dubG9hZENsaWVudC5oOgorICAg ICAgICAoQVBJOjpEb3dubG9hZENsaWVudDo6bGVnYWN5RGlkQ2FuY2VsKToKKyAgICAgICAgKEFQ STo6RG93bmxvYWRDbGllbnQ6OmRpZENhbmNlbCk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9DL1dLQ29udGV4dC5jcHA6CisgICAgICAgIChXS0NvbnRleHRTZXREb3dubG9hZENs aWVudCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLRG93bmxvYWQuY3BwOgorICAgICAg ICAoV0tEb3dubG9hZEdldFJlc3VtZURhdGEpOgorICAgICAgICAoV0tEb3dubG9hZENhbmNlbCk6 CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tEb3dubG9hZC5tbToKKyAgICAgICAg KC1bX1dLRG93bmxvYWQgY2FuY2VsXSk6CisgICAgICAgICgtW19XS0Rvd25sb2FkIHJlc3VtZURh dGFdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0RG93bmxvYWQuY3BwOgor ICAgICAgICAod2Via2l0X2Rvd25sb2FkX2NhbmNlbCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9nbGliL1dlYktpdERvd25sb2FkQ2xpZW50LmNwcDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29j b2EvTGVnYWN5RG93bmxvYWRDbGllbnQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvTGVn YWN5RG93bmxvYWRDbGllbnQubW06CisgICAgICAgIChXZWJLaXQ6OkxlZ2FjeURvd25sb2FkQ2xp ZW50OjpsZWdhY3lEaWRDYW5jZWwpOgorICAgICAgICAoV2ViS2l0OjpMZWdhY3lEb3dubG9hZENs aWVudDo6ZGlkQ2FuY2VsKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvRG93bmxvYWRz L0Rvd25sb2FkUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpEb3dubG9hZFByb3h5OjpjYW5j ZWwpOgorICAgICAgICAoV2ViS2l0OjpEb3dubG9hZFByb3h5OjpkaWRGYWlsKToKKyAgICAgICAg KiBVSVByb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6 RG93bmxvYWRQcm94eTo6bGVnYWN5UmVzdW1lRGF0YSBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6 OkRvd25sb2FkUHJveHk6OmNsaWVudCk6CisgICAgICAgIChXZWJLaXQ6OkRvd25sb2FkUHJveHk6 OnJlc3VtZURhdGEgY29uc3QpOiBEZWxldGVkLgorCiAyMDIwLTEwLTA5ICBXZW5zb24gSHNpZWgg IDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFtHUFUgUHJvY2Vzc10gQWRkIGFk ZGl0aW9uYWwgc3VwcG9ydCBmb3IgcGFpbnRpbmcgdmlkZW8gZWxlbWVudHMgdG8gMkQgY29udGV4 dHMKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElEb3dubG9hZENsaWVudC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElEb3dubG9hZENs aWVudC5oCShyZXZpc2lvbiAyNjgyNzMpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv QVBJRG93bmxvYWRDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtNjEsNyArNjEsNyBAQCBwdWJs aWM6CiAgICAgdmlydHVhbCB2b2lkIGRpZENyZWF0ZURlc3RpbmF0aW9uKFdlYktpdDo6RG93bmxv YWRQcm94eSYsIGNvbnN0IFdURjo6U3RyaW5nJikgeyB9CiAgICAgdmlydHVhbCB2b2lkIGRpZEZp bmlzaChXZWJLaXQ6OkRvd25sb2FkUHJveHkmKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgZGlkRmFp bChXZWJLaXQ6OkRvd25sb2FkUHJveHkmLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJikg eyB9Ci0gICAgdmlydHVhbCB2b2lkIGRpZENhbmNlbChXZWJLaXQ6OkRvd25sb2FkUHJveHkmKSB7 IH0KKyAgICB2aXJ0dWFsIHZvaWQgbGVnYWN5RGlkQ2FuY2VsKFdlYktpdDo6RG93bmxvYWRQcm94 eSYpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBwcm9jZXNzRGlkQ3Jhc2goV2ViS2l0OjpEb3dubG9h ZFByb3h5JikgeyB9CiAgICAgdmlydHVhbCB2b2lkIHdpbGxTZW5kUmVxdWVzdChXZWJLaXQ6OkRv d25sb2FkUHJveHkmLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0LCBjb25zdCBX ZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChXZWJDb3Jl OjpSZXNvdXJjZVJlcXVlc3QmJik+JiYgY29tcGxldGlvbkhhbmRsZXIpIHsgY29tcGxldGlvbkhh bmRsZXIoV1RGTW92ZShyZXF1ZXN0KSk7IH0KIH07CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQy9XS0NvbnRleHQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9DL1dLQ29udGV4dC5jcHAJKHJldmlzaW9uIDI2ODI3MykKKysrIFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIy OSw3ICsyMjksNyBAQCB2b2lkIFdLQ29udGV4dFNldERvd25sb2FkQ2xpZW50KFdLQ29udGV4CiAg ICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgbV9jbGllbnQuZGlkRmFpbChtX2Nv bnRleHQsIFdlYktpdDo6dG9BUEkoJmRvd25sb2FkUHJveHkpLCBXZWJLaXQ6OnRvQVBJKGVycm9y KSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsKICAgICAgICAgfQotICAgICAgICB2b2lkIGRp ZENhbmNlbChXZWJLaXQ6OkRvd25sb2FkUHJveHkmIGRvd25sb2FkUHJveHkpIGZpbmFsCisgICAg ICAgIHZvaWQgbGVnYWN5RGlkQ2FuY2VsKFdlYktpdDo6RG93bmxvYWRQcm94eSYgZG93bmxvYWRQ cm94eSkgZmluYWwKICAgICAgICAgewogICAgICAgICAgICAgaWYgKCFtX2NsaWVudC5kaWRDYW5j ZWwpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0MvV0tEb3dubG9hZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0MvV0tEb3dubG9hZC5jcHAJKHJldmlzaW9uIDI2ODI3MykKKysrIFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLRG93bmxvYWQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0y OCw2ICsyOCw3IEBACiAKICNpbmNsdWRlICJBUElBcnJheS5oIgogI2luY2x1ZGUgIkFQSURhdGEu aCIKKyNpbmNsdWRlICJBUElEb3dubG9hZENsaWVudC5oIgogI2luY2x1ZGUgIkFQSVVSTFJlcXVl c3QuaCIKICNpbmNsdWRlICJEb3dubG9hZFByb3h5LmgiCiAjaW5jbHVkZSAiV0tBUElDYXN0Lmgi CkBAIC01MiwxMiArNTMsMTQgQEAgV0tVUkxSZXF1ZXN0UmVmIFdLRG93bmxvYWRDb3B5UmVxdWVz dChXSwogCiBXS0RhdGFSZWYgV0tEb3dubG9hZEdldFJlc3VtZURhdGEoV0tEb3dubG9hZFJlZiBk b3dubG9hZCkKIHsKLSAgICByZXR1cm4gdG9BUEkodG9JbXBsKGRvd25sb2FkKS0+cmVzdW1lRGF0 YSgpKTsKKyAgICByZXR1cm4gdG9BUEkodG9JbXBsKGRvd25sb2FkKS0+bGVnYWN5UmVzdW1lRGF0 YSgpKTsKIH0KIAogdm9pZCBXS0Rvd25sb2FkQ2FuY2VsKFdLRG93bmxvYWRSZWYgZG93bmxvYWQp CiB7Ci0gICAgcmV0dXJuIHRvSW1wbChkb3dubG9hZCktPmNhbmNlbCgpOworICAgIHJldHVybiB0 b0ltcGwoZG93bmxvYWQpLT5jYW5jZWwoW2Rvd25sb2FkID0gbWFrZVJlZigqdG9JbXBsKGRvd25s b2FkKSldIChhdXRvKikgeworICAgICAgICBkb3dubG9hZC0+Y2xpZW50KCkubGVnYWN5RGlkQ2Fu Y2VsKGRvd25sb2FkLmdldCgpKTsKKyAgICB9KTsKIH0KIAogV0tQYWdlUmVmIFdLRG93bmxvYWRH ZXRPcmlnaW5hdGluZ1BhZ2UoV0tEb3dubG9hZFJlZiBkb3dubG9hZCkKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tEb3dubG9hZC5tbQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLRG93bmxvYWQubW0JKHJldmlzaW9u IDI2ODI3MykKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tEb3dubG9h ZC5tbQkod29ya2luZyBjb3B5KQpAQCAtMjYsNiArMjYsNyBAQAogI2ltcG9ydCAiY29uZmlnLmgi CiAjaW1wb3J0ICJfV0tEb3dubG9hZEludGVybmFsLmgiCiAKKyNpbXBvcnQgIkFQSURvd25sb2Fk Q2xpZW50LmgiCiAjaW1wb3J0ICJEb3dubG9hZFByb3h5LmgiCiAjaW1wb3J0ICJXS0ZyYW1lSW5m b0ludGVybmFsLmgiCiAjaW1wb3J0ICJXS05TRGF0YS5oIgpAQCAtNDUsNyArNDYsOSBAQCAtICh2 b2lkKWRlYWxsb2MKIAogLSAodm9pZCljYW5jZWwKIHsKLSAgICBfZG93bmxvYWQtPmNhbmNlbCgp OworICAgIF9kb3dubG9hZC0+Y2FuY2VsKFtkb3dubG9hZCA9IG1ha2VSZWYoKl9kb3dubG9hZCld IChhdXRvKikgeworICAgICAgICBkb3dubG9hZC0+Y2xpZW50KCkubGVnYWN5RGlkQ2FuY2VsKGRv d25sb2FkLmdldCgpKTsKKyAgICB9KTsKIH0KIAogLSAodm9pZClwdWJsaXNoUHJvZ3Jlc3NBdFVS TDooTlNVUkwgKilVUkwKQEAgLTc5LDcgKzgyLDcgQEAgLSAoQk9PTCl3YXNVc2VySW5pdGlhdGVk CiAKIC0gKE5TRGF0YSAqKXJlc3VtZURhdGEKIHsKLSAgICByZXR1cm4gV2ViS2l0Ojp3cmFwcGVy KF9kb3dubG9hZC0+cmVzdW1lRGF0YSgpKTsKKyAgICByZXR1cm4gV2ViS2l0Ojp3cmFwcGVyKF9k b3dubG9hZC0+bGVnYWN5UmVzdW1lRGF0YSgpKTsKIH0KIAogLSAoV0tGcmFtZUluZm8gKilvcmln aW5hdGluZ0ZyYW1lCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJL aXREb3dubG9hZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L2dsaWIvV2ViS2l0RG93bmxvYWQuY3BwCShyZXZpc2lvbiAyNjgyNzMpCisrKyBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXREb3dubG9hZC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTIwLDYgKzIwLDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJXZWJLaXRE b3dubG9hZC5oIgogCisjaW5jbHVkZSAiQVBJRG93bmxvYWRDbGllbnQuaCIKICNpbmNsdWRlICJE b3dubG9hZFByb3h5LmgiCiAjaW5jbHVkZSAiV2ViRXJyb3JzLmgiCiAjaW5jbHVkZSAiV2ViS2l0 RG93bmxvYWRQcml2YXRlLmgiCkBAIC01MzgsNyArNTM5LDkgQEAgdm9pZCB3ZWJraXRfZG93bmxv YWRfY2FuY2VsKFdlYktpdERvd25sbwogICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX0RP V05MT0FEKGRvd25sb2FkKSk7CiAKICAgICBkb3dubG9hZC0+cHJpdi0+aXNDYW5jZWxsZWQgPSB0 cnVlOwotICAgIGRvd25sb2FkLT5wcml2LT5kb3dubG9hZC0+Y2FuY2VsKCk7CisgICAgZG93bmxv YWQtPnByaXYtPmRvd25sb2FkLT5jYW5jZWwoW2Rvd25sb2FkID0gbWFrZVJlZigqZG93bmxvYWQt PnByaXYtPmRvd25sb2FkKV0gKGF1dG8qKSB7CisgICAgICAgIGRvd25sb2FkLT5jbGllbnQoKS5s ZWdhY3lEaWRDYW5jZWwoZG93bmxvYWQuZ2V0KCkpOworICAgIH0pOwogfQogCiAvKioKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdERvd25sb2FkQ2xpZW50LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRE b3dubG9hZENsaWVudC5jcHAJKHJldmlzaW9uIDI2ODI3MykKKysrIFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9nbGliL1dlYktpdERvd25sb2FkQ2xpZW50LmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTEyLDcgKzExMiw3IEBAIHByaXZhdGU6CiAgICAgICAgIHdlYmtpdFdlYkNvbnRleHRSZW1v dmVEb3dubG9hZCgmZG93bmxvYWRQcm94eSk7CiAgICAgfQogCi0gICAgdm9pZCBkaWRDYW5jZWwo RG93bmxvYWRQcm94eSYgZG93bmxvYWRQcm94eSkgb3ZlcnJpZGUKKyAgICB2b2lkIGxlZ2FjeURp ZENhbmNlbChEb3dubG9hZFByb3h5JiBkb3dubG9hZFByb3h5KSBvdmVycmlkZQogICAgIHsKICAg ICAgICAgR1JlZlB0cjxXZWJLaXREb3dubG9hZD4gZG93bmxvYWQgPSB3ZWJraXRXZWJDb250ZXh0 R2V0T3JDcmVhdGVEb3dubG9hZCgmZG93bmxvYWRQcm94eSk7CiAgICAgICAgIHdlYmtpdERvd25s b2FkQ2FuY2VsbGVkKGRvd25sb2FkLmdldCgpKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0NvY29hL0xlZ2FjeURvd25sb2FkQ2xpZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQ29jb2EvTGVnYWN5RG93bmxvYWRDbGllbnQuaAkocmV2aXNpb24gMjY4 MjczKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTGVnYWN5RG93bmxvYWRDbGll bnQuaAkod29ya2luZyBjb3B5KQpAQCAtNTIsNyArNTIsNyBAQCBwcml2YXRlOgogICAgIHZvaWQg ZGVjaWRlRGVzdGluYXRpb25XaXRoU3VnZ2VzdGVkRmlsZW5hbWUoRG93bmxvYWRQcm94eSYsIGNv bnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmLCBjb25zdCBTdHJpbmcmIHN1Z2dlc3RlZEZp bGVuYW1lLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKEFsbG93T3ZlcndyaXRlLCBTdHJpbmcpPiYm KSBmaW5hbDsKICAgICB2b2lkIGRpZEZpbmlzaChEb3dubG9hZFByb3h5JikgZmluYWw7CiAgICAg dm9pZCBkaWRGYWlsKERvd25sb2FkUHJveHkmLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9y JikgZmluYWw7Ci0gICAgdm9pZCBkaWRDYW5jZWwoRG93bmxvYWRQcm94eSYpIGZpbmFsOworICAg IHZvaWQgbGVnYWN5RGlkQ2FuY2VsKERvd25sb2FkUHJveHkmKSBmaW5hbDsKICAgICB2b2lkIHdp bGxTZW5kUmVxdWVzdChEb3dubG9hZFByb3h5JiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYs IGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lk KFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmKT4mJikgZmluYWw7CiAgICAgdm9pZCBkaWRSZWNl aXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2UoRG93bmxvYWRQcm94eSYsIEF1dGhlbnRpY2F0aW9u Q2hhbGxlbmdlUHJveHkmKSBmaW5hbDsKICAgICB2b2lkIGRpZENyZWF0ZURlc3RpbmF0aW9uKERv d25sb2FkUHJveHkmLCBjb25zdCBTdHJpbmcmKSBmaW5hbDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0NvY29hL0xlZ2FjeURvd25sb2FkQ2xpZW50Lm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL0xlZ2FjeURvd25sb2FkQ2xpZW50Lm1tCShyZXZp c2lvbiAyNjgyNzMpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9MZWdhY3lEb3du bG9hZENsaWVudC5tbQkod29ya2luZyBjb3B5KQpAQCAtMjUxLDcgKzI1MSw3IEBAIHZvaWQgTGVn YWN5RG93bmxvYWRDbGllbnQ6OmRpZEZhaWwoRG93bmwKICAgICAgICAgW21fZGVsZWdhdGUgX2Rv d25sb2FkOndyYXBwZXIoZG93bmxvYWRQcm94eSkgZGlkRmFpbFdpdGhFcnJvcjplcnJvci5uc0Vy cm9yKCldOwogfQogCi12b2lkIExlZ2FjeURvd25sb2FkQ2xpZW50OjpkaWRDYW5jZWwoRG93bmxv YWRQcm94eSYgZG93bmxvYWRQcm94eSkKK3ZvaWQgTGVnYWN5RG93bmxvYWRDbGllbnQ6OmxlZ2Fj eURpZENhbmNlbChEb3dubG9hZFByb3h5JiBkb3dubG9hZFByb3h5KQogewogI2lmIFVTRShTWVNU RU1fUFJFVklFVykKICAgICBpZiAoZG93bmxvYWRQcm94eS5pc1N5c3RlbVByZXZpZXdEb3dubG9h ZCgpKSB7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRQ cm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvRG93bmxvYWRz L0Rvd25sb2FkUHJveHkuY3BwCShyZXZpc2lvbiAyNjgyNzMpCisrKyBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY4 LDE1ICs2OCwxNiBAQCBzdGF0aWMgUmVmUHRyPEFQSTo6RGF0YT4gY3JlYXRlRGF0YShjb25zCiAg ICAgcmV0dXJuIEFQSTo6RGF0YTo6Y3JlYXRlKGRhdGEuZGF0YSgpLCBkYXRhLnNpemUoKSk7CiB9 CiAKLXZvaWQgRG93bmxvYWRQcm94eTo6Y2FuY2VsKCkKK3ZvaWQgRG93bmxvYWRQcm94eTo6Y2Fu Y2VsKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoQVBJOjpEYXRhKik+JiYgY29tcGxldGlvbkhhbmRs ZXIpCiB7CiAgICAgaWYgKG1fZGF0YVN0b3JlKSB7Ci0gICAgICAgIG1fZGF0YVN0b3JlLT5uZXR3 b3JrUHJvY2VzcygpLnNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3M6 OkNhbmNlbERvd25sb2FkKG1fZG93bmxvYWRJRCksIFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFr ZVJlZigqdGhpcyldIChjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIHJlc3VtZURhdGEpIHsKLSAg ICAgICAgICAgIG1fcmVzdW1lRGF0YSA9IGNyZWF0ZURhdGEocmVzdW1lRGF0YSk7Ci0gICAgICAg ICAgICBtX2NsaWVudC0+ZGlkQ2FuY2VsKCp0aGlzKTsKKyAgICAgICAgbV9kYXRhU3RvcmUtPm5l dHdvcmtQcm9jZXNzKCkuc2VuZFdpdGhBc3luY1JlcGx5KE1lc3NhZ2VzOjpOZXR3b3JrUHJvY2Vz czo6Q2FuY2VsRG93bmxvYWQobV9kb3dubG9hZElEKSwgW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBt YWtlUmVmKCp0aGlzKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5k bGVyKV0gKGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYgcmVzdW1lRGF0YSkgbXV0YWJsZSB7Cisg ICAgICAgICAgICBtX2xlZ2FjeVJlc3VtZURhdGEgPSBjcmVhdGVEYXRhKHJlc3VtZURhdGEpOwor ICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIobV9sZWdhY3lSZXN1bWVEYXRhLmdldCgpKTsK ICAgICAgICAgICAgIG1fZG93bmxvYWRQcm94eU1hcC5kb3dubG9hZEZpbmlzaGVkKCp0aGlzKTsK ICAgICAgICAgfSk7Ci0gICAgfQorICAgIH0gZWxzZQorICAgICAgICBjb21wbGV0aW9uSGFuZGxl cihudWxscHRyKTsKIH0KIAogdm9pZCBEb3dubG9hZFByb3h5OjppbnZhbGlkYXRlKCkKQEAgLTE3 MCw3ICsxNzEsNyBAQCB2b2lkIERvd25sb2FkUHJveHk6OmRpZEZpbmlzaCgpCiAKIHZvaWQgRG93 bmxvYWRQcm94eTo6ZGlkRmFpbChjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJvciwgY29uc3QgSVBD OjpEYXRhUmVmZXJlbmNlJiByZXN1bWVEYXRhKQogewotICAgIG1fcmVzdW1lRGF0YSA9IGNyZWF0 ZURhdGEocmVzdW1lRGF0YSk7CisgICAgbV9sZWdhY3lSZXN1bWVEYXRhID0gY3JlYXRlRGF0YShy ZXN1bWVEYXRhKTsKIAogICAgIG1fY2xpZW50LT5kaWRGYWlsKCp0aGlzLCBlcnJvcik7CiAKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZFByb3h5LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkUHJv eHkuaAkocmV2aXNpb24gMjY4MjczKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvRG93bmxv YWRzL0Rvd25sb2FkUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtNjksOSArNjksOSBAQCBwdWJs aWM6CiAKICAgICBEb3dubG9hZElEIGRvd25sb2FkSUQoKSBjb25zdCB7IHJldHVybiBtX2Rvd25s b2FkSUQ7IH0KICAgICBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QoKSBj b25zdCB7IHJldHVybiBtX3JlcXVlc3Q7IH0KLSAgICBBUEk6OkRhdGEqIHJlc3VtZURhdGEoKSBj b25zdCB7IHJldHVybiBtX3Jlc3VtZURhdGEuZ2V0KCk7IH0KKyAgICBBUEk6OkRhdGEqIGxlZ2Fj eVJlc3VtZURhdGEoKSBjb25zdCB7IHJldHVybiBtX2xlZ2FjeVJlc3VtZURhdGEuZ2V0KCk7IH0K IAotICAgIHZvaWQgY2FuY2VsKCk7CisgICAgdm9pZCBjYW5jZWwoQ29tcGxldGlvbkhhbmRsZXI8 dm9pZChBUEk6OkRhdGEqKT4mJik7CiAKICAgICB2b2lkIGludmFsaWRhdGUoKTsKICAgICB2b2lk IHByb2Nlc3NEaWRDbG9zZSgpOwpAQCAtMTAxLDYgKzEwMSw4IEBAIHB1YmxpYzoKIAogICAgIEFQ STo6RnJhbWVJbmZvJiBmcmFtZUluZm8oKSB7IHJldHVybiBtX2ZyYW1lSW5mby5nZXQoKTsgfQog CisgICAgQVBJOjpEb3dubG9hZENsaWVudCYgY2xpZW50KCkgeyByZXR1cm4gbV9jbGllbnQuZ2V0 KCk7IH0KKwogcHJpdmF0ZToKICAgICBleHBsaWNpdCBEb3dubG9hZFByb3h5KERvd25sb2FkUHJv eHlNYXAmLCBXZWJzaXRlRGF0YVN0b3JlJiwgQVBJOjpEb3dubG9hZENsaWVudCYsIGNvbnN0IFdl YkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGNvbnN0IEZyYW1lSW5mb0RhdGEmLCBXZWJQYWdlUHJv eHkqKTsKIApAQCAtMTIzLDcgKzEyNSw3IEBAIHByaXZhdGU6CiAgICAgUmVmPEFQSTo6RG93bmxv YWRDbGllbnQ+IG1fY2xpZW50OwogICAgIERvd25sb2FkSUQgbV9kb3dubG9hZElEOwogCi0gICAg UmVmUHRyPEFQSTo6RGF0YT4gbV9yZXN1bWVEYXRhOworICAgIFJlZlB0cjxBUEk6OkRhdGE+IG1f bGVnYWN5UmVzdW1lRGF0YTsKICAgICBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QgbV9yZXF1ZXN0 OwogICAgIFN0cmluZyBtX3N1Z2dlc3RlZEZpbGVuYW1lOwogICAgIFN0cmluZyBtX2Rlc3RpbmF0 aW9uRmlsZW5hbWU7Cg==