132224 2014-04-26 20:37:23 -0700 Webpages can trigger loads with invalid URLs 2018-09-13 09:47:12 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=189554 InRadar P2 Normal --- 1 darin darin ap commit-queue dbates ddkilzer esprehn+autocc japhet kangil.han rhodovan.u-szeged oldest_to_newest 1004372 0 darin 2014-04-26 20:37:23 -0700 Webpages can trigger loads with invalid URLs 1004373 1 230252 darin 2014-04-26 20:44:33 -0700 Created attachment 230252 Patch 1004382 2 ddkilzer 2014-04-27 01:07:59 -0700 (In reply to comment #1) > Created an attachment (id=230252) [details] > Patch I think this patch may be missing changes that were landed by accident in r167851 for Bug 132089: <http://trac.webkit.org/changeset/167851> 1004384 3 ddkilzer 2014-04-27 01:21:24 -0700 (In reply to comment #2) > (In reply to comment #1) > > Created an attachment (id=230252) [details] [details] > > Patch > > I think this patch may be missing changes that were landed by accident in r167851 for Bug 132089: > > <http://trac.webkit.org/changeset/167851> These changes were rolled out in r167852: <http://trac.webkit.org/changeset/167852> 1004408 4 darin 2014-04-27 09:05:58 -0700 (In reply to comment #3) > (In reply to comment #2) > > (In reply to comment #1) > > I think this patch may be missing changes that were landed by accident in r167851 for Bug 132089: > > > > <http://trac.webkit.org/changeset/167851> > > These changes were rolled out in r167852: > > <http://trac.webkit.org/changeset/167852> Those changes were from a different try at fixing this bug; they are not needed. 1004409 5 darin 2014-04-27 09:06:52 -0700 Committed r167856: <http://trac.webkit.org/changeset/167856> 1004566 6 rhodovan.u-szeged 2014-04-28 07:03:23 -0700 *** Bug 130894 has been marked as a duplicate of this bug. *** 1014788 7 dbates 2014-06-11 10:03:00 -0700 <rdar://problem/16697142> 1016213 8 dbates 2014-06-17 12:43:37 -0700 (In reply to comment #5) > Committed r167856: <http://trac.webkit.org/changeset/167856> This change regressed the HSBC app. See bug #133991 for more details. 230252 2014-04-26 20:44:33 -0700 2014-04-26 22:20:21 -0700 Patch bug-132224-20140426204412.patch text/plain 18734 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3ODQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjAxZTc4ZTFiZGRjNDg5 YzUyNTc4MzUwZDlkODA3OTdhN2ZhNmM4My4uZDY4ZWVjMDM1MjgzYjA0ZjI0NjU4OGE5OWNiMjE5 NmFjMGMzMDk4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUyIEBACisyMDE0LTA0LTI2ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJwYWdlcyBjYW4gdHJpZ2dl ciBsb2FkcyB3aXRoIGludmFsaWQgVVJMcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTMyMjI0CisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzE2Njk3MTQy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW52YWxp ZCBVUkxzIGNhbiBiZSBhIHdheSB0byB0cmljayB0aGUgdXNlciBhYm91dCB3aGF0IHdlYnNpdGUg dGhleQorICAgICAgICBhcmUgbG9va2luZyBhdC4gIFN0aWxsIHRyeWluZyB0byBmaWd1cmUgb3V0 IGEgZ29vZCB3YXkgdG8gcmVncmVzc2lvbi10ZXN0IHRoaXMuCisKKyAgICAgICAgKiBkb20vRG9j dW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnByb2Nlc3NIdHRwRXF1aXYp OiBQYXNzIGEgVVJMIHJhdGhlciB0aGFuIGEgU3RyaW5nIHRvCisgICAgICAgIHRoZSBuYXZpZ2F0 aW9uIHNjaGVkdWxlci4KKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OnJlY2VpdmVkRmlyc3REYXRhKTogRGl0dG8uCisKKyAg ICAgICAgKiBsb2FkZXIvTmF2aWdhdGlvblNjaGVkdWxlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpTY2hlZHVsZWRVUkxOYXZpZ2F0aW9uOjpTY2hlZHVsZWRVUkxOYXZpZ2F0aW9uKTogVGFrZSBh IFVSTCByYXRoZXIKKyAgICAgICAgdGhhbiBhIHN0cmluZy4KKyAgICAgICAgKFdlYkNvcmU6OlNj aGVkdWxlZFVSTE5hdmlnYXRpb246OnVybCk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6U2No ZWR1bGVkUmVkaXJlY3Q6OlNjaGVkdWxlZFJlZGlyZWN0KTogRGl0dG8uCisgICAgICAgIChXZWJD b3JlOjpTY2hlZHVsZWRMb2NhdGlvbkNoYW5nZTo6U2NoZWR1bGVkTG9jYXRpb25DaGFuZ2UpOiBE aXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlNjaGVkdWxlZFJlZnJlc2g6OlNjaGVkdWxlZFJlZnJl c2gpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6Ok5hdmlnYXRpb25TY2hlZHVsZXI6OnNob3Vs ZFNjaGVkdWxlTmF2aWdhdGlvbik6IEFkZGVkIGEgY2hlY2sgdGhhdAorICAgICAgICBwcmV2ZW50 cyBuYXZpZ2F0aW9uIHRvIGFueSBVUkwgdGhhdCBpcyBpbnZhbGlkLCBleGNlcHQgZm9yIEphdmFT Y3JpcHQgVVJMcywKKyAgICAgICAgd2hpY2ggbmVlZCBub3QgYmUgdmFsaWQuCisgICAgICAgIChX ZWJDb3JlOjpOYXZpZ2F0aW9uU2NoZWR1bGVyOjpzY2hlZHVsZVJlZGlyZWN0KTogVXNlIFVSTCBp bnN0ZWFkIG9mIFN0cmluZy4KKyAgICAgICAgKFdlYkNvcmU6Ok5hdmlnYXRpb25TY2hlZHVsZXI6 OnNjaGVkdWxlTG9jYXRpb25DaGFuZ2UpOiBVc2UgVVJMIGluc3RlYWQgb2YKKyAgICAgICAgU3Ry aW5nLiBBbHNvIGdvdCByaWQgb2YgZW1wdHkgc3RyaW5nIGNoZWNrIHNpbmNlIGVtcHR5IFVSTHMg YXJlIGFsc28gaW52YWxpZCwKKyAgICAgICAgYW5kIHNvIHNob3VsZFNjaGVkdWxlTmF2aWdhdGlv biB3aWxsIHRha2UgY2FyZSBvZiBpdC4KKyAgICAgICAgKFdlYkNvcmU6Ok5hdmlnYXRpb25TY2hl ZHVsZXI6OnNjaGVkdWxlUmVmcmVzaCk6IFVzZSBVUkwgaW5zdGVhZCBvZiBTdHJpbmcuCisKKyAg ICAgICAgKiBsb2FkZXIvTmF2aWdhdGlvblNjaGVkdWxlci5oOiBUYWtlIFVSTCBpbnN0ZWFkIG9m IFN0cmluZy4gQWxzbyByZW1vdmVkIHNvbWUKKyAgICAgICAgdW5uZWVkZWQgaW5jbGR1ZXMgYW5k IHVzZXMgb2YgV1RGX01BS0VfTk9OQ09QWUFCTEUuIE5hdmlnYXRpb25TY2hlZHVsZXIgaXMKKyAg ICAgICAgYWxyZWFkeSBub25jb3B5YWJsZSBiZWNhdXNlIGl0IGhhcyBhIHJlZmVyZW5jZSBmb3Ig YSBkYXRhIG1lbWJlciwgYW5kIHRoZQorICAgICAgICBkaXNhYmxlciBkb2Vzbid0IGhhdmUgYW55 IHJlYWwgcmVhc29uIHRvIGJlIG5vbmNvcHlhYmxlLgorCisgICAgICAgICogbG9hZGVyL1N1YmZy YW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN1YmZyYW1lTG9hZGVyOjpsb2FkT3JS ZWRpcmVjdFN1YmZyYW1lKTogUGFzcyBhIFVSTCByYXRoZXIgdGhhbiBhCisgICAgICAgIFN0cmlu ZyB0byB0aGUgTmF2aWdhdGlvblNjaGVkdWxlci4KKyAgICAgICAgKiBwYWdlL0RPTVdpbmRvdy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpET01XaW5kb3c6OmNyZWF0ZVdpbmRvdyk6IERpdHRvLgor CisgICAgICAgICogcGFnZS9TZWN1cml0eU9yaWdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpT ZWN1cml0eU9yaWdpbjo6dXJsV2l0aFVuaXF1ZVNlY3VyaXR5T3JpZ2luKTogUmV0dXJuIGEgVVJM IGluc3RlYWQKKyAgICAgICAgb2YgYSBTdHJpbmcuCisgICAgICAgICogcGFnZS9TZWN1cml0eU9y aWdpbi5oOiBVcGRhdGVkIGZvciBhYm92ZSBjaGFuZ2UuCisKIDIwMTQtMDQtMjQgIERhcmluIEFk bGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIxNjQxMzMpOiBT ZWxlY3Rpb24gZG9lc24ndCBwYWludCB3aGVuIHNjcm9sbGluZyBzb21lIHBhZ2VzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9t L0RvY3VtZW50LmNwcAppbmRleCAzMGIzMzA5MDZlZjhiNzU3YzMyZjE5NDBiZWEyN2FhNzQ2ZTVj OTBlLi5kODk2ZDYxYTA1Y2NmYzcxNmNlNjNkM2EyMmZkZDkwM2Y2NDZjYzE4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAKQEAgLTI4MjQsMTQgKzI4MjQsMTUgQEAgdm9pZCBEb2N1bWVudDo6cHJv Y2Vzc0h0dHBFcXVpdihjb25zdCBTdHJpbmcmIGVxdWl2LCBjb25zdCBTdHJpbmcmIGNvbnRlbnQp CiAgICAgICAgIHN0eWxlUmVzb2x2ZXJDaGFuZ2VkKERlZmVyUmVjYWxjU3R5bGUpOwogICAgIH0g ZWxzZSBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoZXF1aXYsICJyZWZyZXNoIikpIHsKICAgICAgICAg ZG91YmxlIGRlbGF5OwotICAgICAgICBTdHJpbmcgdXJsOwotICAgICAgICBpZiAoZnJhbWUgJiYg cGFyc2VIVFRQUmVmcmVzaChjb250ZW50LCB0cnVlLCBkZWxheSwgdXJsKSkgewotICAgICAgICAg ICAgaWYgKHVybC5pc0VtcHR5KCkpCi0gICAgICAgICAgICAgICAgdXJsID0gbV91cmwuc3RyaW5n KCk7CisgICAgICAgIFN0cmluZyB1cmxTdHJpbmc7CisgICAgICAgIGlmIChmcmFtZSAmJiBwYXJz ZUhUVFBSZWZyZXNoKGNvbnRlbnQsIHRydWUsIGRlbGF5LCB1cmxTdHJpbmcpKSB7CisgICAgICAg ICAgICBVUkwgY29tcGxldGVkVVJMOworICAgICAgICAgICAgaWYgKHVybFN0cmluZy5pc0VtcHR5 KCkpCisgICAgICAgICAgICAgICAgY29tcGxldGVkVVJMID0gbV91cmw7CiAgICAgICAgICAgICBl bHNlCi0gICAgICAgICAgICAgICAgdXJsID0gY29tcGxldGVVUkwodXJsKS5zdHJpbmcoKTsKLSAg ICAgICAgICAgIGlmICghcHJvdG9jb2xJc0phdmFTY3JpcHQodXJsKSkKLSAgICAgICAgICAgICAg ICBmcmFtZS0+bmF2aWdhdGlvblNjaGVkdWxlcigpLnNjaGVkdWxlUmVkaXJlY3QoZGVsYXksIHVy bCk7CisgICAgICAgICAgICAgICAgY29tcGxldGVkVVJMID0gY29tcGxldGVVUkwodXJsU3RyaW5n KTsKKyAgICAgICAgICAgIGlmICghcHJvdG9jb2xJc0phdmFTY3JpcHQoY29tcGxldGVkVVJMKSkK KyAgICAgICAgICAgICAgICBmcmFtZS0+bmF2aWdhdGlvblNjaGVkdWxlcigpLnNjaGVkdWxlUmVk aXJlY3QoZGVsYXksIGNvbXBsZXRlZFVSTCk7CiAgICAgICAgICAgICBlbHNlIHsKICAgICAgICAg ICAgICAgICBTdHJpbmcgbWVzc2FnZSA9ICJSZWZ1c2VkIHRvIHJlZnJlc2ggIiArIG1fdXJsLnN0 cmluZ0NlbnRlckVsbGlwc2l6ZWRUb0xlbmd0aCgpICsgIiB0byBhIGphdmFzY3JpcHQ6IFVSTCI7 CiAgICAgICAgICAgICAgICAgYWRkQ29uc29sZU1lc3NhZ2UoTWVzc2FnZVNvdXJjZTo6U2VjdXJp dHksIE1lc3NhZ2VMZXZlbDo6RXJyb3IsIG1lc3NhZ2UpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFt ZUxvYWRlci5jcHAKaW5kZXggYzg2ZmQ2NGM4ZWQ0MGMyMzFlYjAyY2UzNTNjNGM2MDVkM2YyMjFm NC4uOTdlMjhlODQ2NTRjMDNiOWYzZmQ5NmUzNGU5ODM2MjZiZjY4YmMyNiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC02NjYsMTYgKzY2NiwxNyBAQCB2b2lkIEZyYW1l TG9hZGVyOjpyZWNlaXZlZEZpcnN0RGF0YSgpCiAgICAgICAgIHJldHVybjsKIAogICAgIGRvdWJs ZSBkZWxheTsKLSAgICBTdHJpbmcgdXJsOwotICAgIGlmICghcGFyc2VIVFRQUmVmcmVzaChtX2Rv Y3VtZW50TG9hZGVyLT5yZXNwb25zZSgpLmh0dHBIZWFkZXJGaWVsZCgiUmVmcmVzaCIpLCBmYWxz ZSwgZGVsYXksIHVybCkpCisgICAgU3RyaW5nIHVybFN0cmluZzsKKyAgICBpZiAoIXBhcnNlSFRU UFJlZnJlc2gobV9kb2N1bWVudExvYWRlci0+cmVzcG9uc2UoKS5odHRwSGVhZGVyRmllbGQoIlJl ZnJlc2giKSwgZmFsc2UsIGRlbGF5LCB1cmxTdHJpbmcpKQogICAgICAgICByZXR1cm47Ci0gICAg aWYgKHVybC5pc0VtcHR5KCkpCi0gICAgICAgIHVybCA9IG1fZnJhbWUuZG9jdW1lbnQoKS0+dXJs KCkuc3RyaW5nKCk7CisgICAgVVJMIGNvbXBsZXRlZFVSTDsKKyAgICBpZiAodXJsU3RyaW5nLmlz RW1wdHkoKSkKKyAgICAgICAgY29tcGxldGVkVVJMID0gbV9mcmFtZS5kb2N1bWVudCgpLT51cmwo KTsKICAgICBlbHNlCi0gICAgICAgIHVybCA9IG1fZnJhbWUuZG9jdW1lbnQoKS0+Y29tcGxldGVV UkwodXJsKS5zdHJpbmcoKTsKKyAgICAgICAgY29tcGxldGVkVVJMID0gbV9mcmFtZS5kb2N1bWVu dCgpLT5jb21wbGV0ZVVSTCh1cmxTdHJpbmcpOwogCi0gICAgaWYgKCFwcm90b2NvbElzSmF2YVNj cmlwdCh1cmwpKQotICAgICAgICBtX2ZyYW1lLm5hdmlnYXRpb25TY2hlZHVsZXIoKS5zY2hlZHVs ZVJlZGlyZWN0KGRlbGF5LCB1cmwpOworICAgIGlmICghcHJvdG9jb2xJc0phdmFTY3JpcHQoY29t cGxldGVkVVJMKSkKKyAgICAgICAgbV9mcmFtZS5uYXZpZ2F0aW9uU2NoZWR1bGVyKCkuc2NoZWR1 bGVSZWRpcmVjdChkZWxheSwgY29tcGxldGVkVVJMKTsKICAgICBlbHNlIHsKICAgICAgICAgU3Ry aW5nIG1lc3NhZ2UgPSAiUmVmdXNlZCB0byByZWZyZXNoICIgKyBtX2ZyYW1lLmRvY3VtZW50KCkt PnVybCgpLnN0cmluZ0NlbnRlckVsbGlwc2l6ZWRUb0xlbmd0aCgpICsgIiB0byBhIGphdmFzY3Jp cHQ6IFVSTCI7CiAgICAgICAgIG1fZnJhbWUuZG9jdW1lbnQoKS0+YWRkQ29uc29sZU1lc3NhZ2Uo TWVzc2FnZVNvdXJjZTo6U2VjdXJpdHksIE1lc3NhZ2VMZXZlbDo6RXJyb3IsIG1lc3NhZ2UpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL05hdmlnYXRpb25TY2hlZHVsZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL05hdmlnYXRpb25TY2hlZHVsZXIuY3BwCmluZGV4IGZm NTk1MDA4Mjc4Y2YzZTY2MGUyOWM0MjljZWZjMzZmMTIzODQzMjUuLjM1MDU2N2U1MTg4MGM0NGRh MDRlNjhhMTFkOGMzMWY2M2VmMjYxYWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9OYXZpZ2F0aW9uU2NoZWR1bGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTmF2 aWdhdGlvblNjaGVkdWxlci5jcHAKQEAgLTk3LDcgKzk3LDcgQEAgcHJpdmF0ZToKIAogY2xhc3Mg U2NoZWR1bGVkVVJMTmF2aWdhdGlvbiA6IHB1YmxpYyBTY2hlZHVsZWROYXZpZ2F0aW9uIHsKIHBy b3RlY3RlZDoKLSAgICBTY2hlZHVsZWRVUkxOYXZpZ2F0aW9uKGRvdWJsZSBkZWxheSwgU2VjdXJp dHlPcmlnaW4qIHNlY3VyaXR5T3JpZ2luLCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5n JiByZWZlcnJlciwgTG9ja0hpc3RvcnkgbG9ja0hpc3RvcnksIExvY2tCYWNrRm9yd2FyZExpc3Qg bG9ja0JhY2tGb3J3YXJkTGlzdCwgYm9vbCBkdXJpbmdMb2FkLCBib29sIGlzTG9jYXRpb25DaGFu Z2UpCisgICAgU2NoZWR1bGVkVVJMTmF2aWdhdGlvbihkb3VibGUgZGVsYXksIFNlY3VyaXR5T3Jp Z2luKiBzZWN1cml0eU9yaWdpbiwgY29uc3QgVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgcmVmZXJy ZXIsIExvY2tIaXN0b3J5IGxvY2tIaXN0b3J5LCBMb2NrQmFja0ZvcndhcmRMaXN0IGxvY2tCYWNr Rm9yd2FyZExpc3QsIGJvb2wgZHVyaW5nTG9hZCwgYm9vbCBpc0xvY2F0aW9uQ2hhbmdlKQogICAg ICAgICA6IFNjaGVkdWxlZE5hdmlnYXRpb24oZGVsYXksIGxvY2tIaXN0b3J5LCBsb2NrQmFja0Zv cndhcmRMaXN0LCBkdXJpbmdMb2FkLCBpc0xvY2F0aW9uQ2hhbmdlKQogICAgICAgICAsIG1fc2Vj dXJpdHlPcmlnaW4oc2VjdXJpdHlPcmlnaW4pCiAgICAgICAgICwgbV91cmwodXJsKQpAQCAtMTA5 LDcgKzEwOSw3IEBAIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIHZvaWQgZmlyZShGcmFtZSYgZnJh bWUpIG92ZXJyaWRlCiAgICAgewogICAgICAgICBVc2VyR2VzdHVyZUluZGljYXRvciBnZXN0dXJl SW5kaWNhdG9yKHdhc1VzZXJHZXN0dXJlKCkgPyBEZWZpbml0ZWx5UHJvY2Vzc2luZ1VzZXJHZXN0 dXJlIDogRGVmaW5pdGVseU5vdFByb2Nlc3NpbmdVc2VyR2VzdHVyZSk7Ci0gICAgICAgIGZyYW1l LmxvYWRlcigpLmNoYW5nZUxvY2F0aW9uKG1fc2VjdXJpdHlPcmlnaW4uZ2V0KCksIFVSTChQYXJz ZWRVUkxTdHJpbmcsIG1fdXJsKSwgbV9yZWZlcnJlciwgbG9ja0hpc3RvcnkoKSwgbG9ja0JhY2tG b3J3YXJkTGlzdCgpLCBmYWxzZSk7CisgICAgICAgIGZyYW1lLmxvYWRlcigpLmNoYW5nZUxvY2F0 aW9uKG1fc2VjdXJpdHlPcmlnaW4uZ2V0KCksIG1fdXJsLCBtX3JlZmVycmVyLCBsb2NrSGlzdG9y eSgpLCBsb2NrQmFja0ZvcndhcmRMaXN0KCksIGZhbHNlKTsKICAgICB9CiAKICAgICB2aXJ0dWFs IHZvaWQgZGlkU3RhcnRUaW1lcihGcmFtZSYgZnJhbWUsIFRpbWVyPE5hdmlnYXRpb25TY2hlZHVs ZXI+JiB0aW1lcikgb3ZlcnJpZGUKQEAgLTExOSw3ICsxMTksNyBAQCBwcm90ZWN0ZWQ6CiAgICAg ICAgIG1faGF2ZVRvbGRDbGllbnQgPSB0cnVlOwogCiAgICAgICAgIFVzZXJHZXN0dXJlSW5kaWNh dG9yIGdlc3R1cmVJbmRpY2F0b3Iod2FzVXNlckdlc3R1cmUoKSA/IERlZmluaXRlbHlQcm9jZXNz aW5nVXNlckdlc3R1cmUgOiBEZWZpbml0ZWx5Tm90UHJvY2Vzc2luZ1VzZXJHZXN0dXJlKTsKLSAg ICAgICAgZnJhbWUubG9hZGVyKCkuY2xpZW50UmVkaXJlY3RlZChVUkwoUGFyc2VkVVJMU3RyaW5n LCBtX3VybCksIGRlbGF5KCksIGN1cnJlbnRUaW1lKCkgKyB0aW1lci5uZXh0RmlyZUludGVydmFs KCksIGxvY2tCYWNrRm9yd2FyZExpc3QoKSk7CisgICAgICAgIGZyYW1lLmxvYWRlcigpLmNsaWVu dFJlZGlyZWN0ZWQobV91cmwsIGRlbGF5KCksIGN1cnJlbnRUaW1lKCkgKyB0aW1lci5uZXh0Rmly ZUludGVydmFsKCksIGxvY2tCYWNrRm9yd2FyZExpc3QoKSk7CiAgICAgfQogCiAgICAgdmlydHVh bCB2b2lkIGRpZFN0b3BUaW1lcihGcmFtZSYgZnJhbWUsIGJvb2wgbmV3TG9hZEluUHJvZ3Jlc3Mp IG92ZXJyaWRlCkBAIC0xMzcsMTkgKzEzNywxOSBAQCBwcm90ZWN0ZWQ6CiAgICAgfQogCiAgICAg U2VjdXJpdHlPcmlnaW4qIHNlY3VyaXR5T3JpZ2luKCkgY29uc3QgeyByZXR1cm4gbV9zZWN1cml0 eU9yaWdpbi5nZXQoKTsgfQotICAgIFN0cmluZyB1cmwoKSBjb25zdCB7IHJldHVybiBtX3VybDsg fQorICAgIGNvbnN0IFVSTCYgdXJsKCkgY29uc3QgeyByZXR1cm4gbV91cmw7IH0KICAgICBTdHJp bmcgcmVmZXJyZXIoKSBjb25zdCB7IHJldHVybiBtX3JlZmVycmVyOyB9CiAKIHByaXZhdGU6CiAg ICAgUmVmUHRyPFNlY3VyaXR5T3JpZ2luPiBtX3NlY3VyaXR5T3JpZ2luOwotICAgIFN0cmluZyBt X3VybDsKKyAgICBVUkwgbV91cmw7CiAgICAgU3RyaW5nIG1fcmVmZXJyZXI7CiAgICAgYm9vbCBt X2hhdmVUb2xkQ2xpZW50OwogfTsKIAogY2xhc3MgU2NoZWR1bGVkUmVkaXJlY3QgOiBwdWJsaWMg U2NoZWR1bGVkVVJMTmF2aWdhdGlvbiB7CiBwdWJsaWM6Ci0gICAgU2NoZWR1bGVkUmVkaXJlY3Qo ZG91YmxlIGRlbGF5LCBTZWN1cml0eU9yaWdpbiogc2VjdXJpdHlPcmlnaW4sIGNvbnN0IFN0cmlu ZyYgdXJsLCBMb2NrSGlzdG9yeSBsb2NrSGlzdG9yeSwgTG9ja0JhY2tGb3J3YXJkTGlzdCBsb2Nr QmFja0ZvcndhcmRMaXN0KQorICAgIFNjaGVkdWxlZFJlZGlyZWN0KGRvdWJsZSBkZWxheSwgU2Vj dXJpdHlPcmlnaW4qIHNlY3VyaXR5T3JpZ2luLCBjb25zdCBVUkwmIHVybCwgTG9ja0hpc3Rvcnkg bG9ja0hpc3RvcnksIExvY2tCYWNrRm9yd2FyZExpc3QgbG9ja0JhY2tGb3J3YXJkTGlzdCkKICAg ICAgICAgOiBTY2hlZHVsZWRVUkxOYXZpZ2F0aW9uKGRlbGF5LCBzZWN1cml0eU9yaWdpbiwgdXJs LCBTdHJpbmcoKSwgbG9ja0hpc3RvcnksIGxvY2tCYWNrRm9yd2FyZExpc3QsIGZhbHNlLCBmYWxz ZSkKICAgICB7CiAgICAgICAgIGNsZWFyVXNlckdlc3R1cmUoKTsKQEAgLTE2MywyMCArMTYzLDIw IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZmlyZShGcmFtZSYgZnJhbWUpIG92ZXJyaWRl CiAgICAgewogICAgICAgICBVc2VyR2VzdHVyZUluZGljYXRvciBnZXN0dXJlSW5kaWNhdG9yKHdh c1VzZXJHZXN0dXJlKCkgPyBEZWZpbml0ZWx5UHJvY2Vzc2luZ1VzZXJHZXN0dXJlIDogRGVmaW5p dGVseU5vdFByb2Nlc3NpbmdVc2VyR2VzdHVyZSk7Ci0gICAgICAgIGJvb2wgcmVmcmVzaCA9IGVx dWFsSWdub3JpbmdGcmFnbWVudElkZW50aWZpZXIoZnJhbWUuZG9jdW1lbnQoKS0+dXJsKCksIFVS TChQYXJzZWRVUkxTdHJpbmcsIHVybCgpKSk7Ci0gICAgICAgIGZyYW1lLmxvYWRlcigpLmNoYW5n ZUxvY2F0aW9uKHNlY3VyaXR5T3JpZ2luKCksIFVSTChQYXJzZWRVUkxTdHJpbmcsIHVybCgpKSwg cmVmZXJyZXIoKSwgbG9ja0hpc3RvcnkoKSwgbG9ja0JhY2tGb3J3YXJkTGlzdCgpLCByZWZyZXNo KTsKKyAgICAgICAgYm9vbCByZWZyZXNoID0gZXF1YWxJZ25vcmluZ0ZyYWdtZW50SWRlbnRpZmll cihmcmFtZS5kb2N1bWVudCgpLT51cmwoKSwgdXJsKCkpOworICAgICAgICBmcmFtZS5sb2FkZXIo KS5jaGFuZ2VMb2NhdGlvbihzZWN1cml0eU9yaWdpbigpLCB1cmwoKSwgcmVmZXJyZXIoKSwgbG9j a0hpc3RvcnkoKSwgbG9ja0JhY2tGb3J3YXJkTGlzdCgpLCByZWZyZXNoKTsKICAgICB9CiB9Owog CiBjbGFzcyBTY2hlZHVsZWRMb2NhdGlvbkNoYW5nZSA6IHB1YmxpYyBTY2hlZHVsZWRVUkxOYXZp Z2F0aW9uIHsKIHB1YmxpYzoKLSAgICBTY2hlZHVsZWRMb2NhdGlvbkNoYW5nZShTZWN1cml0eU9y aWdpbiogc2VjdXJpdHlPcmlnaW4sIGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIHJl ZmVycmVyLCBMb2NrSGlzdG9yeSBsb2NrSGlzdG9yeSwgTG9ja0JhY2tGb3J3YXJkTGlzdCBsb2Nr QmFja0ZvcndhcmRMaXN0LCBib29sIGR1cmluZ0xvYWQpCisgICAgU2NoZWR1bGVkTG9jYXRpb25D aGFuZ2UoU2VjdXJpdHlPcmlnaW4qIHNlY3VyaXR5T3JpZ2luLCBjb25zdCBVUkwmIHVybCwgY29u c3QgU3RyaW5nJiByZWZlcnJlciwgTG9ja0hpc3RvcnkgbG9ja0hpc3RvcnksIExvY2tCYWNrRm9y d2FyZExpc3QgbG9ja0JhY2tGb3J3YXJkTGlzdCwgYm9vbCBkdXJpbmdMb2FkKQogICAgICAgICA6 IFNjaGVkdWxlZFVSTE5hdmlnYXRpb24oMC4wLCBzZWN1cml0eU9yaWdpbiwgdXJsLCByZWZlcnJl ciwgbG9ja0hpc3RvcnksIGxvY2tCYWNrRm9yd2FyZExpc3QsIGR1cmluZ0xvYWQsIHRydWUpIHsg fQogfTsKIAogY2xhc3MgU2NoZWR1bGVkUmVmcmVzaCA6IHB1YmxpYyBTY2hlZHVsZWRVUkxOYXZp Z2F0aW9uIHsKIHB1YmxpYzoKLSAgICBTY2hlZHVsZWRSZWZyZXNoKFNlY3VyaXR5T3JpZ2luKiBz ZWN1cml0eU9yaWdpbiwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgcmVmZXJyZXIp CisgICAgU2NoZWR1bGVkUmVmcmVzaChTZWN1cml0eU9yaWdpbiogc2VjdXJpdHlPcmlnaW4sIGNv bnN0IFVSTCYgdXJsLCBjb25zdCBTdHJpbmcmIHJlZmVycmVyKQogICAgICAgICA6IFNjaGVkdWxl ZFVSTE5hdmlnYXRpb24oMC4wLCBzZWN1cml0eU9yaWdpbiwgdXJsLCByZWZlcnJlciwgTG9ja0hp c3Rvcnk6OlllcywgTG9ja0JhY2tGb3J3YXJkTGlzdDo6WWVzLCBmYWxzZSwgdHJ1ZSkKICAgICB7 CiAgICAgfQpAQCAtMTg0LDcgKzE4NCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZmly ZShGcmFtZSYgZnJhbWUpIG92ZXJyaWRlCiAgICAgewogICAgICAgICBVc2VyR2VzdHVyZUluZGlj YXRvciBnZXN0dXJlSW5kaWNhdG9yKHdhc1VzZXJHZXN0dXJlKCkgPyBEZWZpbml0ZWx5UHJvY2Vz c2luZ1VzZXJHZXN0dXJlIDogRGVmaW5pdGVseU5vdFByb2Nlc3NpbmdVc2VyR2VzdHVyZSk7Ci0g ICAgICAgIGZyYW1lLmxvYWRlcigpLmNoYW5nZUxvY2F0aW9uKHNlY3VyaXR5T3JpZ2luKCksIFVS TChQYXJzZWRVUkxTdHJpbmcsIHVybCgpKSwgcmVmZXJyZXIoKSwgbG9ja0hpc3RvcnkoKSwgbG9j a0JhY2tGb3J3YXJkTGlzdCgpLCB0cnVlKTsKKyAgICAgICAgZnJhbWUubG9hZGVyKCkuY2hhbmdl TG9jYXRpb24oc2VjdXJpdHlPcmlnaW4oKSwgdXJsKCksIHJlZmVycmVyKCksIGxvY2tIaXN0b3J5 KCksIGxvY2tCYWNrRm9yd2FyZExpc3QoKSwgdHJ1ZSk7CiAgICAgfQogfTsKIApAQCAtMzA0LDEy ICszMDQsMTggQEAgaW5saW5lIGJvb2wgTmF2aWdhdGlvblNjaGVkdWxlcjo6c2hvdWxkU2NoZWR1 bGVOYXZpZ2F0aW9uKCkgY29uc3QKICAgICByZXR1cm4gbV9mcmFtZS5wYWdlKCk7CiB9CiAKLWlu bGluZSBib29sIE5hdmlnYXRpb25TY2hlZHVsZXI6OnNob3VsZFNjaGVkdWxlTmF2aWdhdGlvbihj b25zdCBTdHJpbmcmIHVybCkgY29uc3QKK2lubGluZSBib29sIE5hdmlnYXRpb25TY2hlZHVsZXI6 OnNob3VsZFNjaGVkdWxlTmF2aWdhdGlvbihjb25zdCBVUkwmIHVybCkgY29uc3QKIHsKLSAgICBy ZXR1cm4gc2hvdWxkU2NoZWR1bGVOYXZpZ2F0aW9uKCkgJiYgKHByb3RvY29sSXNKYXZhU2NyaXB0 KHVybCkgfHwgTmF2aWdhdGlvbkRpc2FibGVyRm9yQmVmb3JlVW5sb2FkOjppc05hdmlnYXRpb25B bGxvd2VkKCkpOworICAgIGlmICghc2hvdWxkU2NoZWR1bGVOYXZpZ2F0aW9uKCkpCisgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICBpZiAocHJvdG9jb2xJc0phdmFTY3JpcHQodXJsKSkKKyAgICAg ICAgcmV0dXJuIHRydWU7CisgICAgaWYgKCF1cmwuaXNWYWxpZCgpKQorICAgICAgICByZXR1cm4g ZmFsc2U7CisgICAgcmV0dXJuIE5hdmlnYXRpb25EaXNhYmxlckZvckJlZm9yZVVubG9hZDo6aXNO YXZpZ2F0aW9uQWxsb3dlZCgpOwogfQogCi12b2lkIE5hdmlnYXRpb25TY2hlZHVsZXI6OnNjaGVk dWxlUmVkaXJlY3QoZG91YmxlIGRlbGF5LCBjb25zdCBTdHJpbmcmIHVybCkKK3ZvaWQgTmF2aWdh dGlvblNjaGVkdWxlcjo6c2NoZWR1bGVSZWRpcmVjdChkb3VibGUgZGVsYXksIGNvbnN0IFVSTCYg dXJsKQogewogICAgIGlmICghc2hvdWxkU2NoZWR1bGVOYXZpZ2F0aW9uKHVybCkpCiAgICAgICAg IHJldHVybjsKQEAgLTM0MywxMiArMzQ5LDEwIEBAIExvY2tCYWNrRm9yd2FyZExpc3QgTmF2aWdh dGlvblNjaGVkdWxlcjo6bXVzdExvY2tCYWNrRm9yd2FyZExpc3QoRnJhbWUmIHRhcmdldEZyCiAg ICAgcmV0dXJuIExvY2tCYWNrRm9yd2FyZExpc3Q6Ok5vOwogfQogCi12b2lkIE5hdmlnYXRpb25T Y2hlZHVsZXI6OnNjaGVkdWxlTG9jYXRpb25DaGFuZ2UoU2VjdXJpdHlPcmlnaW4qIHNlY3VyaXR5 T3JpZ2luLCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiByZWZlcnJlciwgTG9ja0hp c3RvcnkgbG9ja0hpc3RvcnksIExvY2tCYWNrRm9yd2FyZExpc3QgbG9ja0JhY2tGb3J3YXJkTGlz dCkKK3ZvaWQgTmF2aWdhdGlvblNjaGVkdWxlcjo6c2NoZWR1bGVMb2NhdGlvbkNoYW5nZShTZWN1 cml0eU9yaWdpbiogc2VjdXJpdHlPcmlnaW4sIGNvbnN0IFVSTCYgdXJsLCBjb25zdCBTdHJpbmcm IHJlZmVycmVyLCBMb2NrSGlzdG9yeSBsb2NrSGlzdG9yeSwgTG9ja0JhY2tGb3J3YXJkTGlzdCBs b2NrQmFja0ZvcndhcmRMaXN0KQogewogICAgIGlmICghc2hvdWxkU2NoZWR1bGVOYXZpZ2F0aW9u KHVybCkpCiAgICAgICAgIHJldHVybjsKLSAgICBpZiAodXJsLmlzRW1wdHkoKSkKLSAgICAgICAg cmV0dXJuOwogCiAgICAgaWYgKGxvY2tCYWNrRm9yd2FyZExpc3QgPT0gTG9ja0JhY2tGb3J3YXJk TGlzdDo6Tm8pCiAgICAgICAgIGxvY2tCYWNrRm9yd2FyZExpc3QgPSBtdXN0TG9ja0JhY2tGb3J3 YXJkTGlzdChtX2ZyYW1lKTsKQEAgLTQwMSw3ICs0MDUsNyBAQCB2b2lkIE5hdmlnYXRpb25TY2hl ZHVsZXI6OnNjaGVkdWxlUmVmcmVzaCgpCiAgICAgaWYgKHVybC5pc0VtcHR5KCkpCiAgICAgICAg IHJldHVybjsKIAotICAgIHNjaGVkdWxlKHN0ZDo6bWFrZV91bmlxdWU8U2NoZWR1bGVkUmVmcmVz aD4obV9mcmFtZS5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLCB1cmwuc3RyaW5nKCksIG1f ZnJhbWUubG9hZGVyKCkub3V0Z29pbmdSZWZlcnJlcigpKSk7CisgICAgc2NoZWR1bGUoc3RkOjpt YWtlX3VuaXF1ZTxTY2hlZHVsZWRSZWZyZXNoPihtX2ZyYW1lLmRvY3VtZW50KCktPnNlY3VyaXR5 T3JpZ2luKCksIHVybCwgbV9mcmFtZS5sb2FkZXIoKS5vdXRnb2luZ1JlZmVycmVyKCkpKTsKIH0K IAogdm9pZCBOYXZpZ2F0aW9uU2NoZWR1bGVyOjpzY2hlZHVsZUhpc3RvcnlOYXZpZ2F0aW9uKGlu dCBzdGVwcykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9OYXZpZ2F0aW9uU2No ZWR1bGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTmF2aWdhdGlvblNjaGVkdWxlci5oCmlu ZGV4IDZjY2RiY2EwMWQwMmNlMDBiZmE1NTY0NmMxMjBhMmEzZjZmZDk4NDIuLjdkYjIxYTcyYzFk NjI4N2Q1MGZmNTczNzkwNzllZjgzYzNkOWMzN2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9OYXZpZ2F0aW9uU2NoZWR1bGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L05hdmlnYXRpb25TY2hlZHVsZXIuaApAQCAtMzQsOCArMzQsNiBAQAogI2luY2x1ZGUgIkZyYW1l TG9hZGVyVHlwZXMuaCIKICNpbmNsdWRlICJUaW1lci5oIgogI2luY2x1ZGUgPHd0Zi9Gb3J3YXJk Lmg+Ci0jaW5jbHVkZSA8d3RmL05vbmNvcHlhYmxlLmg+Ci0jaW5jbHVkZSA8d3RmL1Bhc3NSZWZQ dHIuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC00MywxMCArNDEsOSBAQCBjbGFzcyBG b3JtU3VibWlzc2lvbjsKIGNsYXNzIEZyYW1lOwogY2xhc3MgU2NoZWR1bGVkTmF2aWdhdGlvbjsK IGNsYXNzIFNlY3VyaXR5T3JpZ2luOworY2xhc3MgVVJMOwogCiBjbGFzcyBOYXZpZ2F0aW9uRGlz YWJsZXJGb3JCZWZvcmVVbmxvYWQgewotICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKE5hdmlnYXRp b25EaXNhYmxlckZvckJlZm9yZVVubG9hZCk7Ci0KIHB1YmxpYzoKICAgICBOYXZpZ2F0aW9uRGlz YWJsZXJGb3JCZWZvcmVVbmxvYWQoKQogICAgIHsKQEAgLTY0LDggKzYxLDYgQEAgcHJpdmF0ZToK IH07CiAKIGNsYXNzIE5hdmlnYXRpb25TY2hlZHVsZXIgewotICAgIFdURl9NQUtFX05PTkNPUFlB QkxFKE5hdmlnYXRpb25TY2hlZHVsZXIpOwotCiBwdWJsaWM6CiAgICAgZXhwbGljaXQgTmF2aWdh dGlvblNjaGVkdWxlcihGcmFtZSYpOwogICAgIH5OYXZpZ2F0aW9uU2NoZWR1bGVyKCk7CkBAIC03 Myw5ICs2OCw4IEBAIHB1YmxpYzoKICAgICBib29sIHJlZGlyZWN0U2NoZWR1bGVkRHVyaW5nTG9h ZCgpOwogICAgIGJvb2wgbG9jYXRpb25DaGFuZ2VQZW5kaW5nKCk7CiAKLSAgICB2b2lkIHNjaGVk dWxlUmVkaXJlY3QoZG91YmxlIGRlbGF5LCBjb25zdCBTdHJpbmcmIHVybCk7Ci0gICAgdm9pZCBz Y2hlZHVsZUxvY2F0aW9uQ2hhbmdlKFNlY3VyaXR5T3JpZ2luKiwgY29uc3QgU3RyaW5nJiB1cmws IGNvbnN0IFN0cmluZyYgcmVmZXJyZXIsIExvY2tIaXN0b3J5ID0gTG9ja0hpc3Rvcnk6OlllcywK LSAgICAgICAgTG9ja0JhY2tGb3J3YXJkTGlzdCA9IExvY2tCYWNrRm9yd2FyZExpc3Q6Olllcyk7 CisgICAgdm9pZCBzY2hlZHVsZVJlZGlyZWN0KGRvdWJsZSBkZWxheSwgY29uc3QgVVJMJik7Cisg ICAgdm9pZCBzY2hlZHVsZUxvY2F0aW9uQ2hhbmdlKFNlY3VyaXR5T3JpZ2luKiwgY29uc3QgVVJM JiwgY29uc3QgU3RyaW5nJiByZWZlcnJlciwgTG9ja0hpc3RvcnkgPSBMb2NrSGlzdG9yeTo6WWVz LCBMb2NrQmFja0ZvcndhcmRMaXN0ID0gTG9ja0JhY2tGb3J3YXJkTGlzdDo6WWVzKTsKICAgICB2 b2lkIHNjaGVkdWxlRm9ybVN1Ym1pc3Npb24oUGFzc1JlZlB0cjxGb3JtU3VibWlzc2lvbj4pOwog ICAgIHZvaWQgc2NoZWR1bGVSZWZyZXNoKCk7CiAgICAgdm9pZCBzY2hlZHVsZUhpc3RvcnlOYXZp Z2F0aW9uKGludCBzdGVwcyk7CkBAIC04Nyw3ICs4MSw3IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToK ICAgICBib29sIHNob3VsZFNjaGVkdWxlTmF2aWdhdGlvbigpIGNvbnN0OwotICAgIGJvb2wgc2hv dWxkU2NoZWR1bGVOYXZpZ2F0aW9uKGNvbnN0IFN0cmluZyYgdXJsKSBjb25zdDsKKyAgICBib29s IHNob3VsZFNjaGVkdWxlTmF2aWdhdGlvbihjb25zdCBVUkwmKSBjb25zdDsKIAogICAgIHZvaWQg dGltZXJGaXJlZChUaW1lcjxOYXZpZ2F0aW9uU2NoZWR1bGVyPiYpOwogICAgIHZvaWQgc2NoZWR1 bGUoc3RkOjp1bmlxdWVfcHRyPFNjaGVkdWxlZE5hdmlnYXRpb24+KTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9TdWJmcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvU3ViZnJhbWVMb2FkZXIuY3BwCmluZGV4IDY1NWRjZjVkYjViOTQ0OGYxZDU4Y2E4Zjll MDM5NDM0MTNlYzg2NzQuLjhiOTZkZWY3MmRjZWM5ZmFmYWU0ZWEwY2UyZTUwMmRiYjMwOTEwOTUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJmcmFtZUxvYWRlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YmZyYW1lTG9hZGVyLmNwcApAQCAtMzI0LDcgKzMy NCw3IEBAIEZyYW1lKiBTdWJmcmFtZUxvYWRlcjo6bG9hZE9yUmVkaXJlY3RTdWJmcmFtZShIVE1M RnJhbWVPd25lckVsZW1lbnQmIG93bmVyRWxlbWVuCiB7CiAgICAgRnJhbWUqIGZyYW1lID0gb3du ZXJFbGVtZW50LmNvbnRlbnRGcmFtZSgpOwogICAgIGlmIChmcmFtZSkKLSAgICAgICAgZnJhbWUt Pm5hdmlnYXRpb25TY2hlZHVsZXIoKS5zY2hlZHVsZUxvY2F0aW9uQ2hhbmdlKG1fZnJhbWUuZG9j dW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKSwgdXJsLnN0cmluZygpLCBtX2ZyYW1lLmxvYWRlcigp Lm91dGdvaW5nUmVmZXJyZXIoKSwgbG9ja0hpc3RvcnksIGxvY2tCYWNrRm9yd2FyZExpc3QpOwor ICAgICAgICBmcmFtZS0+bmF2aWdhdGlvblNjaGVkdWxlcigpLnNjaGVkdWxlTG9jYXRpb25DaGFu Z2UobV9mcmFtZS5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLCB1cmwsIG1fZnJhbWUubG9h ZGVyKCkub3V0Z29pbmdSZWZlcnJlcigpLCBsb2NrSGlzdG9yeSwgbG9ja0JhY2tGb3J3YXJkTGlz dCk7CiAgICAgZWxzZQogICAgICAgICBmcmFtZSA9IGxvYWRTdWJmcmFtZShvd25lckVsZW1lbnQs IHVybCwgZnJhbWVOYW1lLCBtX2ZyYW1lLmxvYWRlcigpLm91dGdvaW5nUmVmZXJyZXIoKSk7CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNwcAppbmRleCA3ZjlhYWY4NGFhOWZlMmE1MmMxZThiNjRk Nzk0ODk0ZDU4Y2RkNThiLi5mMjA2ZGQzY2NkMTdiZGQwZmI0MTI1YzZhNmYwZGFkYjA3MTIyMGIx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCkBAIC0yMDE4LDcgKzIwMTgsNyBAQCBQYXNz UmVmUHRyPEZyYW1lPiBET01XaW5kb3c6OmNyZWF0ZVdpbmRvdyhjb25zdCBTdHJpbmcmIHVybFN0 cmluZywgY29uc3QgQXRvbWljUwogICAgICAgICBuZXdGcmFtZS0+bG9hZGVyKCkuY2hhbmdlTG9j YXRpb24oYWN0aXZlV2luZG93LmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCksIGNvbXBsZXRl ZFVSTCwgcmVmZXJyZXIsIExvY2tIaXN0b3J5OjpObywgTG9ja0JhY2tGb3J3YXJkTGlzdDo6Tm8p OwogICAgIGVsc2UgaWYgKCF1cmxTdHJpbmcuaXNFbXB0eSgpKSB7CiAgICAgICAgIExvY2tIaXN0 b3J5IGxvY2tIaXN0b3J5ID0gU2NyaXB0Q29udHJvbGxlcjo6cHJvY2Vzc2luZ1VzZXJHZXN0dXJl KCkgPyBMb2NrSGlzdG9yeTo6Tm8gOiBMb2NrSGlzdG9yeTo6WWVzOwotICAgICAgICBuZXdGcmFt ZS0+bmF2aWdhdGlvblNjaGVkdWxlcigpLnNjaGVkdWxlTG9jYXRpb25DaGFuZ2UoYWN0aXZlV2lu ZG93LmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCksIGNvbXBsZXRlZFVSTC5zdHJpbmcoKSwg cmVmZXJyZXIsIGxvY2tIaXN0b3J5LCBMb2NrQmFja0ZvcndhcmRMaXN0OjpObyk7CisgICAgICAg IG5ld0ZyYW1lLT5uYXZpZ2F0aW9uU2NoZWR1bGVyKCkuc2NoZWR1bGVMb2NhdGlvbkNoYW5nZShh Y3RpdmVXaW5kb3cuZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKSwgY29tcGxldGVkVVJMLCBy ZWZlcnJlciwgbG9ja0hpc3RvcnksIExvY2tCYWNrRm9yd2FyZExpc3Q6Ok5vKTsKICAgICB9CiAK ICAgICAvLyBOYXZpZ2F0aW5nIHRoZSBuZXcgZnJhbWUgY291bGQgcmVzdWx0IGluIGl0IGJlaW5n IGRldGFjaGVkIGZyb20gaXRzIHBhZ2UgYnkgYSBuYXZpZ2F0aW9uIHBvbGljeSBkZWxlZ2F0ZS4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAKaW5kZXggMjhjNzExZjBjMjIxN2Nl OGMzMjI0ZWVlY2U4ZGY5ZTRhZTA4ODYwZC4uYzQ3YjYyYmFlMDQ4NjU4NTljZDlmZjc3Nzg0ZDFl ZDNkMjQ1OTA0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdp bi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAKQEAgLTM2 LDYgKzM2LDcgQEAKICNpbmNsdWRlICJTZWN1cml0eVBvbGljeS5oIgogI2luY2x1ZGUgIlRocmVh ZGFibGVCbG9iUmVnaXN0cnkuaCIKICNpbmNsdWRlIDx3dGYvTWFpblRocmVhZC5oPgorI2luY2x1 ZGUgPHd0Zi9OZXZlckRlc3Ryb3llZC5oPgogI2luY2x1ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4K ICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+CiAKQEAgLTU5NywxMCArNTk4LDEw IEBAIGJvb2wgU2VjdXJpdHlPcmlnaW46OmlzU2FtZVNjaGVtZUhvc3RQb3J0KGNvbnN0IFNlY3Vy aXR5T3JpZ2luKiBvdGhlcikgY29uc3QKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotU3RyaW5nIFNl Y3VyaXR5T3JpZ2luOjp1cmxXaXRoVW5pcXVlU2VjdXJpdHlPcmlnaW4oKQorVVJMIFNlY3VyaXR5 T3JpZ2luOjp1cmxXaXRoVW5pcXVlU2VjdXJpdHlPcmlnaW4oKQogewogICAgIEFTU0VSVChpc01h aW5UaHJlYWQoKSk7Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0IFN0 cmluZywgdW5pcXVlU2VjdXJpdHlPcmlnaW5VUkwsIChBU0NJSUxpdGVyYWwoImRhdGE6LCIpKSk7 CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFVSTD4gdW5pcXVlU2VjdXJpdHlPcmlnaW5VUkwo UGFyc2VkVVJMU3RyaW5nLCBBU0NJSUxpdGVyYWwoImRhdGE6LCIpKTsKICAgICByZXR1cm4gdW5p cXVlU2VjdXJpdHlPcmlnaW5VUkw7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvU2VjdXJpdHlPcmlnaW4uaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4u aAppbmRleCBlYjcwNTUwODRkOTFhMDQwZGNkNTFjYmRlNzVjODYyMjJiMzljN2JmLi43NTVmMGEw Njk0ODU2MjgwZjRmYTY2YjUxMjdiYzFkZmQyNWJkZTY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1 cml0eU9yaWdpbi5oCkBAIC0yMDUsNyArMjA1LDcgQEAgcHVibGljOgogICAgIC8vIChhbmQgd2hl dGhlciBpdCB3YXMgc2V0KSBidXQgY29uc2lkZXJpbmcgdGhlIGhvc3QuIEl0IGlzIHVzZWQgZm9y IHBvc3RNZXNzYWdlLgogICAgIGJvb2wgaXNTYW1lU2NoZW1lSG9zdFBvcnQoY29uc3QgU2VjdXJp dHlPcmlnaW4qKSBjb25zdDsKIAotICAgIHN0YXRpYyBTdHJpbmcgdXJsV2l0aFVuaXF1ZVNlY3Vy aXR5T3JpZ2luKCk7CisgICAgc3RhdGljIFVSTCB1cmxXaXRoVW5pcXVlU2VjdXJpdHlPcmlnaW4o KTsKIAogcHJpdmF0ZToKICAgICBTZWN1cml0eU9yaWdpbigpOwo=