45245 2010-09-05 14:06:06 -0700 [Qt] fix uri/escaped-entity.html 2010-09-26 06:12:26 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 robert webkit-qt-unassigned commit-queue hausmann kenneth oldest_to_newest 274451 0 robert 2010-09-05 14:06:06 -0700 Replace invalid encodings with the appropriate escaped entity. See also http://bugreports.qt.nokia.com/browse/QTBUG-13412 274725 1 66661 robert 2010-09-06 11:23:26 -0700 Created attachment 66661 Patch 284996 2 66661 kling 2010-09-25 06:38:58 -0700 Comment on attachment 66661 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=66661&action=review > WebCore/platform/text/qt/TextCodecQt.cpp:137 > + // FIXME: Until http://bugreports.qt.nokia.com/browse/QTBUG-13412 is resolved we need to this ourselves Note: It's unlikely that QTBUG-13412 will ever be implemented. > WebCore/platform/text/qt/TextCodecQt.cpp:146 > + for (int pos = 0; pos < length; ++pos) { Sign mismatch, pos should be size_t. I've discussed this with Olivier Goffart and we feel it's Good Enough(tm). Please fix the style before committing (tabs should be 4 spaces, not 2.) 285105 3 68845 robert 2010-09-26 04:22:28 -0700 Created attachment 68845 Patch 285106 4 68846 robert 2010-09-26 05:58:54 -0700 Created attachment 68846 Patch 285108 5 68846 commit-queue 2010-09-26 06:12:20 -0700 Comment on attachment 68846 Patch Clearing flags on attachment: 68846 Committed r68341: <http://trac.webkit.org/changeset/68341> 285109 6 commit-queue 2010-09-26 06:12:26 -0700 All reviewed patches have been landed. Closing bug. 66661 2010-09-06 11:23:26 -0700 2010-09-26 04:22:21 -0700 Patch bug-45245-20100906192323.patch text/plain 4338 robert ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA0NmU0MjRhZmM1NGE3MDIzNDg4ZGJiMzU3MTMyNTE5MDllNGM3MTA5Li5lNGE4OTYz MDg5ZDNiYTc1OThkNTk4M2MxMzAyYTBiNzNmMWY2ZDJlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAK KzIwMTAtMDktMDUgIFJvYmVydCBIb2dhbiAgPHJvYmVydEB3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gZml4IHVyaS9lc2Nh cGVkLWVudGl0eS5odG1sCisKKyAgICAgICAgUmVwbGFjZSBpbnZhbGlkIGVuY29kaW5ncyB3aXRo IHRoZSBhcHByb3ByaWF0ZSBlc2NhcGVkIGVudGl0eS4KKworICAgICAgICBTZWUgYWxzbyBodHRw Oi8vYnVncmVwb3J0cy5xdC5ub2tpYS5jb20vYnJvd3NlL1FUQlVHLTEzNDEyCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1MjQ1CisKKyAgICAgICAg KiBwbGF0Zm9ybS9xdC9Ta2lwcGVkOgorCiAyMDEwLTA5LTA2ICBTaGFuZSBTdGVwaGVucyAgPHNo YW5lc3RlcGhlbnNAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaW1pdHJpIEds YXprb3YuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkIGIvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAppbmRleCA5YzkyMTBiOTM2NDdkYTU1OGU2MWVj YjQxZGFjZDcxMWI5Mzc4M2NmLi5hYWFkYzJiZmI5ZTdhNWZhYzU2N2I0YzJjNTJjOGU5MzFlZDJj Y2RiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCisrKyBiL0xh eW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKQEAgLTE5MCw5ICsxOTAsNiBAQCBodHRwL3Rl c3RzL3NlY3VyaXR5L3hzc0F1ZGl0b3Ivb2JqZWN0LWVtYmVkLXRhZy1udWxsLWNoYXIuaHRtbAog aHR0cC90ZXN0cy9tZWRpYQogaHR0cC90ZXN0cy93bWwKIAotIyBub3QgdXRmOC1lbmNvZGluZyB1 cmxzIGFzIGV4cGVjdGVkCi1odHRwL3Rlc3RzL3VyaS9lc2NhcGVkLWVudGl0eS5odG1sCi0KICMg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0MjgyCiBodHRwL3Rlc3Rz L2luY3JlbWVudGFsL3Nsb3ctdXRmOC10ZXh0LnBsCiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hh bmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGY5YzMyOTBlNjk3Y2NhMTk3MzA4N2Zm ZDNkMGY1ZTBlMTJiNzcwZC4uYWQ0N2ZkNzI3MjE1MjJmMTdjNWI4NWZlN2RjYTJjMmE3NmQ5YjNl NCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxOCBAQAorMjAxMC0wOS0wNSAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdlYmtp dC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg W1F0XSBmaXggdXJpL2VzY2FwZWQtZW50aXR5Lmh0bWwKKworICAgICAgICBSZXBsYWNlIGludmFs aWQgZW5jb2RpbmdzIHdpdGggdGhlIGFwcHJvcHJpYXRlIGVzY2FwZWQgZW50aXR5LgorCisgICAg ICAgIFNlZSBhbHNvIGh0dHA6Ly9idWdyZXBvcnRzLnF0Lm5va2lhLmNvbS9icm93c2UvUVRCVUct MTM0MTIKKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NDUyNDUKKworICAgICAgICAqIHBsYXRmb3JtL3RleHQvcXQvVGV4dENvZGVjUXQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6VGV4dENvZGVjUXQ6OmVuY29kZSk6CisKIDIwMTAtMDktMDYgIEFudG9u IE11aGluICA8YW50b25tQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFt IEJhcnRoLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L3F0L1RleHRDb2RlY1F0 LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9xdC9UZXh0Q29kZWNRdC5jcHAKaW5kZXggOTRh MmI3YjU2ODU1YTg1MTYwOTcxNzRkMjI0YWYxM2Q2ZWY1MTVkZi4uMGE4NzA0ZTVmYTQxNjgyZGU4 YzU0OGE3MTM0MWE1NGE5MjJmNjkyZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0 L3F0L1RleHRDb2RlY1F0LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL3RleHQvcXQvVGV4dENv ZGVjUXQuY3BwCkBAIC0yOSw3ICsyOSw2IEBACiAjaW5jbHVkZSAiUGxhdGZvcm1TdHJpbmcuaCIK ICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAjaW5jbHVkZSA8cXNldC5oPgotLy8gI2lu Y2x1ZGUgPFFEZWJ1Zz4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC0xMjUsMTQgKzEyNCw0 MiBAQCBTdHJpbmcgVGV4dENvZGVjUXQ6OmRlY29kZShjb25zdCBjaGFyKiBieXRlcywgc2l6ZV90 IGxlbmd0aCwgYm9vbCBmbHVzaCwgYm9vbCAvKgogICAgIHJldHVybiB1bmljb2RlOwogfQogCi1D U3RyaW5nIFRleHRDb2RlY1F0OjplbmNvZGUoY29uc3QgVUNoYXIqIGNoYXJhY3RlcnMsIHNpemVf dCBsZW5ndGgsIFVuZW5jb2RhYmxlSGFuZGxpbmcpCitDU3RyaW5nIFRleHRDb2RlY1F0OjplbmNv ZGUoY29uc3QgVUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBsZW5ndGgsIFVuZW5jb2RhYmxlSGFu ZGxpbmcgaGFuZGxpbmcpCiB7CisgICAgUVRleHRDb2RlYzo6Q29udmVydGVyU3RhdGUgc3RhdGU7 CisgICAgc3RhdGUuZmxhZ3MgPSBRVGV4dENvZGVjOjpDb252ZXJzaW9uRmxhZ3MoUVRleHRDb2Rl Yzo6Q29udmVydEludmFsaWRUb051bGwgfCBRVGV4dENvZGVjOjpJZ25vcmVIZWFkZXIpOworCiAg ICAgaWYgKCFsZW5ndGgpCiAgICAgICAgIHJldHVybiAiIjsKIAotICAgIC8vIEZJWE1FOiBkbyBz b21ldGhpbmcgc2Vuc2libGUgd2l0aCBVbmVuY29kYWJsZUhhbmRsaW5nCisgICAgUUJ5dGVBcnJh eSBiYSA9IG1fY29kZWMtPmZyb21Vbmljb2RlKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgUUNoYXIq PihjaGFyYWN0ZXJzKSwgbGVuZ3RoLCAmc3RhdGUpOworCisgICAgLy8gRklYTUU6IFVudGlsIGh0 dHA6Ly9idWdyZXBvcnRzLnF0Lm5va2lhLmNvbS9icm93c2UvUVRCVUctMTM0MTIgaXMgcmVzb2x2 ZWQgd2UgbmVlZCB0byB0aGlzIG91cnNlbHZlcworICAgIC8vIElmIHNvbWUgPGI+IGNoYXJhY3Rl cnMgPC9iPiBhcmUgdW5lbmNvZGFibGUsIGVzY2FwZSB0aGVtIGFzIHNwZWNpZmllZCBieSA8Yj4g aGFuZGxpbmcgPC9iPgorICAgIC8vIFdlIGFwcGVuZCBvbmUgdmFsaWQgZW5jb2RlZCBjaHVuayB0 byBhIFFCeXRlQXJyYXkgYXQgYSB0aW1lLiBXaGVuIHdlIGVuY291bnRlciBhbiB1bmVuY29kYWJs ZSBjaHVuayB3ZQorICAgIC8vIGVzY2FwZSBpdCB3aXRoIGdldFVuZW5jb2RhYmxlUmVwbGFjZW1l bnQsIGFwcGVuZCBpdCwgdGhlbiBtb3ZlIHRvIHRoZSBuZXh0IGNodW5rLgorICAgIGlmIChzdGF0 ZS5pbnZhbGlkQ2hhcnMpIHsKKyAgICAgIHN0YXRlLmludmFsaWRDaGFycyA9IDA7CisgICAgICBz dGF0ZS5yZW1haW5pbmdDaGFycyA9IDA7CisgICAgICBpbnQgbGVuID0gMDsKKyAgICAgIGJhLmNs ZWFyKCk7CisgICAgICBmb3IgKGludCBwb3MgPSAwOyBwb3MgPCBsZW5ndGg7ICsrcG9zKSB7Cisg ICAgICAgIFFCeXRlQXJyYXkgdGJhID0gbV9jb2RlYy0+ZnJvbVVuaWNvZGUocmVpbnRlcnByZXRf Y2FzdDxjb25zdCBRQ2hhcio+KGNoYXJhY3RlcnMpLCArK2xlbiwgJnN0YXRlKTsKKyAgICAgICAg aWYgKHN0YXRlLnJlbWFpbmluZ0NoYXJzKQorICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICBp ZiAoc3RhdGUuaW52YWxpZENoYXJzKSB7CisgICAgICAgICAgVW5lbmNvZGFibGVSZXBsYWNlbWVu dEFycmF5IHJlcGxhY2VtZW50OworICAgICAgICAgIGdldFVuZW5jb2RhYmxlUmVwbGFjZW1lbnQo Y2hhcmFjdGVyc1swXSwgaGFuZGxpbmcsIHJlcGxhY2VtZW50KTsKKyAgICAgICAgICB0YmEucmVw bGFjZSgnXDAnLCByZXBsYWNlbWVudCk7CisgICAgICAgICAgc3RhdGUuaW52YWxpZENoYXJzID0g MDsKKyAgICAgICAgfQorICAgICAgICBiYS5hcHBlbmQodGJhKTsKKyAgICAgICAgY2hhcmFjdGVy cyArPSBsZW47CisgICAgICAgIGxlbiA9IDA7CisgICAgICAgIHN0YXRlLnJlbWFpbmluZ0NoYXJz ID0gMDsKKyAgICAgIH0KKyAgICB9CiAKLSAgICBRQnl0ZUFycmF5IGJhID0gbV9jb2RlYy0+ZnJv bVVuaWNvZGUocmVpbnRlcnByZXRfY2FzdDxjb25zdCBRQ2hhcio+KGNoYXJhY3RlcnMpLCBsZW5n dGgsIDApOwogICAgIHJldHVybiBDU3RyaW5nKGJhLmNvbnN0RGF0YSgpLCBiYS5sZW5ndGgoKSk7 CiB9CiAK 68845 2010-09-26 04:22:28 -0700 2010-09-26 05:58:48 -0700 Patch bug-45245-20100926122225.patch text/plain 4336 robert ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA0MGQ3YWM3OTY5NmI4YzZmY2MyYWRiMGVmNTA0YTBjMTEzNWExMDY2Li41ZTUyYmUy MWNlNDRkOWMxZjlkMWE0ZGQ4Y2I1ZTM3MTQ0OTE5NTljIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAK KzIwMTAtMDktMjYgIFJvYmVydCBIb2dhbiAgPHJvYmVydEB3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gZml4IGh0dHAvdGVz dHMvdXJpL2VzY2FwZWQtZW50aXR5Lmh0bWwKKworICAgICAgICBSZXBsYWNlIGludmFsaWQgZW5j b2RpbmdzIHdpdGggdGhlIGFwcHJvcHJpYXRlIGVzY2FwZWQgZW50aXR5LgorCisgICAgICAgIFNl ZSBhbHNvIGh0dHA6Ly9idWdyZXBvcnRzLnF0Lm5va2lhLmNvbS9icm93c2UvUVRCVUctMTM0MTIK KworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDUyNDUK KworICAgICAgICAqIHBsYXRmb3JtL3F0L1NraXBwZWQ6CisKIDIwMTAtMDktMjUgIEFiaGlzaGVr IEFyeWEgIDxpbmZlcm5vQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBOaWtv bGFzIFppbW1lcm1hbm4uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lw cGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAppbmRleCAwMjdlM2MxN2RiMjlm NjFmZjc4M2Q1OTEwNGNlZWM0YWJiYWU4MGFlLi43YWE3OTYwMTg4YjAyZmQ4ODc5MDQ5MWI0NjFm ODg0M2I4MTBiM2Y2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVk CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKQEAgLTE3OCw5ICsxNzgsNiBA QCBodHRwL3Rlc3RzL3NlY3VyaXR5L29yaWdpbkhlYWRlci9vcmlnaW4taGVhZGVyLWZvci1lbXB0 eS5odG1sCiBodHRwL3Rlc3RzL21lZGlhCiBodHRwL3Rlc3RzL3dtbAogCi0jIG5vdCB1dGY4LWVu Y29kaW5nIHVybHMgYXMgZXhwZWN0ZWQKLWh0dHAvdGVzdHMvdXJpL2VzY2FwZWQtZW50aXR5Lmh0 bWwKLQogIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQyODIKIGh0 dHAvdGVzdHMvaW5jcmVtZW50YWwvc2xvdy11dGY4LXRleHQucGwKIApkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4NzhkZGYyYTQzMjc5MDYy NWFiZTc3YjdkNGQ0YzM3ZTM1MzM2ZjY3Li5hMTBkZWUyZGY0NTAwNzk2ZDk0ZmI5YjAwNWRjOWVi MGVlYjczZTMwIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0No YW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEwLTA5LTI2ICBSb2JlcnQgSG9nYW4gIDxyb2Jl cnRAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBbUXRdIGZpeCBodHRwL3Rlc3RzL3VyaS9lc2NhcGVkLWVudGl0eS5odG1sCisKKyAg ICAgICAgUmVwbGFjZSBpbnZhbGlkIGVuY29kaW5ncyB3aXRoIHRoZSBhcHByb3ByaWF0ZSBlc2Nh cGVkIGVudGl0eS4KKworICAgICAgICBTZWUgYWxzbyBodHRwOi8vYnVncmVwb3J0cy5xdC5ub2tp YS5jb20vYnJvd3NlL1FUQlVHLTEzNDEyCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQ1MjQ1CisKKyAgICAgICAgKiBwbGF0Zm9ybS90ZXh0L3F0L1Rl eHRDb2RlY1F0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRDb2RlY1F0OjplbmNvZGUpOgor CiAyMDEwLTA5LTI1ICBBYmhpc2hlayBBcnlhICA8aW5mZXJub0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgTmlrb2xhcyBaaW1tZXJtYW5uLgpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9wbGF0Zm9ybS90ZXh0L3F0L1RleHRDb2RlY1F0LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vdGV4 dC9xdC9UZXh0Q29kZWNRdC5jcHAKaW5kZXggOTRhMmI3YjU2ODU1YTg1MTYwOTcxNzRkMjI0YWYx M2Q2ZWY1MTVkZi4uMWU5NWQ4N2QyOWUwMjc5MTdhYzMzZThhMzE2YjczOTY4MGQ2Mjc1NyAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L3F0L1RleHRDb2RlY1F0LmNwcAorKysgYi9X ZWJDb3JlL3BsYXRmb3JtL3RleHQvcXQvVGV4dENvZGVjUXQuY3BwCkBAIC0yOSw3ICsyOSw2IEBA CiAjaW5jbHVkZSAiUGxhdGZvcm1TdHJpbmcuaCIKICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5n Lmg+CiAjaW5jbHVkZSA8cXNldC5oPgotLy8gI2luY2x1ZGUgPFFEZWJ1Zz4KIAogbmFtZXNwYWNl IFdlYkNvcmUgewogCkBAIC0xMjUsMTQgKzEyNCw0MSBAQCBTdHJpbmcgVGV4dENvZGVjUXQ6OmRl Y29kZShjb25zdCBjaGFyKiBieXRlcywgc2l6ZV90IGxlbmd0aCwgYm9vbCBmbHVzaCwgYm9vbCAv KgogICAgIHJldHVybiB1bmljb2RlOwogfQogCi1DU3RyaW5nIFRleHRDb2RlY1F0OjplbmNvZGUo Y29uc3QgVUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBsZW5ndGgsIFVuZW5jb2RhYmxlSGFuZGxp bmcpCitDU3RyaW5nIFRleHRDb2RlY1F0OjplbmNvZGUoY29uc3QgVUNoYXIqIGNoYXJhY3RlcnMs IHNpemVfdCBsZW5ndGgsIFVuZW5jb2RhYmxlSGFuZGxpbmcgaGFuZGxpbmcpCiB7CisgICAgUVRl eHRDb2RlYzo6Q29udmVydGVyU3RhdGUgc3RhdGU7CisgICAgc3RhdGUuZmxhZ3MgPSBRVGV4dENv ZGVjOjpDb252ZXJzaW9uRmxhZ3MoUVRleHRDb2RlYzo6Q29udmVydEludmFsaWRUb051bGwgfCBR VGV4dENvZGVjOjpJZ25vcmVIZWFkZXIpOworCiAgICAgaWYgKCFsZW5ndGgpCiAgICAgICAgIHJl dHVybiAiIjsKIAotICAgIC8vIEZJWE1FOiBkbyBzb21ldGhpbmcgc2Vuc2libGUgd2l0aCBVbmVu Y29kYWJsZUhhbmRsaW5nCisgICAgUUJ5dGVBcnJheSBiYSA9IG1fY29kZWMtPmZyb21Vbmljb2Rl KHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgUUNoYXIqPihjaGFyYWN0ZXJzKSwgbGVuZ3RoLCAmc3Rh dGUpOworCisgICAgLy8gSWYgc29tZSA8Yj4gY2hhcmFjdGVycyA8L2I+IGFyZSB1bmVuY29kYWJs ZSwgZXNjYXBlIHRoZW0gYXMgc3BlY2lmaWVkIGJ5IDxiPiBoYW5kbGluZyA8L2I+CisgICAgLy8g V2UgYXBwZW5kIG9uZSB2YWxpZCBlbmNvZGVkIGNodW5rIHRvIGEgUUJ5dGVBcnJheSBhdCBhIHRp bWUuIFdoZW4gd2UgZW5jb3VudGVyIGFuIHVuZW5jb2RhYmxlIGNodW5rIHdlCisgICAgLy8gZXNj YXBlIGl0IHdpdGggZ2V0VW5lbmNvZGFibGVSZXBsYWNlbWVudCwgYXBwZW5kIGl0LCB0aGVuIG1v dmUgdG8gdGhlIG5leHQgY2h1bmsuCisgICAgaWYgKHN0YXRlLmludmFsaWRDaGFycykgeworICAg ICAgICBzdGF0ZS5pbnZhbGlkQ2hhcnMgPSAwOworICAgICAgICBzdGF0ZS5yZW1haW5pbmdDaGFy cyA9IDA7CisgICAgICAgIGludCBsZW4gPSAwOworICAgICAgICBiYS5jbGVhcigpOworICAgICAg ICBmb3IgKHNpemVfdCBwb3MgPSAwOyBwb3MgPCBsZW5ndGg7ICsrcG9zKSB7CisgICAgICAgICAg ICBRQnl0ZUFycmF5IHRiYSA9IG1fY29kZWMtPmZyb21Vbmljb2RlKHJlaW50ZXJwcmV0X2Nhc3Q8 Y29uc3QgUUNoYXIqPihjaGFyYWN0ZXJzKSwgKytsZW4sICZzdGF0ZSk7CisgICAgICAgICAgICBp ZiAoc3RhdGUucmVtYWluaW5nQ2hhcnMpCisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAg ICAgICAgICBpZiAoc3RhdGUuaW52YWxpZENoYXJzKSB7CisgICAgICAgICAgICAgICAgVW5lbmNv ZGFibGVSZXBsYWNlbWVudEFycmF5IHJlcGxhY2VtZW50OworICAgICAgICAgICAgICAgIGdldFVu ZW5jb2RhYmxlUmVwbGFjZW1lbnQoY2hhcmFjdGVyc1swXSwgaGFuZGxpbmcsIHJlcGxhY2VtZW50 KTsKKyAgICAgICAgICAgICAgICB0YmEucmVwbGFjZSgnXDAnLCByZXBsYWNlbWVudCk7CisgICAg ICAgICAgICAgICAgc3RhdGUuaW52YWxpZENoYXJzID0gMDsKKyAgICAgICAgICAgIH0KKyAgICAg ICAgICAgIGJhLmFwcGVuZCh0YmEpOworICAgICAgICAgICAgY2hhcmFjdGVycyArPSBsZW47Cisg ICAgICAgICAgICBsZW4gPSAwOworICAgICAgICAgICAgc3RhdGUucmVtYWluaW5nQ2hhcnMgPSAw OworICAgICAgICB9CisgICAgfQogCi0gICAgUUJ5dGVBcnJheSBiYSA9IG1fY29kZWMtPmZyb21V bmljb2RlKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgUUNoYXIqPihjaGFyYWN0ZXJzKSwgbGVuZ3Ro LCAwKTsKICAgICByZXR1cm4gQ1N0cmluZyhiYS5jb25zdERhdGEoKSwgYmEubGVuZ3RoKCkpOwog fQogCg== 68846 2010-09-26 05:58:54 -0700 2010-09-26 06:12:20 -0700 Patch bug-45245-20100926135850.patch text/plain 4334 robert ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA0MGQ3YWM3OTY5NmI4YzZmY2MyYWRiMGVmNTA0YTBjMTEzNWExMDY2Li5lNmE4NGM0 MzA0YTZjNmZlYWExM2RkZTVkYjY0ZDYzNTk2YjJlMjVmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAK KzIwMTAtMDktMjYgIFJvYmVydCBIb2dhbiAgPHJvYmVydEB3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IEFuZHJlYXMgS2xpbmcuCisKKyAgICAgICAgW1F0XSBmaXggaHR0cC90ZXN0 cy91cmkvZXNjYXBlZC1lbnRpdHkuaHRtbAorCisgICAgICAgIFJlcGxhY2UgaW52YWxpZCBlbmNv ZGluZ3Mgd2l0aCB0aGUgYXBwcm9wcmlhdGUgZXNjYXBlZCBlbnRpdHkuCisKKyAgICAgICAgU2Vl IGFsc28gaHR0cDovL2J1Z3JlcG9ydHMucXQubm9raWEuY29tL2Jyb3dzZS9RVEJVRy0xMzQxMgor CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTI0NQor CisgICAgICAgICogcGxhdGZvcm0vcXQvU2tpcHBlZDoKKwogMjAxMC0wOS0yNSAgQWJoaXNoZWsg QXJ5YSAgPGluZmVybm9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5pa29s YXMgWmltbWVybWFubi4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBw ZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCmluZGV4IDAyN2UzYzE3ZGIyOWY2 MWZmNzgzZDU5MTA0Y2VlYzRhYmJhZTgwYWUuLjdhYTc5NjAxODhiMDJmZDg4NzkwNDkxYjQ2MWY4 ODQzYjgxMGIzZjYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQK KysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZApAQCAtMTc4LDkgKzE3OCw2IEBA IGh0dHAvdGVzdHMvc2VjdXJpdHkvb3JpZ2luSGVhZGVyL29yaWdpbi1oZWFkZXItZm9yLWVtcHR5 Lmh0bWwKIGh0dHAvdGVzdHMvbWVkaWEKIGh0dHAvdGVzdHMvd21sCiAKLSMgbm90IHV0ZjgtZW5j b2RpbmcgdXJscyBhcyBleHBlY3RlZAotaHR0cC90ZXN0cy91cmkvZXNjYXBlZC1lbnRpdHkuaHRt bAotCiAjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDI4MgogaHR0 cC90ZXN0cy9pbmNyZW1lbnRhbC9zbG93LXV0ZjgtdGV4dC5wbAogCmRpZmYgLS1naXQgYS9XZWJD b3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDg3OGRkZjJhNDMyNzkwNjI1 YWJlNzdiN2Q0ZDRjMzdlMzUzMzZmNjcuLmI2MGY3YzM1Y2RhODM1NGEyZjAzZjVhY2Y0MmQxMzNm ZmJmNjczNDMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDktMjYgIFJvYmVydCBIb2dhbiAgPHJvYmVy dEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IEFuZHJlYXMgS2xpbmcuCisKKyAg ICAgICAgW1F0XSBmaXggaHR0cC90ZXN0cy91cmkvZXNjYXBlZC1lbnRpdHkuaHRtbAorCisgICAg ICAgIFJlcGxhY2UgaW52YWxpZCBlbmNvZGluZ3Mgd2l0aCB0aGUgYXBwcm9wcmlhdGUgZXNjYXBl ZCBlbnRpdHkuCisKKyAgICAgICAgU2VlIGFsc28gaHR0cDovL2J1Z3JlcG9ydHMucXQubm9raWEu Y29tL2Jyb3dzZS9RVEJVRy0xMzQxMgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00NTI0NQorCisgICAgICAgICogcGxhdGZvcm0vdGV4dC9xdC9UZXh0 Q29kZWNRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0Q29kZWNRdDo6ZW5jb2RlKToKKwog MjAxMC0wOS0yNSAgQWJoaXNoZWsgQXJ5YSAgPGluZmVybm9AY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IE5pa29sYXMgWmltbWVybWFubi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUv cGxhdGZvcm0vdGV4dC9xdC9UZXh0Q29kZWNRdC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL3RleHQv cXQvVGV4dENvZGVjUXQuY3BwCmluZGV4IDk0YTJiN2I1Njg1NWE4NTE2MDk3MTc0ZDIyNGFmMTNk NmVmNTE1ZGYuLjFlOTVkODdkMjllMDI3OTE3YWMzM2U4YTMxNmI3Mzk2ODBkNjI3NTcgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9xdC9UZXh0Q29kZWNRdC5jcHAKKysrIGIvV2Vi Q29yZS9wbGF0Zm9ybS90ZXh0L3F0L1RleHRDb2RlY1F0LmNwcApAQCAtMjksNyArMjksNiBAQAog I2luY2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5o PgogI2luY2x1ZGUgPHFzZXQuaD4KLS8vICNpbmNsdWRlIDxRRGVidWc+CiAKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIApAQCAtMTI1LDE0ICsxMjQsNDEgQEAgU3RyaW5nIFRleHRDb2RlY1F0OjpkZWNv ZGUoY29uc3QgY2hhciogYnl0ZXMsIHNpemVfdCBsZW5ndGgsIGJvb2wgZmx1c2gsIGJvb2wgLyoK ICAgICByZXR1cm4gdW5pY29kZTsKIH0KIAotQ1N0cmluZyBUZXh0Q29kZWNRdDo6ZW5jb2RlKGNv bnN0IFVDaGFyKiBjaGFyYWN0ZXJzLCBzaXplX3QgbGVuZ3RoLCBVbmVuY29kYWJsZUhhbmRsaW5n KQorQ1N0cmluZyBUZXh0Q29kZWNRdDo6ZW5jb2RlKGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJzLCBz aXplX3QgbGVuZ3RoLCBVbmVuY29kYWJsZUhhbmRsaW5nIGhhbmRsaW5nKQogeworICAgIFFUZXh0 Q29kZWM6OkNvbnZlcnRlclN0YXRlIHN0YXRlOworICAgIHN0YXRlLmZsYWdzID0gUVRleHRDb2Rl Yzo6Q29udmVyc2lvbkZsYWdzKFFUZXh0Q29kZWM6OkNvbnZlcnRJbnZhbGlkVG9OdWxsIHwgUVRl eHRDb2RlYzo6SWdub3JlSGVhZGVyKTsKKwogICAgIGlmICghbGVuZ3RoKQogICAgICAgICByZXR1 cm4gIiI7CiAKLSAgICAvLyBGSVhNRTogZG8gc29tZXRoaW5nIHNlbnNpYmxlIHdpdGggVW5lbmNv ZGFibGVIYW5kbGluZworICAgIFFCeXRlQXJyYXkgYmEgPSBtX2NvZGVjLT5mcm9tVW5pY29kZShy ZWludGVycHJldF9jYXN0PGNvbnN0IFFDaGFyKj4oY2hhcmFjdGVycyksIGxlbmd0aCwgJnN0YXRl KTsKKworICAgIC8vIElmIHNvbWUgPGI+IGNoYXJhY3RlcnMgPC9iPiBhcmUgdW5lbmNvZGFibGUs IGVzY2FwZSB0aGVtIGFzIHNwZWNpZmllZCBieSA8Yj4gaGFuZGxpbmcgPC9iPgorICAgIC8vIFdl IGFwcGVuZCBvbmUgdmFsaWQgZW5jb2RlZCBjaHVuayB0byBhIFFCeXRlQXJyYXkgYXQgYSB0aW1l LiBXaGVuIHdlIGVuY291bnRlciBhbiB1bmVuY29kYWJsZSBjaHVuayB3ZQorICAgIC8vIGVzY2Fw ZSBpdCB3aXRoIGdldFVuZW5jb2RhYmxlUmVwbGFjZW1lbnQsIGFwcGVuZCBpdCwgdGhlbiBtb3Zl IHRvIHRoZSBuZXh0IGNodW5rLgorICAgIGlmIChzdGF0ZS5pbnZhbGlkQ2hhcnMpIHsKKyAgICAg ICAgc3RhdGUuaW52YWxpZENoYXJzID0gMDsKKyAgICAgICAgc3RhdGUucmVtYWluaW5nQ2hhcnMg PSAwOworICAgICAgICBpbnQgbGVuID0gMDsKKyAgICAgICAgYmEuY2xlYXIoKTsKKyAgICAgICAg Zm9yIChzaXplX3QgcG9zID0gMDsgcG9zIDwgbGVuZ3RoOyArK3BvcykgeworICAgICAgICAgICAg UUJ5dGVBcnJheSB0YmEgPSBtX2NvZGVjLT5mcm9tVW5pY29kZShyZWludGVycHJldF9jYXN0PGNv bnN0IFFDaGFyKj4oY2hhcmFjdGVycyksICsrbGVuLCAmc3RhdGUpOworICAgICAgICAgICAgaWYg KHN0YXRlLnJlbWFpbmluZ0NoYXJzKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAg ICAgICAgaWYgKHN0YXRlLmludmFsaWRDaGFycykgeworICAgICAgICAgICAgICAgIFVuZW5jb2Rh YmxlUmVwbGFjZW1lbnRBcnJheSByZXBsYWNlbWVudDsKKyAgICAgICAgICAgICAgICBnZXRVbmVu Y29kYWJsZVJlcGxhY2VtZW50KGNoYXJhY3RlcnNbMF0sIGhhbmRsaW5nLCByZXBsYWNlbWVudCk7 CisgICAgICAgICAgICAgICAgdGJhLnJlcGxhY2UoJ1wwJywgcmVwbGFjZW1lbnQpOworICAgICAg ICAgICAgICAgIHN0YXRlLmludmFsaWRDaGFycyA9IDA7CisgICAgICAgICAgICB9CisgICAgICAg ICAgICBiYS5hcHBlbmQodGJhKTsKKyAgICAgICAgICAgIGNoYXJhY3RlcnMgKz0gbGVuOworICAg ICAgICAgICAgbGVuID0gMDsKKyAgICAgICAgICAgIHN0YXRlLnJlbWFpbmluZ0NoYXJzID0gMDsK KyAgICAgICAgfQorICAgIH0KIAotICAgIFFCeXRlQXJyYXkgYmEgPSBtX2NvZGVjLT5mcm9tVW5p Y29kZShyZWludGVycHJldF9jYXN0PGNvbnN0IFFDaGFyKj4oY2hhcmFjdGVycyksIGxlbmd0aCwg MCk7CiAgICAgcmV0dXJuIENTdHJpbmcoYmEuY29uc3REYXRhKCksIGJhLmxlbmd0aCgpKTsKIH0K IAo=