67093 2011-08-28 03:17:20 -0700 [Qt] Default window.alert shows HTML entities in certain cases 2012-05-24 05:48:27 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 farsmo webkit-unassigned dbates hausmann webkit.review.bot oldest_to_newest 458007 0 farsmo 2011-08-28 03:17:20 -0700 window.alert('&') shows &amp; window.alert('"') shows &quot; However when the string contains '<', HTML entities become correctly interpreted again: window.alert('<good> &" ...') shows <good> &" ... If you want an example look at the QString slot test in https://bugs.webkit.org/show_bug.cgi?id=67092 . 629115 1 143039 steffen.imhof 2012-05-21 08:26:50 -0700 Created attachment 143039 Patch to fix the display of alert(), confirm() and prompt() The problem is caused by the HTML escaping introduced in https://bugs.webkit.org/show_bug.cgi?id=34429, which in turn was added to make sure HTML tags are shown in the alert boxes. The root cause for me seem to be Qt's text detection automatisms. So the text is sometimes interpreted as plain text and sometimes as rich text (with a few possible HTML tags). In my opinion the correct solution here is to force plain text. (As far as I can tell, inside the message boxes this should not pose any security risk?!) The static convenience methods cannot be used anymore in this case, so the code grew a bit. QInputDialog does not provide an API to access the contained label, so I had to resort to some "less-than-nice" meta object inspection for "prompt()". A possible alternative would be to write our own dialog for this case, but I think this would be overkill. A somewhat related problem is fixed with this patch, too: QLabel interprets '&' characters as the start of a mnemonic identifier, dropping the '&' and underlining the next character. This is worked around by doubling the '&'s beforehand. I haven't seen yet, how to test this automatically, but I don't think a test should be necessary for this fix. (If I am wrong here, I'd be glad for some pointers how one would write such a test case.) 629217 2 143039 dbates 2012-05-21 10:03:23 -0700 Comment on attachment 143039 Patch to fix the display of alert(), confirm() and prompt() View in context: https://bugs.webkit.org/attachment.cgi?id=143039&action=review > Source/WebKit/qt/Api/qwebpage.cpp:2109 > + box.setWindowTitle(tr("JavaScript Alert - %1").arg(mainFrame()->url().host())); The window title is disingenuous. This is a JavaScript confirm dialog. Previously this was reflected in the window title. 630027 3 143208 steffen.imhof 2012-05-22 00:20:12 -0700 Created attachment 143208 Patch with fix for comment #2 (In reply to comment #2) > The window title is disingenuous. This is a JavaScript confirm dialog. Previously this was reflected in the window title. Oops, good catch. I fixed this in the updated patch. 631939 4 143208 hausmann 2012-05-23 13:03:31 -0700 Comment on attachment 143208 Patch with fix for comment #2 I think the patch itself is correct, but there's one little glitch that I think should be fixed before landing. The current order of things is setText(msg) setTextFormat(Qt::PlainText); In theory the order of setting properties shouldn't matter, and in fact in terms of correctness it won't make a difference here. But in terms of performance a setText(msg) call with text that contains tags will with QLabel under the hood result in the allocation of a relatively heavy QTextControl instance. If you call setTextFormat(Qt::PlainText) _before_ calling setText, then we can avoid the creation and sub-sequent deletion of the QTextControl inside. 632501 5 143756 steffen.imhof 2012-05-24 01:16:39 -0700 Created attachment 143756 Updated patch, setting plain text mode first in all 3 cases Updated the patch to address Simon's concerns. 632506 6 143756 hausmann 2012-05-24 01:23:41 -0700 Comment on attachment 143756 Updated patch, setting plain text mode first in all 3 cases r=me 632676 7 143756 webkit.review.bot 2012-05-24 05:48:20 -0700 Comment on attachment 143756 Updated patch, setting plain text mode first in all 3 cases Clearing flags on attachment: 143756 Committed r118354: <http://trac.webkit.org/changeset/118354> 632677 8 webkit.review.bot 2012-05-24 05:48:27 -0700 All reviewed patches have been landed. Closing bug. 143039 2012-05-21 08:26:50 -0700 2012-05-22 00:20:12 -0700 Patch to fix the display of alert(), confirm() and prompt() 67093_html_entities_alert.patch text/plain 3845 steffen.imhof ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcCBiL1NvdXJjZS9X ZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAppbmRleCAyZTMzMGFjLi5mMDBiNWU0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9xdC9BcGkvcXdlYnBhZ2UuY3BwCkBAIC0xMzAsNiArMTMwLDcgQEAKICNpbmNsdWRlIDxRRHJv cEV2ZW50PgogI2luY2x1ZGUgPFFGaWxlRGlhbG9nPgogI2luY2x1ZGUgPFFJbnB1dERpYWxvZz4K KyNpbmNsdWRlIDxRTGFiZWw+CiAjaW5jbHVkZSA8UU1lbnU+CiAjaW5jbHVkZSA8UU1lc3NhZ2VC b3g+CiAjaW5jbHVkZSA8UU5ldHdvcmtQcm94eT4KQEAgLTIwODIsNyArMjA4MywxMiBAQCB2b2lk IFFXZWJQYWdlOjpqYXZhU2NyaXB0QWxlcnQoUVdlYkZyYW1lICpmcmFtZSwgY29uc3QgUVN0cmlu ZyYgbXNnKQogICAgIFFfVU5VU0VEKGZyYW1lKQogI2lmbmRlZiBRVF9OT19NRVNTQUdFQk9YCiAg ICAgUVdpZGdldCogcGFyZW50ID0gKGQtPmNsaWVudCkgPyBkLT5jbGllbnQtPm93bmVyV2lkZ2V0 KCkgOiAwOwotICAgIFFNZXNzYWdlQm94OjppbmZvcm1hdGlvbihwYXJlbnQsIHRyKCJKYXZhU2Ny aXB0IEFsZXJ0IC0gJTEiKS5hcmcobWFpbkZyYW1lKCktPnVybCgpLmhvc3QoKSksIGVzY2FwZUh0 bWwobXNnKSwgUU1lc3NhZ2VCb3g6Ok9rKTsKKyAgICBRTWVzc2FnZUJveCBib3gocGFyZW50KTsK KyAgICBib3guc2V0V2luZG93VGl0bGUodHIoIkphdmFTY3JpcHQgQWxlcnQgLSAlMSIpLmFyZyht YWluRnJhbWUoKS0+dXJsKCkuaG9zdCgpKSk7CisgICAgYm94LnNldFRleHQobXNnKTsKKyAgICBi b3guc2V0VGV4dEZvcm1hdChRdDo6UGxhaW5UZXh0KTsKKyAgICBib3guc2V0U3RhbmRhcmRCdXR0 b25zKFFNZXNzYWdlQm94OjpPayk7CisgICAgYm94LmV4ZWMoKTsKICNlbmRpZgogfQogCkBAIC0y MDk5LDcgKzIxMDUsMTIgQEAgYm9vbCBRV2ViUGFnZTo6amF2YVNjcmlwdENvbmZpcm0oUVdlYkZy YW1lICpmcmFtZSwgY29uc3QgUVN0cmluZyYgbXNnKQogICAgIHJldHVybiB0cnVlOwogI2Vsc2UK ICAgICBRV2lkZ2V0KiBwYXJlbnQgPSAoZC0+Y2xpZW50KSA/IGQtPmNsaWVudC0+b3duZXJXaWRn ZXQoKSA6IDA7Ci0gICAgcmV0dXJuIFFNZXNzYWdlQm94OjpZZXMgPT0gUU1lc3NhZ2VCb3g6Omlu Zm9ybWF0aW9uKHBhcmVudCwgdHIoIkphdmFTY3JpcHQgQ29uZmlybSAtICUxIikuYXJnKG1haW5G cmFtZSgpLT51cmwoKS5ob3N0KCkpLCBlc2NhcGVIdG1sKG1zZyksIFFNZXNzYWdlQm94OjpZZXMs IFFNZXNzYWdlQm94OjpObyk7CisgICAgUU1lc3NhZ2VCb3ggYm94KHBhcmVudCk7CisgICAgYm94 LnNldFdpbmRvd1RpdGxlKHRyKCJKYXZhU2NyaXB0IEFsZXJ0IC0gJTEiKS5hcmcobWFpbkZyYW1l KCktPnVybCgpLmhvc3QoKSkpOworICAgIGJveC5zZXRUZXh0KG1zZyk7CisgICAgYm94LnNldFRl eHRGb3JtYXQoUXQ6OlBsYWluVGV4dCk7CisgICAgYm94LnNldFN0YW5kYXJkQnV0dG9ucyhRTWVz c2FnZUJveDo6WWVzIHwgUU1lc3NhZ2VCb3g6Ok5vKTsKKyAgICByZXR1cm4gUU1lc3NhZ2VCb3g6 OlllcyA9PSBib3guZXhlYygpOwogI2VuZGlmCiB9CiAKQEAgLTIxMTgsMTAgKzIxMjksMzAgQEAg Ym9vbCBRV2ViUGFnZTo6amF2YVNjcmlwdFByb21wdChRV2ViRnJhbWUgKmZyYW1lLCBjb25zdCBR U3RyaW5nJiBtc2csIGNvbnN0IFFTdHIKICAgICBRX1VOVVNFRChmcmFtZSkKICAgICBib29sIG9r ID0gZmFsc2U7CiAjaWZuZGVmIFFUX05PX0lOUFVURElBTE9HCisKICAgICBRV2lkZ2V0KiBwYXJl bnQgPSAoZC0+Y2xpZW50KSA/IGQtPmNsaWVudC0+b3duZXJXaWRnZXQoKSA6IDA7Ci0gICAgUVN0 cmluZyB4ID0gUUlucHV0RGlhbG9nOjpnZXRUZXh0KHBhcmVudCwgdHIoIkphdmFTY3JpcHQgUHJv bXB0IC0gJTEiKS5hcmcobWFpbkZyYW1lKCktPnVybCgpLmhvc3QoKSksIGVzY2FwZUh0bWwobXNn KSwgUUxpbmVFZGl0OjpOb3JtYWwsIGRlZmF1bHRWYWx1ZSwgJm9rKTsKKyAgICBRSW5wdXREaWFs b2cgZGxnKHBhcmVudCk7CisgICAgZGxnLnNldFdpbmRvd1RpdGxlKHRyKCJKYXZhU2NyaXB0IFBy b21wdCAtICUxIikuYXJnKG1haW5GcmFtZSgpLT51cmwoKS5ob3N0KCkpKTsKKworICAgIC8vIGRv dWJsZSB0aGUgJidzIGJlY2F1c2Ugc2luZ2xlICYgd2lsbCB1bmRlcmxpbmUgdGhlIGZvbGxvd2lu ZyBjaGFyYWN0ZXIKKyAgICAvLyAoQWNjZWxlcmF0b3IgbW5lbW9uaWNzKQorICAgIFFTdHJpbmcg ZXNjTXNnKG1zZyk7CisgICAgZXNjTXNnLnJlcGxhY2UoUUNoYXI6OmZyb21Bc2NpaSgnJicpLCBR U3RyaW5nOjpmcm9tQXNjaWkoIiYmIikpOworCisgICAgZGxnLnNldExhYmVsVGV4dChlc2NNc2cp OworICAgIGRsZy5zZXRUZXh0RWNob01vZGUoUUxpbmVFZGl0OjpOb3JtYWwpOworICAgIGRsZy5z ZXRUZXh0VmFsdWUoZGVmYXVsdFZhbHVlKTsKKworICAgIC8vIEhhY2sgdG8gZm9yY2UgdGhlIGRp YWxvZydzIFFMYWJlbCBpbnRvIHBsYWluIHRleHQgbW9kZQorICAgIC8vIHByZXZlbnRzIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDQyOQorICAgIFFMYWJlbCogbGFi ZWwgPSBkbGcuZmluZENoaWxkPFFMYWJlbCo+KCk7CisgICAgaWYgKGxhYmVsKQorICAgICAgICBs YWJlbC0+c2V0VGV4dEZvcm1hdChRdDo6UGxhaW5UZXh0KTsKKworICAgIG9rID0gISFkbGcuZXhl YygpOworCiAgICAgaWYgKG9rICYmIHJlc3VsdCkKLSAgICAgICAgKnJlc3VsdCA9IHg7CisgICAg ICAgICpyZXN1bHQgPSBkbGcudGV4dFZhbHVlKCk7CiAjZW5kaWYKICAgICByZXR1cm4gb2s7CiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv cXQvQ2hhbmdlTG9nCmluZGV4IDM0YTAxYzguLmE2ZmQxODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjEgQEAKKzIwMTItMDUtMjEgIFN0ZWZmZW4gSW1ob2YgIDxzdGVmZmVuLmltaG9mQGJh c3lza29tLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjcwOTMKKyAgICAgICAgW1F0XSBEZWZhdWx0IHdpbmRvdy5hbGVydCBzaG93cyBIVE1M IGVudGl0aWVzIGluIGNlcnRhaW4gY2FzZXMKKworICAgICAgICBJbnN0ZWFkIG9mIEhUTUwgZXNj YXBpbmcgdGhlIHRleHQgb2YgSlMgYWxlcnRzICh3aGljaCBkb2VzIG5vdCB3b3JrCisgICAgICAg IGNvbnNpc3RlbnRseSBiZWNhdXNlIG9mIFF0J3MgYXV0b21hdGlzbXMpLCBidWlsZCBtZXNzYWdl IGJveGVzCisgICAgICAgIGV4cGxpY2l0bHkgdG8gYmUgYWJsZSBzZXQgdGhlIHRleHQgZm9ybWF0 IHRvIHBsYWluIHRleHQuCisgICAgICAgIFFJbnB1dERpYWxvZyBpcyBhIGJpdCBoYWNreSwgYmVj YXVzZSB0aGVyZSBpcyBubyB3YXkgdG8gYWNjZXNzIG9yCisgICAgICAgIGNvbnRyb2wgdGhlIGNv bnRhaW5lZCBRTGFiZWwuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBBcGkvcXdlYnBhZ2UuY3BwOgorICAgICAgICAoUVdlYlBhZ2U6OmphdmFTY3Jp cHRBbGVydCk6CisgICAgICAgIChRV2ViUGFnZTo6amF2YVNjcmlwdENvbmZpcm0pOgorICAgICAg ICAoUVdlYlBhZ2U6OmphdmFTY3JpcHRQcm9tcHQpOgorCiAyMDEyLTA1LTE4ICBNT1JJVEEgSGFq aW1lICA8bW9ycml0YUBnb29nbGUuY29tPgogCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD04NTUxNQo= 143208 2012-05-22 00:20:12 -0700 2012-05-24 01:16:39 -0700 Patch with fix for comment #2 67093_html_entities_alert_v2.patch text/plain 3847 steffen.imhof ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcCBiL1NvdXJjZS9X ZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAppbmRleCAyZTMzMGFjLi4yOTYxYzA4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9xdC9BcGkvcXdlYnBhZ2UuY3BwCkBAIC0xMzAsNiArMTMwLDcgQEAKICNpbmNsdWRlIDxRRHJv cEV2ZW50PgogI2luY2x1ZGUgPFFGaWxlRGlhbG9nPgogI2luY2x1ZGUgPFFJbnB1dERpYWxvZz4K KyNpbmNsdWRlIDxRTGFiZWw+CiAjaW5jbHVkZSA8UU1lbnU+CiAjaW5jbHVkZSA8UU1lc3NhZ2VC b3g+CiAjaW5jbHVkZSA8UU5ldHdvcmtQcm94eT4KQEAgLTIwODIsNyArMjA4MywxMiBAQCB2b2lk IFFXZWJQYWdlOjpqYXZhU2NyaXB0QWxlcnQoUVdlYkZyYW1lICpmcmFtZSwgY29uc3QgUVN0cmlu ZyYgbXNnKQogICAgIFFfVU5VU0VEKGZyYW1lKQogI2lmbmRlZiBRVF9OT19NRVNTQUdFQk9YCiAg ICAgUVdpZGdldCogcGFyZW50ID0gKGQtPmNsaWVudCkgPyBkLT5jbGllbnQtPm93bmVyV2lkZ2V0 KCkgOiAwOwotICAgIFFNZXNzYWdlQm94OjppbmZvcm1hdGlvbihwYXJlbnQsIHRyKCJKYXZhU2Ny aXB0IEFsZXJ0IC0gJTEiKS5hcmcobWFpbkZyYW1lKCktPnVybCgpLmhvc3QoKSksIGVzY2FwZUh0 bWwobXNnKSwgUU1lc3NhZ2VCb3g6Ok9rKTsKKyAgICBRTWVzc2FnZUJveCBib3gocGFyZW50KTsK KyAgICBib3guc2V0V2luZG93VGl0bGUodHIoIkphdmFTY3JpcHQgQWxlcnQgLSAlMSIpLmFyZyht YWluRnJhbWUoKS0+dXJsKCkuaG9zdCgpKSk7CisgICAgYm94LnNldFRleHQobXNnKTsKKyAgICBi b3guc2V0VGV4dEZvcm1hdChRdDo6UGxhaW5UZXh0KTsKKyAgICBib3guc2V0U3RhbmRhcmRCdXR0 b25zKFFNZXNzYWdlQm94OjpPayk7CisgICAgYm94LmV4ZWMoKTsKICNlbmRpZgogfQogCkBAIC0y MDk5LDcgKzIxMDUsMTIgQEAgYm9vbCBRV2ViUGFnZTo6amF2YVNjcmlwdENvbmZpcm0oUVdlYkZy YW1lICpmcmFtZSwgY29uc3QgUVN0cmluZyYgbXNnKQogICAgIHJldHVybiB0cnVlOwogI2Vsc2UK ICAgICBRV2lkZ2V0KiBwYXJlbnQgPSAoZC0+Y2xpZW50KSA/IGQtPmNsaWVudC0+b3duZXJXaWRn ZXQoKSA6IDA7Ci0gICAgcmV0dXJuIFFNZXNzYWdlQm94OjpZZXMgPT0gUU1lc3NhZ2VCb3g6Omlu Zm9ybWF0aW9uKHBhcmVudCwgdHIoIkphdmFTY3JpcHQgQ29uZmlybSAtICUxIikuYXJnKG1haW5G cmFtZSgpLT51cmwoKS5ob3N0KCkpLCBlc2NhcGVIdG1sKG1zZyksIFFNZXNzYWdlQm94OjpZZXMs IFFNZXNzYWdlQm94OjpObyk7CisgICAgUU1lc3NhZ2VCb3ggYm94KHBhcmVudCk7CisgICAgYm94 LnNldFdpbmRvd1RpdGxlKHRyKCJKYXZhU2NyaXB0IENvbmZpcm0gLSAlMSIpLmFyZyhtYWluRnJh bWUoKS0+dXJsKCkuaG9zdCgpKSk7CisgICAgYm94LnNldFRleHQobXNnKTsKKyAgICBib3guc2V0 VGV4dEZvcm1hdChRdDo6UGxhaW5UZXh0KTsKKyAgICBib3guc2V0U3RhbmRhcmRCdXR0b25zKFFN ZXNzYWdlQm94OjpZZXMgfCBRTWVzc2FnZUJveDo6Tm8pOworICAgIHJldHVybiBRTWVzc2FnZUJv eDo6WWVzID09IGJveC5leGVjKCk7CiAjZW5kaWYKIH0KIApAQCAtMjExOCwxMCArMjEyOSwzMCBA QCBib29sIFFXZWJQYWdlOjpqYXZhU2NyaXB0UHJvbXB0KFFXZWJGcmFtZSAqZnJhbWUsIGNvbnN0 IFFTdHJpbmcmIG1zZywgY29uc3QgUVN0cgogICAgIFFfVU5VU0VEKGZyYW1lKQogICAgIGJvb2wg b2sgPSBmYWxzZTsKICNpZm5kZWYgUVRfTk9fSU5QVVRESUFMT0cKKwogICAgIFFXaWRnZXQqIHBh cmVudCA9IChkLT5jbGllbnQpID8gZC0+Y2xpZW50LT5vd25lcldpZGdldCgpIDogMDsKLSAgICBR U3RyaW5nIHggPSBRSW5wdXREaWFsb2c6OmdldFRleHQocGFyZW50LCB0cigiSmF2YVNjcmlwdCBQ cm9tcHQgLSAlMSIpLmFyZyhtYWluRnJhbWUoKS0+dXJsKCkuaG9zdCgpKSwgZXNjYXBlSHRtbCht c2cpLCBRTGluZUVkaXQ6Ok5vcm1hbCwgZGVmYXVsdFZhbHVlLCAmb2spOworICAgIFFJbnB1dERp YWxvZyBkbGcocGFyZW50KTsKKyAgICBkbGcuc2V0V2luZG93VGl0bGUodHIoIkphdmFTY3JpcHQg UHJvbXB0IC0gJTEiKS5hcmcobWFpbkZyYW1lKCktPnVybCgpLmhvc3QoKSkpOworCisgICAgLy8g ZG91YmxlIHRoZSAmJ3MgYmVjYXVzZSBzaW5nbGUgJiB3aWxsIHVuZGVybGluZSB0aGUgZm9sbG93 aW5nIGNoYXJhY3RlcgorICAgIC8vIChBY2NlbGVyYXRvciBtbmVtb25pY3MpCisgICAgUVN0cmlu ZyBlc2NNc2cobXNnKTsKKyAgICBlc2NNc2cucmVwbGFjZShRQ2hhcjo6ZnJvbUFzY2lpKCcmJyks IFFTdHJpbmc6OmZyb21Bc2NpaSgiJiYiKSk7CisKKyAgICBkbGcuc2V0TGFiZWxUZXh0KGVzY01z Zyk7CisgICAgZGxnLnNldFRleHRFY2hvTW9kZShRTGluZUVkaXQ6Ok5vcm1hbCk7CisgICAgZGxn LnNldFRleHRWYWx1ZShkZWZhdWx0VmFsdWUpOworCisgICAgLy8gSGFjayB0byBmb3JjZSB0aGUg ZGlhbG9nJ3MgUUxhYmVsIGludG8gcGxhaW4gdGV4dCBtb2RlCisgICAgLy8gcHJldmVudHMgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0NDI5CisgICAgUUxhYmVsKiBs YWJlbCA9IGRsZy5maW5kQ2hpbGQ8UUxhYmVsKj4oKTsKKyAgICBpZiAobGFiZWwpCisgICAgICAg IGxhYmVsLT5zZXRUZXh0Rm9ybWF0KFF0OjpQbGFpblRleHQpOworCisgICAgb2sgPSAhIWRsZy5l eGVjKCk7CisKICAgICBpZiAob2sgJiYgcmVzdWx0KQotICAgICAgICAqcmVzdWx0ID0geDsKKyAg ICAgICAgKnJlc3VsdCA9IGRsZy50ZXh0VmFsdWUoKTsKICNlbmRpZgogICAgIHJldHVybiBvazsK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktp dC9xdC9DaGFuZ2VMb2cKaW5kZXggMzRhMDFjOC4uYTZmZDE4MCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyMSBAQAorMjAxMi0wNS0yMSAgU3RlZmZlbiBJbWhvZiAgPHN0ZWZmZW4uaW1ob2ZA YmFzeXNrb20uY29tPgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD02NzA5MworICAgICAgICBbUXRdIERlZmF1bHQgd2luZG93LmFsZXJ0IHNob3dzIEhU TUwgZW50aXRpZXMgaW4gY2VydGFpbiBjYXNlcworCisgICAgICAgIEluc3RlYWQgb2YgSFRNTCBl c2NhcGluZyB0aGUgdGV4dCBvZiBKUyBhbGVydHMgKHdoaWNoIGRvZXMgbm90IHdvcmsKKyAgICAg ICAgY29uc2lzdGVudGx5IGJlY2F1c2Ugb2YgUXQncyBhdXRvbWF0aXNtcyksIGJ1aWxkIG1lc3Nh Z2UgYm94ZXMKKyAgICAgICAgZXhwbGljaXRseSB0byBiZSBhYmxlIHNldCB0aGUgdGV4dCBmb3Jt YXQgdG8gcGxhaW4gdGV4dC4KKyAgICAgICAgUUlucHV0RGlhbG9nIGlzIGEgYml0IGhhY2t5LCBi ZWNhdXNlIHRoZXJlIGlzIG5vIHdheSB0byBhY2Nlc3Mgb3IKKyAgICAgICAgY29udHJvbCB0aGUg Y29udGFpbmVkIFFMYWJlbC4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIEFwaS9xd2VicGFnZS5jcHA6CisgICAgICAgIChRV2ViUGFnZTo6amF2YVNj cmlwdEFsZXJ0KToKKyAgICAgICAgKFFXZWJQYWdlOjpqYXZhU2NyaXB0Q29uZmlybSk6CisgICAg ICAgIChRV2ViUGFnZTo6amF2YVNjcmlwdFByb21wdCk6CisKIDIwMTItMDUtMTggIE1PUklUQSBI YWppbWUgIDxtb3JyaXRhQGdvb2dsZS5jb20+CiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTg1NTE1Cg== 143756 2012-05-24 01:16:39 -0700 2012-05-24 05:48:20 -0700 Updated patch, setting plain text mode first in all 3 cases 67093_html_entities_alert_v3.patch text/plain 3900 steffen.imhof ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcCBiL1NvdXJjZS9X ZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAppbmRleCAyZTMzMGFjLi45ZTg0ZWVlYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvcXQvQXBpL3F3ZWJwYWdlLmNwcApAQCAtMTMwLDYgKzEzMCw3IEBACiAjaW5jbHVkZSA8UURy b3BFdmVudD4KICNpbmNsdWRlIDxRRmlsZURpYWxvZz4KICNpbmNsdWRlIDxRSW5wdXREaWFsb2c+ CisjaW5jbHVkZSA8UUxhYmVsPgogI2luY2x1ZGUgPFFNZW51PgogI2luY2x1ZGUgPFFNZXNzYWdl Qm94PgogI2luY2x1ZGUgPFFOZXR3b3JrUHJveHk+CkBAIC0yMDgyLDcgKzIwODMsMTIgQEAgdm9p ZCBRV2ViUGFnZTo6amF2YVNjcmlwdEFsZXJ0KFFXZWJGcmFtZSAqZnJhbWUsIGNvbnN0IFFTdHJp bmcmIG1zZykKICAgICBRX1VOVVNFRChmcmFtZSkKICNpZm5kZWYgUVRfTk9fTUVTU0FHRUJPWAog ICAgIFFXaWRnZXQqIHBhcmVudCA9IChkLT5jbGllbnQpID8gZC0+Y2xpZW50LT5vd25lcldpZGdl dCgpIDogMDsKLSAgICBRTWVzc2FnZUJveDo6aW5mb3JtYXRpb24ocGFyZW50LCB0cigiSmF2YVNj cmlwdCBBbGVydCAtICUxIikuYXJnKG1haW5GcmFtZSgpLT51cmwoKS5ob3N0KCkpLCBlc2NhcGVI dG1sKG1zZyksIFFNZXNzYWdlQm94OjpPayk7CisgICAgUU1lc3NhZ2VCb3ggYm94KHBhcmVudCk7 CisgICAgYm94LnNldFdpbmRvd1RpdGxlKHRyKCJKYXZhU2NyaXB0IEFsZXJ0IC0gJTEiKS5hcmco bWFpbkZyYW1lKCktPnVybCgpLmhvc3QoKSkpOworICAgIGJveC5zZXRUZXh0Rm9ybWF0KFF0OjpQ bGFpblRleHQpOworICAgIGJveC5zZXRUZXh0KG1zZyk7CisgICAgYm94LnNldFN0YW5kYXJkQnV0 dG9ucyhRTWVzc2FnZUJveDo6T2spOworICAgIGJveC5leGVjKCk7CiAjZW5kaWYKIH0KIApAQCAt MjA5OSw3ICsyMTA1LDEyIEBAIGJvb2wgUVdlYlBhZ2U6OmphdmFTY3JpcHRDb25maXJtKFFXZWJG cmFtZSAqZnJhbWUsIGNvbnN0IFFTdHJpbmcmIG1zZykKICAgICByZXR1cm4gdHJ1ZTsKICNlbHNl CiAgICAgUVdpZGdldCogcGFyZW50ID0gKGQtPmNsaWVudCkgPyBkLT5jbGllbnQtPm93bmVyV2lk Z2V0KCkgOiAwOwotICAgIHJldHVybiBRTWVzc2FnZUJveDo6WWVzID09IFFNZXNzYWdlQm94Ojpp bmZvcm1hdGlvbihwYXJlbnQsIHRyKCJKYXZhU2NyaXB0IENvbmZpcm0gLSAlMSIpLmFyZyhtYWlu RnJhbWUoKS0+dXJsKCkuaG9zdCgpKSwgZXNjYXBlSHRtbChtc2cpLCBRTWVzc2FnZUJveDo6WWVz LCBRTWVzc2FnZUJveDo6Tm8pOworICAgIFFNZXNzYWdlQm94IGJveChwYXJlbnQpOworICAgIGJv eC5zZXRXaW5kb3dUaXRsZSh0cigiSmF2YVNjcmlwdCBDb25maXJtIC0gJTEiKS5hcmcobWFpbkZy YW1lKCktPnVybCgpLmhvc3QoKSkpOworICAgIGJveC5zZXRUZXh0Rm9ybWF0KFF0OjpQbGFpblRl eHQpOworICAgIGJveC5zZXRUZXh0KG1zZyk7CisgICAgYm94LnNldFN0YW5kYXJkQnV0dG9ucyhR TWVzc2FnZUJveDo6WWVzIHwgUU1lc3NhZ2VCb3g6Ok5vKTsKKyAgICByZXR1cm4gUU1lc3NhZ2VC b3g6OlllcyA9PSBib3guZXhlYygpOwogI2VuZGlmCiB9CiAKQEAgLTIxMTgsMTAgKzIxMjksMzAg QEAgYm9vbCBRV2ViUGFnZTo6amF2YVNjcmlwdFByb21wdChRV2ViRnJhbWUgKmZyYW1lLCBjb25z dCBRU3RyaW5nJiBtc2csIGNvbnN0IFFTdHIKICAgICBRX1VOVVNFRChmcmFtZSkKICAgICBib29s IG9rID0gZmFsc2U7CiAjaWZuZGVmIFFUX05PX0lOUFVURElBTE9HCisKICAgICBRV2lkZ2V0KiBw YXJlbnQgPSAoZC0+Y2xpZW50KSA/IGQtPmNsaWVudC0+b3duZXJXaWRnZXQoKSA6IDA7Ci0gICAg UVN0cmluZyB4ID0gUUlucHV0RGlhbG9nOjpnZXRUZXh0KHBhcmVudCwgdHIoIkphdmFTY3JpcHQg UHJvbXB0IC0gJTEiKS5hcmcobWFpbkZyYW1lKCktPnVybCgpLmhvc3QoKSksIGVzY2FwZUh0bWwo bXNnKSwgUUxpbmVFZGl0OjpOb3JtYWwsIGRlZmF1bHRWYWx1ZSwgJm9rKTsKKyAgICBRSW5wdXRE aWFsb2cgZGxnKHBhcmVudCk7CisgICAgZGxnLnNldFdpbmRvd1RpdGxlKHRyKCJKYXZhU2NyaXB0 IFByb21wdCAtICUxIikuYXJnKG1haW5GcmFtZSgpLT51cmwoKS5ob3N0KCkpKTsKKworICAgIC8v IEhhY2sgdG8gZm9yY2UgdGhlIGRpYWxvZydzIFFMYWJlbCBpbnRvIHBsYWluIHRleHQgbW9kZQor ICAgIC8vIHByZXZlbnRzIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z NDQyOQorICAgIFFMYWJlbCogbGFiZWwgPSBkbGcuZmluZENoaWxkPFFMYWJlbCo+KCk7CisgICAg aWYgKGxhYmVsKQorICAgICAgICBsYWJlbC0+c2V0VGV4dEZvcm1hdChRdDo6UGxhaW5UZXh0KTsK KworICAgIC8vIGRvdWJsZSB0aGUgJidzIGJlY2F1c2Ugc2luZ2xlICYgd2lsbCB1bmRlcmxpbmUg dGhlIGZvbGxvd2luZyBjaGFyYWN0ZXIKKyAgICAvLyAoQWNjZWxlcmF0b3IgbW5lbW9uaWNzKQor ICAgIFFTdHJpbmcgZXNjTXNnKG1zZyk7CisgICAgZXNjTXNnLnJlcGxhY2UoUUNoYXI6OmZyb21B c2NpaSgnJicpLCBRU3RyaW5nOjpmcm9tQXNjaWkoIiYmIikpOworICAgIGRsZy5zZXRMYWJlbFRl eHQoZXNjTXNnKTsKKworICAgIGRsZy5zZXRUZXh0RWNob01vZGUoUUxpbmVFZGl0OjpOb3JtYWwp OworICAgIGRsZy5zZXRUZXh0VmFsdWUoZGVmYXVsdFZhbHVlKTsKKworICAgIG9rID0gISFkbGcu ZXhlYygpOworCiAgICAgaWYgKG9rICYmIHJlc3VsdCkKLSAgICAgICAgKnJlc3VsdCA9IHg7Cisg ICAgICAgICpyZXN1bHQgPSBkbGcudGV4dFZhbHVlKCk7CiAjZW5kaWYKICAgICByZXR1cm4gb2s7 CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJL aXQvcXQvQ2hhbmdlTG9nCmluZGV4IDQ2OWRiZWYuLjMxN2VjMjcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjEgQEAKKzIwMTItMDUtMjEgIFN0ZWZmZW4gSW1ob2YgIDxzdGVmZmVuLmltaG9m QGJhc3lza29tLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NjcwOTMKKyAgICAgICAgW1F0XSBEZWZhdWx0IHdpbmRvdy5hbGVydCBzaG93cyBI VE1MIGVudGl0aWVzIGluIGNlcnRhaW4gY2FzZXMKKworICAgICAgICBJbnN0ZWFkIG9mIEhUTUwg ZXNjYXBpbmcgdGhlIHRleHQgb2YgSlMgYWxlcnRzICh3aGljaCBkb2VzIG5vdCB3b3JrCisgICAg ICAgIGNvbnNpc3RlbnRseSBiZWNhdXNlIG9mIFF0J3MgYXV0b21hdGlzbXMpLCBidWlsZCBtZXNz YWdlIGJveGVzCisgICAgICAgIGV4cGxpY2l0bHkgdG8gYmUgYWJsZSBzZXQgdGhlIHRleHQgZm9y bWF0IHRvIHBsYWluIHRleHQuCisgICAgICAgIFFJbnB1dERpYWxvZyBpcyBhIGJpdCBoYWNreSwg YmVjYXVzZSB0aGVyZSBpcyBubyB3YXkgdG8gYWNjZXNzIG9yCisgICAgICAgIGNvbnRyb2wgdGhl IGNvbnRhaW5lZCBRTGFiZWwuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBBcGkvcXdlYnBhZ2UuY3BwOgorICAgICAgICAoUVdlYlBhZ2U6OmphdmFT Y3JpcHRBbGVydCk6CisgICAgICAgIChRV2ViUGFnZTo6amF2YVNjcmlwdENvbmZpcm0pOgorICAg ICAgICAoUVdlYlBhZ2U6OmphdmFTY3JpcHRQcm9tcHQpOgorCiAyMDEyLTA1LTIxICBDYWlvIE1h cmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gIDxjYWlvLm9saXZlaXJhQG9wZW5ib3NzYS5vcmc+CiAK ICAgICAgICAgTW92ZSBzZXRFZGl0aW5nQmVoYXZpb3IoKSBmcm9tIGxheW91dFRlc3RDb250cm9s bGVyIHRvIHdpbmRvdy5pbnRlcm5hbHMK