80170 2012-03-02 10:27:25 -0800 Contents of noscript elements turned into strings in WebArchives 2012-05-10 14:08:45 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jberlin beidson adachan beidson japhet jberlin sfalken webkit-bug-importer webkit.review.bot oldest_to_newest 569747 0 129920 jberlin 2012-03-02 10:27:25 -0800 Created attachment 129920 Reduced case with a noscript element When a page with the following markup: <!DOCTYPE html> <html> <head> <title>Page With No Script Element To Be WebArchived</title> </head> <body> <div>If JS is turned off, you should see red text below</div> <div> <noscript> <div height="200" width="200" style="color: red">Some red text</div> </noscript> </div> </body> </html> is saved as a Web Archive, the contents of the noscript element inside the Web Archive are put into a string: <!DOCTYPE html> <html><head> <title>Page With No Script Element</title> </head> <body> <div>If JS is turned off, you should see red text below</div> <div> <noscript> &lt;div height="200" width="200" style="color: red"&gt;Some red text&lt;/div&gt; </noscript> </div> </body></html> I first noticed this on r109561, but the comment from https://bugs.webkit.org/show_bug.cgi?id=13522 indicates that this was happening as far back as August 2010. 569749 1 jberlin 2012-03-02 10:29:54 -0800 <rdar://problem/10972534> 569750 2 beidson 2012-03-02 10:30:04 -0800 When we create a WebArchive, we serialize the DOM. Since the contents of the <noscript> tag is never parsed into the DOM tree when scripting is enabled, they remain the innertext of the <noscript> tag. I agree this is weird, but is there a real world symptom? 569751 3 webkit-bug-importer 2012-03-02 10:33:38 -0800 <rdar://problem/10972577> 569760 4 jberlin 2012-03-02 10:40:23 -0800 (In reply to comment #2) > When we create a WebArchive, we serialize the DOM. > > Since the contents of the <noscript> tag is never parsed into the DOM tree when scripting is enabled, they remain the innertext of the <noscript> tag. > > I agree this is weird, but is there a real world symptom? The real word symptom is odd strings appearing in webarchives that were created with JavaScript enabled, but the user has decided to look at with JavaScript disabled. 620848 5 beidson 2012-05-10 12:21:52 -0700 There's a much deeper question about how innerHTML of <noscript> is expected to work in both a scripting and non-scripting environment that I believe Alexey is planning to pursue with the spec. But for webarchives, we can solve this by filtering out the <noscript> elements completely if scripting is enabled. Patch coming soon. 620871 6 141229 beidson 2012-05-10 12:41:31 -0700 Created attachment 141229 Patch v1 620902 7 141229 aestes 2012-05-10 13:29:48 -0700 Comment on attachment 141229 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=141229&action=review > Source/WebCore/editing/MarkupAccumulator.h:73 > + String serializeNodes(Node* targetNode, Node* nodeToSkip, EChildrenOnly, Vector<QualifiedName>* tagNamesToSkip); You should make this new argument optional. > Source/WebCore/page/PageSerializer.cpp:217 > + String text = accumulator.serializeNodes(document->documentElement(), 0, IncludeNode, 0); You wouldn't have to change this line if the new argument to serializeNodes() were optional. 620944 8 beidson 2012-05-10 14:08:45 -0700 http://trac.webkit.org/changeset/116685 129920 2012-03-02 10:27:25 -0800 2012-03-02 10:27:25 -0800 Reduced case with a noscript element noscript_to_webarchive.html text/html 333 jberlin PCFET0NUWVBFIGh0bWw+CjxodG1sPgogIDxoZWFkPgogICAgPHRpdGxlPlBhZ2UgV2l0aCBObyBT Y3JpcHQgRWxlbWVudCBUbyBCZSBXZWJBcmNoaXZlZDwvdGl0bGU+CiAgPC9oZWFkPgogIDxib2R5 PgogICAgPGRpdj5JZiBKUyBpcyB0dXJuZWQgb2ZmLCB5b3Ugc2hvdWxkIHNlZSByZWQgdGV4dCBi ZWxvdzwvZGl2PgogICAgPGRpdj4KICAgICAgPG5vc2NyaXB0PgogICAgICAgIDxkaXYgaGVpZ2h0 PSIyMDAiIHdpZHRoPSIyMDAiIHN0eWxlPSJjb2xvcjogcmVkIj5Tb21lIHJlZCB0ZXh0PC9kaXY+ CiAgICAgIDwvbm9zY3JpcHQ+CiAgICA8L2Rpdj4KICA8L2JvZHk+CjwvaHRtbD4K 141229 2012-05-10 12:41:31 -0700 2012-05-10 13:29:47 -0700 Patch v1 patch.txt text/plain 12616 beidson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1YTY4N2I4Li40N2QyZGY4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTItMDUt MTAgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8xMDk3MjU3Nz4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD04MDE3MAorICAgICAgICBDb250ZW50cyBvZiBub3NjcmlwdCBlbGVtZW50cyB0dXJuZWQg aW50byBzdHJpbmdzIGluIFdlYkFyY2hpdmVzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiB3ZWJhcmNoaXZlL2lnbm9yZS1ub3NjcmlwdC1pZi1zY3Jp cHRpbmctZW5hYmxlZC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIHdlYmFyY2hpdmUv aWdub3JlLW5vc2NyaXB0LWlmLXNjcmlwdGluZy1lbmFibGVkLmh0bWw6IEFkZGVkLgorCiAyMDEy LTA1LTEwICBWYXJ1biBKYWluICA8dmFydW5qYWluQGdvb2dsZS5jb20+CiAKICAgICAgICAgW2No cm9taXVtXSBUcmlnZ2VyIGNvbnRleHQgbWVudSBmb3IgbG9uZyBwcmVzcyBnZXN0dXJlCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy93ZWJhcmNoaXZlL2lnbm9yZS1ub3NjcmlwdC1pZi1zY3JpcHRp bmctZW5hYmxlZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy93ZWJhcmNoaXZlL2lnbm9yZS1u b3NjcmlwdC1pZi1zY3JpcHRpbmctZW5hYmxlZC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMC4uN2U2YmIzNQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL3dlYmFyY2hpdmUvaWdub3JlLW5vc2NyaXB0LWlmLXNjcmlwdGluZy1lbmFibGVkLWV4cGVj dGVkLnR4dApAQCAtMCwwICsxLDMwIEBACis8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJV VEYtOCI/PgorPCFET0NUWVBFIHBsaXN0IFBVQkxJQyAiLS8vQXBwbGUvL0RURCBQTElTVCAxLjAv L0VOIiAiaHR0cDovL3d3dy5hcHBsZS5jb20vRFREcy9Qcm9wZXJ0eUxpc3QtMS4wLmR0ZCI+Cis8 cGxpc3QgdmVyc2lvbj0iMS4wIj4KKzxkaWN0PgorCTxrZXk+V2ViTWFpblJlc291cmNlPC9rZXk+ CisJPGRpY3Q+CisJCTxrZXk+V2ViUmVzb3VyY2VEYXRhPC9rZXk+CisJCTxzdHJpbmc+Jmx0O2h0 bWwmZ3Q7Jmx0O2hlYWQmZ3Q7CismbHQ7c2NyaXB0Jmd0OworICAgIGlmICh3aW5kb3cubGF5b3V0 VGVzdENvbnRyb2xsZXIpCisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBET01Bc1dl YkFyY2hpdmUoKTsKKyZsdDsvc2NyaXB0Jmd0OworJmx0Oy9oZWFkJmd0OworJmx0O2JvZHkmZ3Q7 CitUaGlzIHNob3VsZCBhcHBlYXIgaW4gdGhlIHdlYmFyY2hpdmUuCisKKworCismbHQ7L2JvZHkm Z3Q7Jmx0Oy9odG1sJmd0Ozwvc3RyaW5nPgorCQk8a2V5PldlYlJlc291cmNlRnJhbWVOYW1lPC9r ZXk+CisJCTxzdHJpbmc+PC9zdHJpbmc+CisJCTxrZXk+V2ViUmVzb3VyY2VNSU1FVHlwZTwva2V5 PgorCQk8c3RyaW5nPnRleHQvaHRtbDwvc3RyaW5nPgorCQk8a2V5PldlYlJlc291cmNlVGV4dEVu Y29kaW5nTmFtZTwva2V5PgorCQk8c3RyaW5nPlVURi04PC9zdHJpbmc+CisJCTxrZXk+V2ViUmVz b3VyY2VVUkw8L2tleT4KKwkJPHN0cmluZz5maWxlOi8vL0xheW91dFRlc3RzL3dlYmFyY2hpdmUv aWdub3JlLW5vc2NyaXB0LWlmLXNjcmlwdGluZy1lbmFibGVkLmh0bWw8L3N0cmluZz4KKwk8L2Rp Y3Q+Cis8L2RpY3Q+Cis8L3BsaXN0PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvd2ViYXJjaGl2 ZS9pZ25vcmUtbm9zY3JpcHQtaWYtc2NyaXB0aW5nLWVuYWJsZWQuaHRtbCBiL0xheW91dFRlc3Rz L3dlYmFyY2hpdmUvaWdub3JlLW5vc2NyaXB0LWlmLXNjcmlwdGluZy1lbmFibGVkLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNjVlYzY1MgotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL3dlYmFyY2hpdmUvaWdub3JlLW5vc2NyaXB0LWlmLXNjcmlwdGluZy1l bmFibGVkLmh0bWwKQEAgLTAsMCArMSwxNCBAQAorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQ+Cisg ICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICAgICAgbGF5b3V0VGVzdENv bnRyb2xsZXIuZHVtcERPTUFzV2ViQXJjaGl2ZSgpOworPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9k eT4KK1RoaXMgc2hvdWxkIGFwcGVhciBpbiB0aGUgd2ViYXJjaGl2ZS4KKzxub3NjcmlwdD4KK0Fz c3VtaW5nIHNjcmlwdGluZyB3YXMgZW5hYmxlZCBlYXJsaWVyLCB0aGlzIHNob3VsZCAqbm90KiBh cHBlYXIgaW4gdGhlIHdlYmFyY2hpdmUuCis8L25vc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IGJjMWFiMTcuLmM0YzMxZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNiBA QAorMjAxMi0wNS0xMCAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzEwOTcyNTc3PiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTgwMTcwCisgICAgICAgIENvbnRlbnRzIG9mIG5vc2NyaXB0IGVsZW1l bnRzIHR1cm5lZCBpbnRvIHN0cmluZ3MgaW4gV2ViQXJjaGl2ZXMKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVyZSdzIGEgbXVjaCBkZWVwZXIgcXVl c3Rpb24gYWJvdXQgaG93IGlubmVySFRNTCBvZiA8bm9zY3JpcHQ+IGlzIGV4cGVjdGVkIHRvIHdv cmsgaW4gCisgICAgICAgIGJvdGggYSBzY3JpcHRpbmcgYW5kIG5vbi1zY3JpcHRpbmcgZW52aXJv bm1lbnQgdGhhdCB3ZSBzaG91bGQgcHVyc3VlIHNlcGFyYXRlbHkuCisKKyAgICAgICAgQnV0IGZv ciB3ZWJhcmNoaXZlcywgd2UgY2FuIHNvbHZlIHRoaXMgYnkgZmlsdGVyaW5nIG91dCB0aGUgPG5v c2NyaXB0PiBlbGVtZW50cyBjb21wbGV0ZWx5IAorICAgICAgICBpZiBzY3JpcHRpbmcgaXMgZW5h YmxlZC4KKworICAgICAgICBUZXN0OiB3ZWJhcmNoaXZlL2lnbm9yZS1ub3NjcmlwdC1pZi1zY3Jp cHRpbmctZW5hYmxlZC5odG1sCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKworICAgICAg ICBBZGQgYXJndW1lbnRzIHRvIGNyZWF0ZU1hcmt1cCBhbmQgTWFya3VwQWNjdW11bGF0b3IgbWV0 aG9kcyB0byBwYXNzIGEgVmVjdG9yIG9mIFF1YWxpZmllZE5hbWVzCisgICAgICAgIHRoYXQgc2hv dWxkIGJlIGZpbHRlcmVkIGZyb20gdGhlIHJlc3VsdGluZyBtYXJrdXA6CisgICAgICAgICogZWRp dGluZy9NYXJrdXBBY2N1bXVsYXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNYXJrdXBBY2N1 bXVsYXRvcjo6c2VyaWFsaXplTm9kZXMpOgorICAgICAgICAoV2ViQ29yZTo6TWFya3VwQWNjdW11 bGF0b3I6OnNlcmlhbGl6ZU5vZGVzV2l0aE5hbWVzcGFjZXMpOgorICAgICAgICAqIGVkaXRpbmcv TWFya3VwQWNjdW11bGF0b3IuaDoKKyAgICAgICAgKiBlZGl0aW5nL21hcmt1cC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpjcmVhdGVNYXJrdXApOgorICAgICAgICAqIGVkaXRpbmcvbWFya3VwLmg6 CisgICAgICAgICogcGFnZS9QYWdlU2VyaWFsaXplci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQ YWdlU2VyaWFsaXplcjo6c2VyaWFsaXplRnJhbWUpOgorCisgICAgICAgIElmIHNjcmlwdGluZyBp cyBlbmFibGVkLCBhZGQgdGhlIG5vc2NyaXB0VGFnIHRvIHRoZSB0YWcgbmFtZXMgdG8gZmlsdGVy OgorICAgICAgICAqIGxvYWRlci9hcmNoaXZlL2NmL0xlZ2FjeVdlYkFyY2hpdmUuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TGVnYWN5V2ViQXJjaGl2ZTo6Y3JlYXRlKToKKwogMjAxMi0wNS0xMCAg VG9tbXkgV2lkZW5mbHljaHQgIDx0b21teXdAZ29vZ2xlLmNvbT4KIAogICAgICAgICBNZWRpYVN0 cmVhbSBBUEk6IEZpeCBNZWRpYUhpbnRzIHBhcnNpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KaW5kZXgg N2JjYmUxNS4uMjRhMmQ2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAu aW4KKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KQEAgLTI5Myw3ICsyOTMsNyBA QCBfX1pON1dlYkNvcmUxMlRleHRJdGVyYXRvckQxRXYKIF9fWk43V2ViQ29yZTEyV29ya2VyVGhy ZWFkMTd3b3JrZXJUaHJlYWRDb3VudEV2CiAjZW5kaWYKIF9fWk43V2ViQ29yZTEyY2FjaGVTdG9y YWdlRXYKLV9fWk43V2ViQ29yZTEyY3JlYXRlTWFya3VwRVBLTlNfNE5vZGVFTlNfMTNFQ2hpbGRy ZW5Pbmx5RVBOM1dURjZWZWN0b3JJUFMwX0xtMEVFRU5TXzEzRUFic29sdXRlVVJMc0UKK19fWk43 V2ViQ29yZTEyY3JlYXRlTWFya3VwRVBLTlNfNE5vZGVFTlNfMTNFQ2hpbGRyZW5Pbmx5RVBOM1dU RjZWZWN0b3JJUFMwX0xtMEVFRU5TXzEzRUFic29sdXRlVVJMc0VQTlM1X0lOU18xM1F1YWxpZmll ZE5hbWVFTG0wRUVFCiBfX1pON1dlYkNvcmUxMmNyZWF0ZU1hcmt1cEVQS05TXzVSYW5nZUVQTjNX VEY2VmVjdG9ySVBOU180Tm9kZUVMbTBFRUVOU18yM0VBbm5vdGF0ZUZvckludGVyY2hhbmdlRWJO U18xM0VBYnNvbHV0ZVVSTHNFCiBfX1pON1dlYkNvcmUxMmdjQ29udHJvbGxlckV2CiBfX1pON1dl YkNvcmUxMmljb25EYXRhYmFzZUV2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5n L01hcmt1cEFjY3VtdWxhdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvTWFya3VwQWNj dW11bGF0b3IuY3BwCmluZGV4IDgwMDUwZmYuLjM5YjNhN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvTWFya3VwQWNjdW11bGF0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvTWFya3VwQWNjdW11bGF0b3IuY3BwCkBAIC04NCwxNiArODQsMjMgQEAgTWFya3Vw QWNjdW11bGF0b3I6On5NYXJrdXBBY2N1bXVsYXRvcigpCiB7CiB9CiAKLVN0cmluZyBNYXJrdXBB Y2N1bXVsYXRvcjo6c2VyaWFsaXplTm9kZXMoTm9kZSogdGFyZ2V0Tm9kZSwgTm9kZSogbm9kZVRv U2tpcCwgRUNoaWxkcmVuT25seSBjaGlsZHJlbk9ubHkpCitTdHJpbmcgTWFya3VwQWNjdW11bGF0 b3I6OnNlcmlhbGl6ZU5vZGVzKE5vZGUqIHRhcmdldE5vZGUsIE5vZGUqIG5vZGVUb1NraXAsIEVD aGlsZHJlbk9ubHkgY2hpbGRyZW5Pbmx5LCBWZWN0b3I8UXVhbGlmaWVkTmFtZT4qIHRhZ05hbWVz VG9Ta2lwKQogewotICAgIHNlcmlhbGl6ZU5vZGVzV2l0aE5hbWVzcGFjZXModGFyZ2V0Tm9kZSwg bm9kZVRvU2tpcCwgY2hpbGRyZW5Pbmx5LCAwKTsKKyAgICBzZXJpYWxpemVOb2Rlc1dpdGhOYW1l c3BhY2VzKHRhcmdldE5vZGUsIG5vZGVUb1NraXAsIGNoaWxkcmVuT25seSwgMCwgdGFnTmFtZXNU b1NraXApOwogICAgIHJldHVybiBtX21hcmt1cC50b1N0cmluZygpOwogfQogCi12b2lkIE1hcmt1 cEFjY3VtdWxhdG9yOjpzZXJpYWxpemVOb2Rlc1dpdGhOYW1lc3BhY2VzKE5vZGUqIHRhcmdldE5v ZGUsIE5vZGUqIG5vZGVUb1NraXAsIEVDaGlsZHJlbk9ubHkgY2hpbGRyZW5Pbmx5LCBjb25zdCBO YW1lc3BhY2VzKiBuYW1lc3BhY2VzKQordm9pZCBNYXJrdXBBY2N1bXVsYXRvcjo6c2VyaWFsaXpl Tm9kZXNXaXRoTmFtZXNwYWNlcyhOb2RlKiB0YXJnZXROb2RlLCBOb2RlKiBub2RlVG9Ta2lwLCBF Q2hpbGRyZW5Pbmx5IGNoaWxkcmVuT25seSwgY29uc3QgTmFtZXNwYWNlcyogbmFtZXNwYWNlcywg VmVjdG9yPFF1YWxpZmllZE5hbWU+KiB0YWdOYW1lc1RvU2tpcCkKIHsKICAgICBpZiAodGFyZ2V0 Tm9kZSA9PSBub2RlVG9Ta2lwKQogICAgICAgICByZXR1cm47CisgICAgCisgICAgaWYgKHRhZ05h bWVzVG9Ta2lwKSB7CisgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgdGFnTmFtZXNUb1Nr aXAtPnNpemUoKTsgKytpKSB7CisgICAgICAgICAgICBpZiAodGFyZ2V0Tm9kZS0+aGFzVGFnTmFt ZSh0YWdOYW1lc1RvU2tpcC0+YXQoaSkpKQorICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgfQorICAgIH0KIAogICAgIE5hbWVzcGFjZXMgbmFtZXNwYWNlSGFzaDsKICAgICBpZiAobmFt ZXNwYWNlcykKQEAgLTEwNCw3ICsxMTEsNyBAQCB2b2lkIE1hcmt1cEFjY3VtdWxhdG9yOjpzZXJp YWxpemVOb2Rlc1dpdGhOYW1lc3BhY2VzKE5vZGUqIHRhcmdldE5vZGUsIE5vZGUqIG5vZAogCiAg ICAgaWYgKCEodGFyZ2V0Tm9kZS0+ZG9jdW1lbnQoKS0+aXNIVE1MRG9jdW1lbnQoKSAmJiBlbGVt ZW50Q2Fubm90SGF2ZUVuZFRhZyh0YXJnZXROb2RlKSkpIHsKICAgICAgICAgZm9yIChOb2RlKiBj dXJyZW50ID0gdGFyZ2V0Tm9kZS0+Zmlyc3RDaGlsZCgpOyBjdXJyZW50OyBjdXJyZW50ID0gY3Vy cmVudC0+bmV4dFNpYmxpbmcoKSkKLSAgICAgICAgICAgIHNlcmlhbGl6ZU5vZGVzV2l0aE5hbWVz cGFjZXMoY3VycmVudCwgbm9kZVRvU2tpcCwgSW5jbHVkZU5vZGUsICZuYW1lc3BhY2VIYXNoKTsK KyAgICAgICAgICAgIHNlcmlhbGl6ZU5vZGVzV2l0aE5hbWVzcGFjZXMoY3VycmVudCwgbm9kZVRv U2tpcCwgSW5jbHVkZU5vZGUsICZuYW1lc3BhY2VIYXNoLCB0YWdOYW1lc1RvU2tpcCk7CiAgICAg fQogCiAgICAgaWYgKCFjaGlsZHJlbk9ubHkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9l ZGl0aW5nL01hcmt1cEFjY3VtdWxhdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL01hcmt1 cEFjY3VtdWxhdG9yLmgKaW5kZXggMzY3Yjc5Zi4uMzMwYjEwYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvZWRpdGluZy9NYXJrdXBBY2N1bXVsYXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvTWFya3VwQWNjdW11bGF0b3IuaApAQCAtNzAsNyArNzAsNyBAQCBwdWJsaWM6CiAg ICAgTWFya3VwQWNjdW11bGF0b3IoVmVjdG9yPE5vZGUqPiosIEVBYnNvbHV0ZVVSTHMsIGNvbnN0 IFJhbmdlKiA9IDApOwogICAgIHZpcnR1YWwgfk1hcmt1cEFjY3VtdWxhdG9yKCk7CiAKLSAgICBT dHJpbmcgc2VyaWFsaXplTm9kZXMoTm9kZSogdGFyZ2V0Tm9kZSwgTm9kZSogbm9kZVRvU2tpcCwg RUNoaWxkcmVuT25seSk7CisgICAgU3RyaW5nIHNlcmlhbGl6ZU5vZGVzKE5vZGUqIHRhcmdldE5v ZGUsIE5vZGUqIG5vZGVUb1NraXAsIEVDaGlsZHJlbk9ubHksIFZlY3RvcjxRdWFsaWZpZWROYW1l PiogdGFnTmFtZXNUb1NraXApOwogCiAgICAgc3RhdGljIHZvaWQgYXBwZW5kQ29tbWVudChTdHJp bmdCdWlsZGVyJiwgY29uc3QgU3RyaW5nJik7CiAKQEAgLTEwOCw3ICsxMDgsNyBAQCBwcm90ZWN0 ZWQ6CiBwcml2YXRlOgogICAgIFN0cmluZyByZXNvbHZlVVJMSWZOZWVkZWQoY29uc3QgRWxlbWVu dCosIGNvbnN0IFN0cmluZyYpIGNvbnN0OwogICAgIHZvaWQgYXBwZW5kUXVvdGVkVVJMQXR0cmli dXRlVmFsdWUoU3RyaW5nQnVpbGRlciYsIGNvbnN0IEVsZW1lbnQqLCBjb25zdCBBdHRyaWJ1dGUm KTsKLSAgICB2b2lkIHNlcmlhbGl6ZU5vZGVzV2l0aE5hbWVzcGFjZXMoTm9kZSogdGFyZ2V0Tm9k ZSwgTm9kZSogbm9kZVRvU2tpcCwgRUNoaWxkcmVuT25seSwgY29uc3QgTmFtZXNwYWNlcyopOwor ICAgIHZvaWQgc2VyaWFsaXplTm9kZXNXaXRoTmFtZXNwYWNlcyhOb2RlKiB0YXJnZXROb2RlLCBO b2RlKiBub2RlVG9Ta2lwLCBFQ2hpbGRyZW5Pbmx5LCBjb25zdCBOYW1lc3BhY2VzKiwgVmVjdG9y PFF1YWxpZmllZE5hbWU+KiB0YWdOYW1lc1RvU2tpcCk7CiAKICAgICBTdHJpbmdCdWlsZGVyIG1f bWFya3VwOwogICAgIGNvbnN0IEVBYnNvbHV0ZVVSTHMgbV9yZXNvbHZlVVJMc01ldGhvZDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFya3VwLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2VkaXRpbmcvbWFya3VwLmNwcAppbmRleCBkMmM4MzNjLi5hMWM1YTMzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hcmt1cC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv ZWRpdGluZy9tYXJrdXAuY3BwCkBAIC03NTksNyArNzU5LDcgQEAgUGFzc1JlZlB0cjxEb2N1bWVu dEZyYWdtZW50PiBjcmVhdGVGcmFnbWVudEZyb21NYXJrdXBXaXRoQ29udGV4dChEb2N1bWVudCog ZG9jdW0KICAgICByZXR1cm4gZnJhZ21lbnQ7CiB9CiAKLVN0cmluZyBjcmVhdGVNYXJrdXAoY29u c3QgTm9kZSogbm9kZSwgRUNoaWxkcmVuT25seSBjaGlsZHJlbk9ubHksIFZlY3RvcjxOb2RlKj4q IG5vZGVzLCBFQWJzb2x1dGVVUkxzIHNob3VsZFJlc29sdmVVUkxzKQorU3RyaW5nIGNyZWF0ZU1h cmt1cChjb25zdCBOb2RlKiBub2RlLCBFQ2hpbGRyZW5Pbmx5IGNoaWxkcmVuT25seSwgVmVjdG9y PE5vZGUqPiogbm9kZXMsIEVBYnNvbHV0ZVVSTHMgc2hvdWxkUmVzb2x2ZVVSTHMsIFZlY3RvcjxR dWFsaWZpZWROYW1lPiogdGFnTmFtZXNUb1NraXApCiB7CiAgICAgaWYgKCFub2RlKQogICAgICAg ICByZXR1cm4gIiI7CkBAIC03NzIsNyArNzcyLDcgQEAgU3RyaW5nIGNyZWF0ZU1hcmt1cChjb25z dCBOb2RlKiBub2RlLCBFQ2hpbGRyZW5Pbmx5IGNoaWxkcmVuT25seSwgVmVjdG9yPE5vZGUqPioK ICAgICB9CiAKICAgICBNYXJrdXBBY2N1bXVsYXRvciBhY2N1bXVsYXRvcihub2Rlcywgc2hvdWxk UmVzb2x2ZVVSTHMpOwotICAgIHJldHVybiBhY2N1bXVsYXRvci5zZXJpYWxpemVOb2Rlcyhjb25z dF9jYXN0PE5vZGUqPihub2RlKSwgZGVsZXRlQnV0dG9uQ29udGFpbmVyRWxlbWVudCwgY2hpbGRy ZW5Pbmx5KTsKKyAgICByZXR1cm4gYWNjdW11bGF0b3Iuc2VyaWFsaXplTm9kZXMoY29uc3RfY2Fz dDxOb2RlKj4obm9kZSksIGRlbGV0ZUJ1dHRvbkNvbnRhaW5lckVsZW1lbnQsIGNoaWxkcmVuT25s eSwgdGFnTmFtZXNUb1NraXApOwogfQogCiBzdGF0aWMgdm9pZCBmaWxsQ29udGFpbmVyRnJvbVN0 cmluZyhDb250YWluZXJOb2RlKiBwYXJhZ3JhcGgsIGNvbnN0IFN0cmluZyYgc3RyaW5nKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYXJrdXAuaCBiL1NvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvbWFya3VwLmgKaW5kZXggOTE4YWU5Yi4uNjI1ZmQ2ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvZWRpdGluZy9tYXJrdXAuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5n L21hcmt1cC5oCkBAIC0zOSw2ICszOSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBjbGFz cyBFbGVtZW50OwogICAgIGNsYXNzIEtVUkw7CiAgICAgY2xhc3MgTm9kZTsKKyAgICBjbGFzcyBR dWFsaWZpZWROYW1lOwogICAgIGNsYXNzIFJhbmdlOwogCiAgICAgdHlwZWRlZiBpbnQgRXhjZXB0 aW9uQ29kZTsKQEAgLTYwLDcgKzYxLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgU3Ry aW5nIGNyZWF0ZU1hcmt1cChjb25zdCBSYW5nZSosCiAgICAgICAgIFZlY3RvcjxOb2RlKj4qID0g MCwgRUFubm90YXRlRm9ySW50ZXJjaGFuZ2UgPSBEb05vdEFubm90YXRlRm9ySW50ZXJjaGFuZ2Us IGJvb2wgY29udmVydEJsb2Nrc1RvSW5saW5lcyA9IGZhbHNlLCBFQWJzb2x1dGVVUkxzID0gRG9O b3RSZXNvbHZlVVJMcyk7Ci0gICAgU3RyaW5nIGNyZWF0ZU1hcmt1cChjb25zdCBOb2RlKiwgRUNo aWxkcmVuT25seSA9IEluY2x1ZGVOb2RlLCBWZWN0b3I8Tm9kZSo+KiA9IDAsIEVBYnNvbHV0ZVVS THMgPSBEb05vdFJlc29sdmVVUkxzKTsKKyAgICBTdHJpbmcgY3JlYXRlTWFya3VwKGNvbnN0IE5v ZGUqLCBFQ2hpbGRyZW5Pbmx5ID0gSW5jbHVkZU5vZGUsIFZlY3RvcjxOb2RlKj4qID0gMCwgRUFi c29sdXRlVVJMcyA9IERvTm90UmVzb2x2ZVVSTHMsIFZlY3RvcjxRdWFsaWZpZWROYW1lPiogdGFn TmFtZXNUb1NraXAgPSAwKTsKICAgICAKICAgICBTdHJpbmcgY3JlYXRlRnVsbE1hcmt1cChjb25z dCBOb2RlKik7CiAgICAgU3RyaW5nIGNyZWF0ZUZ1bGxNYXJrdXAoY29uc3QgUmFuZ2UqKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZlL2NmL0xlZ2FjeVdlYkFyY2hp dmUuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hpdmUvY2YvTGVnYWN5V2ViQXJjaGl2 ZS5jcHAKaW5kZXggOWJlODhkMi4uOTQyNDUyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL2FyY2hpdmUvY2YvTGVnYWN5V2ViQXJjaGl2ZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL2FyY2hpdmUvY2YvTGVnYWN5V2ViQXJjaGl2ZS5jcHAKQEAgLTQ0LDcgKzQ0LDkg QEAKICNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAibWFya3VwLmgiCiAjaW5jbHVkZSAi Tm9kZS5oIgorI2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJSYW5nZS5oIgorI2luY2x1ZGUg IlNldHRpbmdzLmgiCiAjaW5jbHVkZSAiU2hhcmVkQnVmZmVyLmgiCiAjaW5jbHVkZSA8d3RmL3Rl eHQvQ1N0cmluZy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgpAQCAtNDM4LDkg KzQ0MCwxOCBAQCBQYXNzUmVmUHRyPExlZ2FjeVdlYkFyY2hpdmU+IExlZ2FjeVdlYkFyY2hpdmU6 OmNyZWF0ZShOb2RlKiBub2RlLCBGcmFtZUZpbHRlciogZgogICAgIEZyYW1lKiBmcmFtZSA9IGRv Y3VtZW50ID8gZG9jdW1lbnQtPmZyYW1lKCkgOiAwOwogICAgIGlmICghZnJhbWUpCiAgICAgICAg IHJldHVybiBjcmVhdGUoKTsKKworICAgIC8vIElmIHRoZSBwYWdlIHdhcyBsb2FkZWQgd2l0aCBq YXZhc2NyaXB0IGVuYWJsZWQsIHdlIGRvbid0IHdhbnQgdG8gYXJjaGl2ZSA8bm9zY3JpcHQ+IHRh Z3MKKyAgICAvLyBJbiBwcmFjdGljZSB3ZSBkb24ndCBhY3R1YWxseSBrbm93IHdoZXRoZXIgc2Ny aXB0aW5nIHdhcyBlbmFibGVkIHdoZW4gdGhlIHBhZ2Ugd2FzIG9yaWdpbmFsbHkgbG9hZGVkCisg ICAgLy8gYnV0IHdlIGNhbiBhcHByb3hpbWF0ZSB0aGF0IGJ5IGNoZWNraW5nIGlmIHNjcmlwdGlu ZyBpcyBlbmFibGVkIHJpZ2h0IG5vdy4KKyAgICBPd25QdHI8VmVjdG9yPFF1YWxpZmllZE5hbWU+ ID4gdGFnTmFtZXNUb0ZpbHRlcjsKKyAgICBpZiAoZnJhbWUtPnBhZ2UoKSAmJiBmcmFtZS0+cGFn ZSgpLT5zZXR0aW5ncygpLT5pc1NjcmlwdEVuYWJsZWQoKSkgeworICAgICAgICB0YWdOYW1lc1Rv RmlsdGVyID0gYWRvcHRQdHIobmV3IFZlY3RvcjxRdWFsaWZpZWROYW1lPik7CisgICAgICAgIHRh Z05hbWVzVG9GaWx0ZXItPmFwcGVuZChIVE1MTmFtZXM6Om5vc2NyaXB0VGFnKTsKKyAgICB9CiAg ICAgICAgIAogICAgIFZlY3RvcjxOb2RlKj4gbm9kZUxpc3Q7Ci0gICAgU3RyaW5nIG1hcmt1cFN0 cmluZyA9IGNyZWF0ZU1hcmt1cChub2RlLCBJbmNsdWRlTm9kZSwgJm5vZGVMaXN0KTsKKyAgICBT dHJpbmcgbWFya3VwU3RyaW5nID0gY3JlYXRlTWFya3VwKG5vZGUsIEluY2x1ZGVOb2RlLCAmbm9k ZUxpc3QsIERvTm90UmVzb2x2ZVVSTHMsIHRhZ05hbWVzVG9GaWx0ZXIuZ2V0KCkpOwogICAgIE5v ZGU6Ok5vZGVUeXBlIG5vZGVUeXBlID0gbm9kZS0+bm9kZVR5cGUoKTsKICAgICBpZiAobm9kZVR5 cGUgIT0gTm9kZTo6RE9DVU1FTlRfTk9ERSAmJiBub2RlVHlwZSAhPSBOb2RlOjpET0NVTUVOVF9U WVBFX05PREUpCiAgICAgICAgIG1hcmt1cFN0cmluZyA9IGZyYW1lLT5kb2N1bWVudFR5cGVTdHJp bmcoKSArIG1hcmt1cFN0cmluZzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFn ZVNlcmlhbGl6ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlU2VyaWFsaXplci5jcHAK aW5kZXggMzYzZWRkOS4uZDU0Y2JiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9Q YWdlU2VyaWFsaXplci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlU2VyaWFsaXpl ci5jcHAKQEAgLTIxNCw3ICsyMTQsNyBAQCB2b2lkIFBhZ2VTZXJpYWxpemVyOjpzZXJpYWxpemVG cmFtZShGcmFtZSogZnJhbWUpCiAgICAgICAgIC8vIEZJWE1FOiBpZnJhbWVzIHVzZWQgYXMgaW1h Z2VzIHRyaWdnZXIgdGhpcy4gV2Ugc2hvdWxkIGRlYWwgd2l0aCB0aGVtIGNvcnJlY3RseS4KICAg ICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBTdHJpbmcgdGV4dCA9IGFjY3VtdWxhdG9yLnNlcmlh bGl6ZU5vZGVzKGRvY3VtZW50LT5kb2N1bWVudEVsZW1lbnQoKSwgMCwgSW5jbHVkZU5vZGUpOwor ICAgIFN0cmluZyB0ZXh0ID0gYWNjdW11bGF0b3Iuc2VyaWFsaXplTm9kZXMoZG9jdW1lbnQtPmRv Y3VtZW50RWxlbWVudCgpLCAwLCBJbmNsdWRlTm9kZSwgMCk7CiAgICAgQ1N0cmluZyBmcmFtZUhU TUwgPSB0ZXh0RW5jb2RpbmcuZW5jb2RlKHRleHQuY2hhcmFjdGVycygpLCB0ZXh0Lmxlbmd0aCgp LCBFbnRpdGllc0ZvclVuZW5jb2RhYmxlcyk7CiAgICAgbV9yZXNvdXJjZXMtPmFwcGVuZChSZXNv dXJjZSh1cmwsIGRvY3VtZW50LT5zdWdnZXN0ZWRNSU1FVHlwZSgpLCBTaGFyZWRCdWZmZXI6OmNy ZWF0ZShmcmFtZUhUTUwuZGF0YSgpLCBmcmFtZUhUTUwubGVuZ3RoKCkpKSk7CiAgICAgbV9yZXNv dXJjZVVSTHMuYWRkKHVybCk7Cg==