45644 2010-09-13 02:20:06 -0700 Implement EOF handling in TextMode 2010-09-13 13:50:03 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth abarth adele aestes darin eric mjs oldest_to_newest 278073 0 abarth 2010-09-13 02:20:06 -0700 Implement EOF handling in TextMode 278075 1 67382 abarth 2010-09-13 02:22:56 -0700 Created attachment 67382 Patch 278230 2 67382 darin 2010-09-13 08:30:22 -0700 Comment on attachment 67382 Patch This patch breaks the old versions of Apple’s Mail application. There are a conditional comments here such as “if we need this setting”, but we do need it. I know it’s easier to just remove it, but we at Apple need to keep this. Maybe you can find someone from my team at Apple to work with you on this. 278265 3 eric 2010-09-13 09:56:47 -0700 @abarth: you should just split this up so the text stuff can be landed w/o contention. Also, I don't think the mail-specific code works anymore. But someone would need to test. 278270 4 67382 eric 2010-09-13 09:59:03 -0700 Comment on attachment 67382 Patch Oh, nm. I see these are tied. I guess I agree then. We should remove this code and add it back with tests. It's possible to test this now that we have layoutTestController.overridePreference(). We can use that in conjunction with a platform/mac-leopard or mac-tiger test to test this code if it's truly needed. 278271 5 eric 2010-09-13 09:59:45 -0700 "if it's truly needed" -> it's possible that the new parser behavior matches old-mails needed quirk already. Since the old code isn't tested, its impossible to know. 278274 6 darin 2010-09-13 10:01:33 -0700 (In reply to comment #3) > But someone would need to test. Whether this patch broke it or the HTML parser work broke it earlier, this does need to be kept working. It doesn’t need to be tracked in this bug report. Here’s how someone can test it: On Leopard, run Apple Mail with the WebKit you wish to test. Open Mail’s Preferences. Click on Signatures. Click the "+" once. This should correctly make a user signature. Click the "+" again. If the bug is active, no signature is created and exception will occur. 278276 7 darin 2010-09-13 10:02:36 -0700 The incorrect old mail assumption was that the first child of the first child of the document is the body, not the head. 278284 8 abarth 2010-09-13 10:14:40 -0700 > This patch breaks the old versions of Apple’s Mail application. There are a conditional comments here such as “if we need this setting”, but we do need it. I know it’s easier to just remove it, but we at Apple need to keep this. Maybe you can find someone from my team at Apple to work with you on this. I think this setting is already broken. This patch only affects the behavior of EOF in "text mode," which is if the document ends before we close a <style> or <script> tag. Who's a good person to talk to about the requirements of Mail? I can guess from how the old code worked, but it would be best to gather the requirements directly instead of reverse engineering them from the previous implementation. 278286 9 abarth 2010-09-13 10:16:50 -0700 (In reply to comment #7) > The incorrect old mail assumption was that the first child of the first child of the document is the body, not the head. I see. Presumably in the case where the head is created implicitly and there are no XML processing directives / DOCTYPEs / etc. 278297 10 darin 2010-09-13 10:38:00 -0700 (In reply to comment #9) > (In reply to comment #7) > > The incorrect old mail assumption was that the first child of the first child of the document is the body, not the head. > > I see. Presumably in the case where the head is created implicitly and there are no XML processing directives / DOCTYPEs / etc. That’s right. And it’s only the older versions of Mail that have this dependency. 278311 11 67431 abarth 2010-09-13 10:57:31 -0700 Created attachment 67431 Patch for landing 278333 12 eric 2010-09-13 11:28:37 -0700 @darin: It seems a better hack for this would be to just hack the Obj-C DOM bindings layer. Make a DOMHTMLDocumentCustom.mm file and have it check the bundle identifier for Mail and override firstChild to return body instead of the real first child. Hacking this into WebCore seems like a bad idea. 278335 13 eric 2010-09-13 11:30:59 -0700 The hack would involve hacking Node.idl to make a custom binding for firstChild in the Leopard/Tiger Obj-C case. This is assuming of course that this is how Mail is accessing the first child of the document and assuming it's the body. :) 278338 14 darin 2010-09-13 11:32:28 -0700 It’s OK to put this hack in the bindings layer, but I’m not sure it’s better. It’s probably more complicated, not less. 278347 15 abarth 2010-09-13 11:40:18 -0700 (In reply to comment #14) > It’s OK to put this hack in the bindings layer, but I’m not sure it’s better. It’s probably more complicated, not less. The version in the parser is https://bugs.webkit.org/show_bug.cgi?id=45693 278447 16 67431 abarth 2010-09-13 13:49:57 -0700 Comment on attachment 67431 Patch for landing Clearing flags on attachment: 67431 Committed r67406: <http://trac.webkit.org/changeset/67406> 278448 17 abarth 2010-09-13 13:50:03 -0700 All reviewed patches have been landed. Closing bug. 67382 2010-09-13 02:22:56 -0700 2010-09-13 10:57:20 -0700 Patch bug-45644-20100913022255.patch text/plain 4667 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YWNiZWU5N2E0MWQ1Yjc1YmNlYTkzNWI5MmI2MmRhNjgxYzU2NTY1ZC4uZWYyNWM5OGYyMWFlNjcw MGMxZWQ3ZjEyYmY1YWFkNzM1YTlkNTI0YSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNiBAQAogMjAxMC0wOS0xMyAgQWRh bSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBFT0YgaGFuZGxpbmcgaW4gVGV4dE1vZGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1NjQ0CisK KyAgICAgICAgVGhpcyBwYXRjaCBpcyBhY3R1YWxseSBjb3ZlcmVkIGJ5IGEgYnVuY2ggb2YgdGVz dHMuICBXZSB3ZXJlIGp1c3QKKyAgICAgICAgbWFnaWNhbGx5IHBhc3NpbmcgdGhlIHRlc3RzIGJl Zm9yZSBiZWNhdXNlIG9mIHNvbWUgbnV0dHkgY29kZSBpbgorICAgICAgICBEb2N1bWVudC5jcHAu CisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1l bnQ6OmltcGxpY2l0Q2xvc2UpOgorICAgICAgICAgICAgLSBUaGlzIGNvZGUgd2FzIG1hc2tpbmcg dGhlIG5vdEltcGxlbWVudGVkIGluIHRoZSB0cmVlIGJ1aWxkZXIuCisgICAgICAgICAgICAgIEkg YWxzbyByZW1vdmVkIHRoZSB1c2Ugb2YgdGhlIHNldHRpbmcgYmVjYXVzZSBpdCB3YXNuJ3Qgd29y a2luZworICAgICAgICAgICAgICBwcm9wZXJseSBhbnl3YXkuICBJZiB3ZSBuZWVkIHRoaXMgc2V0 dGluZywgd2UnbGwgbmVlZCB0byB0ZWFjaAorICAgICAgICAgICAgICB0aGUgdHJlZSBidWlsZGVy IGFib3V0IGl0LgorICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxUcmVlQnVpbGRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRPZkZpbGUpOgorICAg ICAgICAgICAgLSBJbXBsZW1lbnQgcGVyIHRoZSBzcGVjLgorCisyMDEwLTA5LTEzICBBZGFtIEJh cnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlk ZWwuCiAKICAgICAgICAgQ29udmVydCBub3RJbXBsZW1lbnRlZCgpIHRvIEFTU0VSVF9OT1RfUkVB Q0hFRApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvV2ViQ29yZS9kb20v RG9jdW1lbnQuY3BwCmluZGV4IGY2MzBjOThkYjU5ODQ3YzIyZGNmN2RkY2Y3NWVmYTdlOWRiOWNk MmIuLjJiYjJkNjliZmUwNWY3NjIzMWJlZTNiYjA1NjFjOWFkMWU1NDNjY2YgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAK QEAgLTE5NTksMjYgKzE5NTksNiBAQCB2b2lkIERvY3VtZW50OjpjbG9zZSgpCiAgICAgfQogfQog Ci0vLyBGSVhNRTogVGhlc2Ugc2V0dGluZ3MgcHJvYmFibHkgZG9uJ3Qgd29yayBhbnltb3JlLiAg V2Ugc2hvdWxkIGVpdGhlciByZW1vdmUKLS8vIHRoZW0gb3IgbWFrZSB0aGVtIHdvcmsgcHJvcGVy bHkuCi0jaWZkZWYgQlVJTERJTkdfT05fTEVPUEFSRAotc3RhdGljIGJvb2wgc2hvdWxkQ3JlYXRl SW1wbGljaXRIZWFkKERvY3VtZW50KiBkb2N1bWVudCkKLXsKLSAgICBBU1NFUlQoZG9jdW1lbnQp OwotICAgIFNldHRpbmdzKiBzZXR0aW5ncyA9IGRvY3VtZW50LT5wYWdlKCkgPyBkb2N1bWVudC0+ cGFnZSgpLT5zZXR0aW5ncygpIDogMDsKLSAgICByZXR1cm4gc2V0dGluZ3MgPyAhc2V0dGluZ3Mt Pm5lZWRzTGVvcGFyZE1haWxRdWlya3MoKSA6IHRydWU7Ci19Ci0jZWxpZiBkZWZpbmVkKEJVSUxE SU5HX09OX1RJR0VSKQotc3RhdGljIGJvb2wgc2hvdWxkQ3JlYXRlSW1wbGljaXRIZWFkKERvY3Vt ZW50KiBkb2N1bWVudCkKLXsKLSAgICBBU1NFUlQoZG9jdW1lbnQpOwotICAgIFNldHRpbmdzKiBz ZXR0aW5ncyA9IGRvY3VtZW50LT5wYWdlKCkgPyBkb2N1bWVudC0+cGFnZSgpLT5zZXR0aW5ncygp IDogMDsKLSAgICByZXR1cm4gc2V0dGluZ3MgPyAhc2V0dGluZ3MtPm5lZWRzVGlnZXJNYWlsUXVp cmtzKCkgOiB0cnVlOwotfQotI2Vsc2UKLWlubGluZSBib29sIHNob3VsZENyZWF0ZUltcGxpY2l0 SGVhZChEb2N1bWVudCopIHsgcmV0dXJuIHRydWU7IH0KLSNlbmRpZgotCiB2b2lkIERvY3VtZW50 OjppbXBsaWNpdENsb3NlKCkKIHsKICAgICAvLyBJZiB3ZSdyZSBpbiB0aGUgbWlkZGxlIG9mIHJl Y2FsY1N0eWxlLCB3ZSBuZWVkIHRvIGRlZmVyIHRoZSBjbG9zZSB1bnRpbCB0aGUgc3R5bGUgaW5m b3JtYXRpb24gaXMgYWNjdXJhdGUgYW5kIGFsbCBlbGVtZW50cyBhcmUgcmUtYXR0YWNoZWQuCkBA IC0yMDA1LDIxICsxOTg1LDYgQEAgdm9pZCBEb2N1bWVudDo6aW1wbGljaXRDbG9zZSgpCiAgICAg Ly8gUGFyc2VyIHNob3VsZCBoYXZlIHBpY2tlZCB1cCBhbGwgcHJlbG9hZHMgYnkgbm93CiAgICAg bV9jYWNoZWRSZXNvdXJjZUxvYWRlci0+Y2xlYXJQcmVsb2FkcygpOwogCi0gICAgLy8gQ3JlYXRl IGEgaGVhZCBhbmQgYSBib2R5IGlmIHdlIGRvbid0IGhhdmUgdGhvc2UgeWV0IChlLmcuIGZvciBh Ym91dDpibGFuaykuCi0gICAgaWYgKCF0aGlzLT5ib2R5KCkgJiYgaXNIVE1MRG9jdW1lbnQoKSkg ewotICAgICAgICBpZiAoTm9kZSogZG9jdW1lbnRFbGVtZW50ID0gdGhpcy0+ZG9jdW1lbnRFbGVt ZW50KCkpIHsKLSAgICAgICAgICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOwotICAgICAgICAgICAg Ci0gICAgICAgICAgICAvLyBUaGUgaW1wbGljaXQgPGhlYWQ+IGlzbid0IGV4cGVjdGVkIGluIG9s ZGVyIHZlcnNpb25zIG9mIE1haWwgLSA8cmRhcjovL3Byb2JsZW0vNjg2Mzc5NT4KLSAgICAgICAg ICAgIGlmICghaGVhZCgpICYmIHNob3VsZENyZWF0ZUltcGxpY2l0SGVhZCh0aGlzKSkgewotICAg ICAgICAgICAgICAgIGRvY3VtZW50RWxlbWVudC0+YXBwZW5kQ2hpbGQoSFRNTEhlYWRFbGVtZW50 OjpjcmVhdGUodGhpcyksIGVjKTsKLSAgICAgICAgICAgICAgICBBU1NFUlQoIWVjKTsKLSAgICAg ICAgICAgIH0KLSAgICAgICAgICAgIGRvY3VtZW50RWxlbWVudC0+YXBwZW5kQ2hpbGQoSFRNTEJv ZHlFbGVtZW50OjpjcmVhdGUodGhpcyksIGVjKTsKLSAgICAgICAgICAgIEFTU0VSVCghZWMpOwot ICAgICAgICB9Ci0gICAgfQotCiAgICAgLy8gRklYTUU6IFdlIGtpY2sgb2ZmIHRoZSBpY29uIGxv YWRlciB3aGVuIHRoZSBEb2N1bWVudCBpcyBkb25lIHBhcnNpbmcuCiAgICAgLy8gVGhlcmUgYXJl IGVhcmxpZXIgb3Bwb3J0dW5pdGllcyB3ZSBjb3VsZCBzdGFydCBpdDoKICAgICAvLyAgLVdoZW4g dGhlIDxoZWFkPiBmaW5pc2hlcyBwYXJzaW5nCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvcGFy c2VyL0hUTUxUcmVlQnVpbGRlci5jcHAgYi9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxUcmVlQnVp bGRlci5jcHAKaW5kZXggNzQ1MzVkM2M4YjQ0MDEzZWQ0OTIyYmI2Nzg3NTllMDVkNTRhYTIwMS4u MjM5MTVkY2YwYjUwZmM2MWU3ZWVmYTZlMjQyZDAwZWY4YjhlOWJiYyAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9odG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9w YXJzZXIvSFRNTFRyZWVCdWlsZGVyLmNwcApAQCAtMjU5OCw3ICsyNTk4LDcgQEAgdm9pZCBIVE1M VHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRPZkZpbGUoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAg ICBjYXNlIEluQm9keU1vZGU6CiAgICAgY2FzZSBJbkNlbGxNb2RlOgogICAgICAgICBBU1NFUlQo aW5zZXJ0aW9uTW9kZSgpID09IEluQm9keU1vZGUgfHwgaW5zZXJ0aW9uTW9kZSgpID09IEluQ2Vs bE1vZGUpOwotICAgICAgICBub3RJbXBsZW1lbnRlZCgpOyAvLyBFbWl0IHBhcnNlIGVycm9yIGJh c2VkIG9uIHdoYXQgZWxlbXRucyBhcmUgc3RpbGwgb3Blbi4KKyAgICAgICAgbm90SW1wbGVtZW50 ZWQoKTsgLy8gRW1pdCBwYXJzZSBlcnJvciBiYXNlZCBvbiB3aGF0IGVsZW1lbnRzIGFyZSBzdGls bCBvcGVuLgogICAgICAgICBicmVhazsKICAgICBjYXNlIEFmdGVyQm9keU1vZGU6CiAgICAgY2Fz ZSBBZnRlckFmdGVyQm9keU1vZGU6CkBAIC0yNjQ3LDYgKzI2NDcsMTMgQEAgdm9pZCBIVE1MVHJl ZUJ1aWxkZXI6OnByb2Nlc3NFbmRPZkZpbGUoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAg ICAgcHJvY2Vzc0VuZE9mRmlsZSh0b2tlbik7CiAgICAgICAgIHJldHVybjsKICAgICBjYXNlIFRl eHRNb2RlOgorICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKKyAgICAgICAgaWYgKG1fdHJlZS5j dXJyZW50RWxlbWVudCgpLT5oYXNUYWdOYW1lKHNjcmlwdFRhZykpCisgICAgICAgICAgICBub3RJ bXBsZW1lbnRlZCgpOyAvLyBtYXJrIHRoZSBzY3JpcHQgZWxlbWVudCBhcyAiYWxyZWFkeSBzdGFy dGVkIi4KKyAgICAgICAgbV90cmVlLm9wZW5FbGVtZW50cygpLT5wb3AoKTsKKyAgICAgICAgc2V0 SW5zZXJ0aW9uTW9kZShtX29yaWdpbmFsSW5zZXJ0aW9uTW9kZSk7CisgICAgICAgIHByb2Nlc3NF bmRPZkZpbGUodG9rZW4pOworICAgICAgICByZXR1cm47CiAgICAgY2FzZSBJbkNhcHRpb25Nb2Rl OgogICAgIGNhc2UgSW5Sb3dNb2RlOgogICAgICAgICBub3RJbXBsZW1lbnRlZCgpOwo= 67431 2010-09-13 10:57:31 -0700 2010-09-13 13:49:57 -0700 Patch for landing bug-45644-20100913105730.patch text/plain 4410 abarth SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NzM5NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTAtMDktMTMgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KKworICAgICAgICBJbXBsZW1l bnQgRU9GIGhhbmRsaW5nIGluIFRleHRNb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD00NTY0NAorCisgICAgICAgIFRoaXMgcGF0Y2ggaXMgYWN0dWFs bHkgY292ZXJlZCBieSBhIGJ1bmNoIG9mIHRlc3RzLiAgV2Ugd2VyZSBqdXN0CisgICAgICAgIG1h Z2ljYWxseSBwYXNzaW5nIHRoZSB0ZXN0cyBiZWZvcmUgYmVjYXVzZSBvZiBzb21lIG51dHR5IGNv ZGUgaW4KKyAgICAgICAgRG9jdW1lbnQuY3BwLgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjppbXBsaWNpdENsb3NlKToKKyAgICAgICAg ICAgIC0gVGhpcyBjb2RlIHdhcyBtYXNraW5nIHRoZSBub3RJbXBsZW1lbnRlZCBpbiB0aGUgdHJl ZSBidWlsZGVyLgorICAgICAgICAgICAgICBJIGFsc28gcmVtb3ZlZCB0aGUgdXNlIG9mIHRoZSBz ZXR0aW5nIGJlY2F1c2UgaXQgd2Fzbid0IHdvcmtpbmcKKyAgICAgICAgICAgICAgcHJvcGVybHkg YW55d2F5LiAgSSdsbCBpbXBsZW1lbnQgYSB3b3JraW5nIHZlcnNpb24gc2hvcnRseS4KKyAgICAg ICAgKiBodG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5kT2ZGaWxlKToKKyAgICAgICAgICAgIC0gSW1wbGVt ZW50IHBlciB0aGUgc3BlYy4KKwogMjAxMC0wOS0xMyAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJr aXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogV2ViQ29y ZS9kb20vRG9jdW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZG9tL0RvY3VtZW50LmNw cAkocmV2aXNpb24gNjczOTYpCisrKyBXZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTE5NTksMjYgKzE5NTksNiBAQCB2b2lkIERvY3VtZW50OjpjbG9zZSgpCiAgICAg fQogfQogCi0vLyBGSVhNRTogVGhlc2Ugc2V0dGluZ3MgcHJvYmFibHkgZG9uJ3Qgd29yayBhbnlt b3JlLiAgV2Ugc2hvdWxkIGVpdGhlciByZW1vdmUKLS8vIHRoZW0gb3IgbWFrZSB0aGVtIHdvcmsg cHJvcGVybHkuCi0jaWZkZWYgQlVJTERJTkdfT05fTEVPUEFSRAotc3RhdGljIGJvb2wgc2hvdWxk Q3JlYXRlSW1wbGljaXRIZWFkKERvY3VtZW50KiBkb2N1bWVudCkKLXsKLSAgICBBU1NFUlQoZG9j dW1lbnQpOwotICAgIFNldHRpbmdzKiBzZXR0aW5ncyA9IGRvY3VtZW50LT5wYWdlKCkgPyBkb2N1 bWVudC0+cGFnZSgpLT5zZXR0aW5ncygpIDogMDsKLSAgICByZXR1cm4gc2V0dGluZ3MgPyAhc2V0 dGluZ3MtPm5lZWRzTGVvcGFyZE1haWxRdWlya3MoKSA6IHRydWU7Ci19Ci0jZWxpZiBkZWZpbmVk KEJVSUxESU5HX09OX1RJR0VSKQotc3RhdGljIGJvb2wgc2hvdWxkQ3JlYXRlSW1wbGljaXRIZWFk KERvY3VtZW50KiBkb2N1bWVudCkKLXsKLSAgICBBU1NFUlQoZG9jdW1lbnQpOwotICAgIFNldHRp bmdzKiBzZXR0aW5ncyA9IGRvY3VtZW50LT5wYWdlKCkgPyBkb2N1bWVudC0+cGFnZSgpLT5zZXR0 aW5ncygpIDogMDsKLSAgICByZXR1cm4gc2V0dGluZ3MgPyAhc2V0dGluZ3MtPm5lZWRzVGlnZXJN YWlsUXVpcmtzKCkgOiB0cnVlOwotfQotI2Vsc2UKLWlubGluZSBib29sIHNob3VsZENyZWF0ZUlt cGxpY2l0SGVhZChEb2N1bWVudCopIHsgcmV0dXJuIHRydWU7IH0KLSNlbmRpZgotCiB2b2lkIERv Y3VtZW50OjppbXBsaWNpdENsb3NlKCkKIHsKICAgICAvLyBJZiB3ZSdyZSBpbiB0aGUgbWlkZGxl IG9mIHJlY2FsY1N0eWxlLCB3ZSBuZWVkIHRvIGRlZmVyIHRoZSBjbG9zZSB1bnRpbCB0aGUgc3R5 bGUgaW5mb3JtYXRpb24gaXMgYWNjdXJhdGUgYW5kIGFsbCBlbGVtZW50cyBhcmUgcmUtYXR0YWNo ZWQuCkBAIC0yMDA1LDIxICsxOTg1LDYgQEAgdm9pZCBEb2N1bWVudDo6aW1wbGljaXRDbG9zZSgp CiAgICAgLy8gUGFyc2VyIHNob3VsZCBoYXZlIHBpY2tlZCB1cCBhbGwgcHJlbG9hZHMgYnkgbm93 CiAgICAgbV9jYWNoZWRSZXNvdXJjZUxvYWRlci0+Y2xlYXJQcmVsb2FkcygpOwogCi0gICAgLy8g Q3JlYXRlIGEgaGVhZCBhbmQgYSBib2R5IGlmIHdlIGRvbid0IGhhdmUgdGhvc2UgeWV0IChlLmcu IGZvciBhYm91dDpibGFuaykuCi0gICAgaWYgKCF0aGlzLT5ib2R5KCkgJiYgaXNIVE1MRG9jdW1l bnQoKSkgewotICAgICAgICBpZiAoTm9kZSogZG9jdW1lbnRFbGVtZW50ID0gdGhpcy0+ZG9jdW1l bnRFbGVtZW50KCkpIHsKLSAgICAgICAgICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOwotICAgICAg ICAgICAgCi0gICAgICAgICAgICAvLyBUaGUgaW1wbGljaXQgPGhlYWQ+IGlzbid0IGV4cGVjdGVk IGluIG9sZGVyIHZlcnNpb25zIG9mIE1haWwgLSA8cmRhcjovL3Byb2JsZW0vNjg2Mzc5NT4KLSAg ICAgICAgICAgIGlmICghaGVhZCgpICYmIHNob3VsZENyZWF0ZUltcGxpY2l0SGVhZCh0aGlzKSkg ewotICAgICAgICAgICAgICAgIGRvY3VtZW50RWxlbWVudC0+YXBwZW5kQ2hpbGQoSFRNTEhlYWRF bGVtZW50OjpjcmVhdGUodGhpcyksIGVjKTsKLSAgICAgICAgICAgICAgICBBU1NFUlQoIWVjKTsK LSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGRvY3VtZW50RWxlbWVudC0+YXBwZW5kQ2hpbGQo SFRNTEJvZHlFbGVtZW50OjpjcmVhdGUodGhpcyksIGVjKTsKLSAgICAgICAgICAgIEFTU0VSVCgh ZWMpOwotICAgICAgICB9Ci0gICAgfQotCiAgICAgLy8gRklYTUU6IFdlIGtpY2sgb2ZmIHRoZSBp Y29uIGxvYWRlciB3aGVuIHRoZSBEb2N1bWVudCBpcyBkb25lIHBhcnNpbmcuCiAgICAgLy8gVGhl cmUgYXJlIGVhcmxpZXIgb3Bwb3J0dW5pdGllcyB3ZSBjb3VsZCBzdGFydCBpdDoKICAgICAvLyAg LVdoZW4gdGhlIDxoZWFkPiBmaW5pc2hlcyBwYXJzaW5nCkluZGV4OiBXZWJDb3JlL2h0bWwvcGFy c2VyL0hUTUxUcmVlQnVpbGRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL3BhcnNl ci9IVE1MVHJlZUJ1aWxkZXIuY3BwCShyZXZpc2lvbiA2NzM5NikKKysrIFdlYkNvcmUvaHRtbC9w YXJzZXIvSFRNTFRyZWVCdWlsZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjU5NSw3ICsyNTk1 LDcgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRPZkZpbGUoQQogICAgIGNhc2Ug SW5Cb2R5TW9kZToKICAgICBjYXNlIEluQ2VsbE1vZGU6CiAgICAgICAgIEFTU0VSVChpbnNlcnRp b25Nb2RlKCkgPT0gSW5Cb2R5TW9kZSB8fCBpbnNlcnRpb25Nb2RlKCkgPT0gSW5DZWxsTW9kZSk7 Ci0gICAgICAgIG5vdEltcGxlbWVudGVkKCk7IC8vIEVtaXQgcGFyc2UgZXJyb3IgYmFzZWQgb24g d2hhdCBlbGVtdG5zIGFyZSBzdGlsbCBvcGVuLgorICAgICAgICBub3RJbXBsZW1lbnRlZCgpOyAv LyBFbWl0IHBhcnNlIGVycm9yIGJhc2VkIG9uIHdoYXQgZWxlbWVudHMgYXJlIHN0aWxsIG9wZW4u CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQWZ0ZXJCb2R5TW9kZToKICAgICBjYXNlIEFmdGVy QWZ0ZXJCb2R5TW9kZToKQEAgLTI2NDYsNiArMjY0NiwxMyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRl cjo6cHJvY2Vzc0VuZE9mRmlsZShBCiAgICAgICAgIHByb2Nlc3NFbmRPZkZpbGUodG9rZW4pOwog ICAgICAgICByZXR1cm47CiAgICAgY2FzZSBUZXh0TW9kZToKKyAgICAgICAgcGFyc2VFcnJvcih0 b2tlbik7CisgICAgICAgIGlmIChtX3RyZWUuY3VycmVudEVsZW1lbnQoKS0+aGFzVGFnTmFtZShz Y3JpcHRUYWcpKQorICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsgLy8gbWFyayB0aGUgc2Ny aXB0IGVsZW1lbnQgYXMgImFscmVhZHkgc3RhcnRlZCIuCisgICAgICAgIG1fdHJlZS5vcGVuRWxl bWVudHMoKS0+cG9wKCk7CisgICAgICAgIHNldEluc2VydGlvbk1vZGUobV9vcmlnaW5hbEluc2Vy dGlvbk1vZGUpOworICAgICAgICBwcm9jZXNzRW5kT2ZGaWxlKHRva2VuKTsKKyAgICAgICAgcmV0 dXJuOwogICAgIGNhc2UgSW5DYXB0aW9uTW9kZToKICAgICBjYXNlIEluUm93TW9kZToKICAgICAg ICAgbm90SW1wbGVtZW50ZWQoKTsK