105440 2012-12-19 08:38:46 -0800 [BlackBerry] RSS reader mangles UTF-8 2012-12-19 21:29:31 -0800 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 1 ctruta webkit-unassigned mifenton rwlbuis tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 794701 0 ctruta 2012-12-19 08:38:46 -0800 Strange characters appear in the translations of RSS feeds which contain letters that can't be encoded in ASCII. This happens because the UTF-8 text is wrongly interpreted as Latin-1. Example: umlauts don't show up correctly: http://ml.spiegel.de/rss.do?id=politik 794710 1 180176 ctruta 2012-12-19 08:48:12 -0800 Created attachment 180176 Patch 794712 2 180176 yong.li.webkit 2012-12-19 08:55:33 -0800 Comment on attachment 180176 Patch Wait. characters8() isn't null terminated. You should use result.assign(...characters8(), html.length()). 794713 3 180176 yong.li.webkit 2012-12-19 08:56:07 -0800 Comment on attachment 180176 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=180176&action=review > Source/WebCore/ChangeLog:7 > + > + Reviewed by NOBODY (OOPS!). > + Reviewed internally by Liam Quinn. Internal PR#? 794737 4 180181 ctruta 2012-12-19 09:22:38 -0800 Created attachment 180181 Patch 794775 5 180189 ctruta 2012-12-19 10:05:52 -0800 Created attachment 180189 Patch Same as previous patch, but with a blank line removed. 794952 6 yong.li.webkit 2012-12-19 14:27:27 -0800 . 795153 7 180189 webkit.review.bot 2012-12-19 21:29:27 -0800 Comment on attachment 180189 Patch Clearing flags on attachment: 180189 Committed r138218: <http://trac.webkit.org/changeset/138218> 795154 8 webkit.review.bot 2012-12-19 21:29:31 -0800 All reviewed patches have been landed. Closing bug. 180176 2012-12-19 08:48:12 -0800 2012-12-19 09:22:38 -0800 Patch patch.diff text/plain 4790 ctruta ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1OGYyY2I2YjEuLmFkOWIxMTU4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE5IEBACisyMDEyLTEyLTE5ICBDb3NtaW4gVHJ1dGEgIDxjdHJ1dGFAcmltLmNvbT4KKworICAg ICAgICBbQmxhY2tCZXJyeV0gUlNTIHJlYWRlciBtYW5nbGVzIFVURi04CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDU0NDAKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgUmV2aWV3ZWQgaW50ZXJuYWxseSBieSBM aWFtIFF1aW5uLgorCisgICAgICAgIFRoZSBIVE1MIHN0cmluZyBidWlsdCBmcm9tIFJTUyBwYXJz ZSBkYXRhIGlzIGVuY29kZWQgaW4gVVRGLTgsCisgICAgICAgIGFuZCBpdCBzaG91bGQgbm90IGJl IGNvbnZlcnRlZCB0byBVVEYtOCByZXBlYXRlZGx5LgorCisgICAgICAgICogcGxhdGZvcm0vbmV0 d29yay9ibGFja2JlcnJ5L3Jzcy9SU1NGaWx0ZXJTdHJlYW0uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UlNTRmlsdGVyU3RyZWFtOjpjb252ZXJ0Q29udGVudFRvSHRtbCk6CisgICAgICAgICogcGxh dGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L3Jzcy9SU1NHZW5lcmF0b3IuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UlNTR2VuZXJhdG9yOjpnZW5lcmF0ZUh0bWwpOgorCiAyMDEyLTEyLTE5ICBBbmRy ZXkgTHVzaG5pa292ICA8bHVzaG5pa292QGNocm9taXVtLmNvbT4KIAogICAgICAgICBXZWIgSW5z cGVjdG9yOiByZWZhY3RvciBEZWZhdWx0VGV4dEVkaXRvcidzIHxleHBhbmRlZHwgc2V0dGVycwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L3Jz cy9SU1NGaWx0ZXJTdHJlYW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9i bGFja2JlcnJ5L3Jzcy9SU1NGaWx0ZXJTdHJlYW0uY3BwCmluZGV4IGNhMGU4MGUyMS4uNTg1N2Vj MjBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVy cnkvcnNzL1JTU0ZpbHRlclN0cmVhbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9ibGFja2JlcnJ5L3Jzcy9SU1NGaWx0ZXJTdHJlYW0uY3BwCkBAIC01MjUsOSArNTI1 LDE2IEBAIGJvb2wgUlNTRmlsdGVyU3RyZWFtOjpjb252ZXJ0Q29udGVudFRvSHRtbChzdGQ6OnN0 cmluZyYgcmVzdWx0KQogICAgIGlmICghc3VjY2VzcykKICAgICAgICAgcmV0dXJuIGZhbHNlOwog CisgICAgLy8gRklYTUU6CisgICAgLy8gVGhlIEhUTUwgc3RyaW5nIGdlbmVyYXRlZCBiZWxvdyBw dXJwb3J0cyB0byBiZSBhIFVURjgtZW5jb2RlZAorICAgIC8vIFdURjo6U3RyaW5nLCBhbHRob3Vn aCBpdHMgY2hhcmFjdGVyczgoKSBkYXRhIHNob3VsZCBiZSBMYXRpbjEuCisgICAgLy8gV2UgYnVp bGQgdGhlbiBleHRyYWN0IHRoaXMgc3RyaW5nLCBwcmV0ZW5kaW5nIHRoYXQgd2UgZG9uJ3Qga25v dworICAgIC8vIHRoYXQgd2UgcGFzcyBpbmNvcnJlY3RseS1lbmNvZGVkIGNoYXIgZGF0YSBib3Ro IHdheXMuCisgICAgLy8gV2Ugc2hvdWxkIHVzZSBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5n IGluc3RlYWQgb2YgV1RGOjpTdHJpbmcuCiAgICAgT3duUHRyPFJTU0dlbmVyYXRvcj4gZ2VuZXJh dG9yID0gYWRvcHRQdHIobmV3IFJTU0dlbmVyYXRvcigpKTsKICAgICBTdHJpbmcgaHRtbCA9IGdl bmVyYXRvci0+Z2VuZXJhdGVIdG1sKHBhcnNlci0+bV9yb290KTsKLSAgICByZXN1bHQgPSBodG1s LnV0ZjgoU3RyaW5nOjpTdHJpY3RDb252ZXJzaW9uKS5kYXRhKCk7CisgICAgQVNTRVJUKGh0bWwu aXM4Qml0KCkpOworICAgIHJlc3VsdCA9IHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KGh0 bWwuY2hhcmFjdGVyczgoKSk7CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9yc3MvUlNTR2VuZXJhdG9y LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9yc3MvUlNT R2VuZXJhdG9yLmNwcAppbmRleCBkOTNlMDRjOWIuLjQ2ZWU0NTQ2NCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L3Jzcy9SU1NHZW5lcmF0b3Iu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9yc3Mv UlNTR2VuZXJhdG9yLmNwcApAQCAtODMsMTAgKzgzLDEwIEBAIFN0cmluZyBSU1NHZW5lcmF0b3I6 OmdlbmVyYXRlSHRtbChSU1NGZWVkKiBmZWVkKQogICAgICAgICBidWlsZGVyLmFwcGVuZChhcnRp Y2xlTmFtZSk7CiAgICAgICAgIGJ1aWxkZXIuYXBwZW5kTGl0ZXJhbCgiXCIgY2xhc3M9XCJhcnRp Y2xlXCI+XG48YSBocmVmPVwiIik7CiAgICAgICAgIGlmICghaXRlbS0+bV9saW5rLmlzRW1wdHko KSkKLSAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKGl0ZW0tPm1fbGluay51dGY4KFN0cmluZzo6 U3RyaWN0Q29udmVyc2lvbikuZGF0YSgpKTsKKyAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKGl0 ZW0tPm1fbGluayk7CiAgICAgICAgIGJ1aWxkZXIuYXBwZW5kTGl0ZXJhbCgiXCI+PGI+Iik7CiAg ICAgICAgIGlmICghaXRlbS0+bV90aXRsZS5pc0VtcHR5KCkpCi0gICAgICAgICAgICBidWlsZGVy LmFwcGVuZChpdGVtLT5tX3RpdGxlLnV0ZjgoU3RyaW5nOjpTdHJpY3RDb252ZXJzaW9uKS5kYXRh KCkpOworICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoaXRlbS0+bV90aXRsZSk7CiAgICAgICAg IGVsc2UKICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKHNfZGVmYXVsdEVudHJ5VGl0bGUpOwog ICAgICAgICBidWlsZGVyLmFwcGVuZExpdGVyYWwoIjwvYj48L2E+XG48YnIgLz4iKTsKQEAgLTk0 LDEzICs5NCwxMyBAQCBTdHJpbmcgUlNTR2VuZXJhdG9yOjpnZW5lcmF0ZUh0bWwoUlNTRmVlZCog ZmVlZCkKICAgICAgICAgaWYgKCFpdGVtLT5tX2F1dGhvci5pc0VtcHR5KCkpIHsKICAgICAgICAg ICAgIGJ1aWxkZXIuYXBwZW5kKGkxOG4oIkJ5IikpOwogICAgICAgICAgICAgYnVpbGRlci5hcHBl bmRMaXRlcmFsKCIgPGI+Iik7Ci0gICAgICAgICAgICBidWlsZGVyLmFwcGVuZChpdGVtLT5tX2F1 dGhvci51dGY4KFN0cmluZzo6U3RyaWN0Q29udmVyc2lvbikuZGF0YSgpKTsKKyAgICAgICAgICAg IGJ1aWxkZXIuYXBwZW5kKGl0ZW0tPm1fYXV0aG9yKTsKICAgICAgICAgICAgIGJ1aWxkZXIuYXBw ZW5kTGl0ZXJhbCgiPC9iPiAiKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGlmICgh ZmVlZC0+bV9hdXRob3IuaXNFbXB0eSgpKSB7CiAgICAgICAgICAgICAgICAgYnVpbGRlci5hcHBl bmQoaTE4bigiQnkiKSk7CiAgICAgICAgICAgICAgICAgYnVpbGRlci5hcHBlbmRMaXRlcmFsKCIg PGI+Iik7Ci0gICAgICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoZmVlZC0+bV9hdXRob3IudXRm OChTdHJpbmc6OlN0cmljdENvbnZlcnNpb24pLmRhdGEoKSk7CisgICAgICAgICAgICAgICAgYnVp bGRlci5hcHBlbmQoZmVlZC0+bV9hdXRob3IpOwogICAgICAgICAgICAgICAgIGJ1aWxkZXIuYXBw ZW5kTGl0ZXJhbCgiPC9iPiAiKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpAQCAtMTEzLDcg KzExMyw3IEBAIFN0cmluZyBSU1NHZW5lcmF0b3I6OmdlbmVyYXRlSHRtbChSU1NGZWVkKiBmZWVk KQogCiAgICAgICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgaXRlbS0+bV9jYXRlZ29y aWVzLnNpemUoKSA7ICsraSkgewogICAgICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kTGl0ZXJh bCgiPGI+Iik7Ci0gICAgICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoaXRlbS0+bV9jYXRlZ29y aWVzW2ldLnV0ZjgoU3RyaW5nOjpTdHJpY3RDb252ZXJzaW9uKS5kYXRhKCkpOworICAgICAgICAg ICAgICAgIGJ1aWxkZXIuYXBwZW5kKGl0ZW0tPm1fY2F0ZWdvcmllc1tpXSk7CiAgICAgICAgICAg ICAgICAgYnVpbGRlci5hcHBlbmRMaXRlcmFsKCI8L2I+Iik7CiAKICAgICAgICAgICAgICAgICBp ZiAoaSA8IGl0ZW0tPm1fY2F0ZWdvcmllcy5zaXplKCkgLSAxKQpAQCAtMTIzLDExICsxMjMsMTEg QEAgU3RyaW5nIFJTU0dlbmVyYXRvcjo6Z2VuZXJhdGVIdG1sKFJTU0ZlZWQqIGZlZWQpCiAKICAg ICAgICAgYnVpbGRlci5hcHBlbmRMaXRlcmFsKCI8YnIgLz4iKTsKICAgICAgICAgaWYgKCFpdGVt LT5tX3B1YkRhdGUuaXNFbXB0eSgpKQotICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoaXRlbS0+ bV9wdWJEYXRlLnV0ZjgoU3RyaW5nOjpTdHJpY3RDb252ZXJzaW9uKS5kYXRhKCkpOworICAgICAg ICAgICAgYnVpbGRlci5hcHBlbmQoaXRlbS0+bV9wdWJEYXRlKTsKIAogICAgICAgICBidWlsZGVy LmFwcGVuZExpdGVyYWwoIjxiciAvPiIpOwogICAgICAgICBpZiAoIWl0ZW0tPm1fZGVzY3JpcHRp b24uaXNFbXB0eSgpKQotICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoaXRlbS0+bV9kZXNjcmlw dGlvbi51dGY4KFN0cmluZzo6U3RyaWN0Q29udmVyc2lvbikuZGF0YSgpKTsKKyAgICAgICAgICAg IGJ1aWxkZXIuYXBwZW5kKGl0ZW0tPm1fZGVzY3JpcHRpb24pOwogICAgICAgICBidWlsZGVyLmFw cGVuZExpdGVyYWwoIjxiciAvPiIpOwogCiAgICAgICAgIGlmIChpdGVtLT5tX2VuY2xvc3VyZSkg ewo= 180181 2012-12-19 09:22:38 -0800 2012-12-19 10:05:52 -0800 Patch patch.diff text/plain 4838 ctruta ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1OGYyY2I2YjEuLjZlNjEwNzkwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsx LDIxIEBACisyMDEyLTEyLTE5ICBDb3NtaW4gVHJ1dGEgIDxjdHJ1dGFAcmltLmNvbT4KKworICAg ICAgICBbQmxhY2tCZXJyeV0gUlNTIHJlYWRlciBtYW5nbGVzIFVURi04CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDU0NDAKKworICAgICAgICBSSU0g UFIgMjM1MDk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAg IFJldmlld2VkIGludGVybmFsbHkgYnkgTGlhbSBRdWlubi4KKworICAgICAgICBUaGUgSFRNTCBz dHJpbmcgYnVpbHQgZnJvbSBSU1MgcGFyc2UgZGF0YSBpcyBlbmNvZGVkIGluIFVURi04LAorICAg ICAgICBhbmQgaXQgc2hvdWxkIG5vdCBiZSBjb252ZXJ0ZWQgdG8gVVRGLTggcmVwZWF0ZWRseS4K KworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9yc3MvUlNTRmlsdGVyU3Ry ZWFtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJTU0ZpbHRlclN0cmVhbTo6Y29udmVydENvbnRl bnRUb0h0bWwpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9yc3MvUlNT R2VuZXJhdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJTU0dlbmVyYXRvcjo6Z2VuZXJhdGVI dG1sKToKKwogMjAxMi0xMi0xOSAgQW5kcmV5IEx1c2huaWtvdiAgPGx1c2huaWtvdkBjaHJvbWl1 bS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogcmVmYWN0b3IgRGVmYXVsdFRleHRFZGl0 b3IncyB8ZXhwYW5kZWR8IHNldHRlcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvYmxhY2tiZXJyeS9yc3MvUlNTRmlsdGVyU3RyZWFtLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9yc3MvUlNTRmlsdGVyU3RyZWFtLmNw cAppbmRleCBjYTBlODBlMjEuLjI4MWY1ZTAzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L3Jzcy9SU1NGaWx0ZXJTdHJlYW0uY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9yc3MvUlNTRmlsdGVy U3RyZWFtLmNwcApAQCAtNTI1LDkgKzUyNSwxNyBAQCBib29sIFJTU0ZpbHRlclN0cmVhbTo6Y29u dmVydENvbnRlbnRUb0h0bWwoc3RkOjpzdHJpbmcmIHJlc3VsdCkKICAgICBpZiAoIXN1Y2Nlc3Mp CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorICAgIC8vIEZJWE1FOgorICAgIC8vIFRoZSBIVE1M IHN0cmluZyBnZW5lcmF0ZWQgYmVsb3cgcHVycG9ydHMgdG8gYmUgYSBVVEY4LWVuY29kZWQKKyAg ICAvLyBXVEY6OlN0cmluZywgYWx0aG91Z2ggaXRzIGNoYXJhY3RlcnM4KCkgZGF0YSBzaG91bGQg YmUgTGF0aW4xLgorICAgIC8vIFdlIGJ1aWxkIHRoZW4gZXh0cmFjdCB0aGlzIHN0cmluZywgcHJl dGVuZGluZyB0aGF0IHdlIGRvbid0IGtub3cKKyAgICAvLyB0aGF0IHdlIHBhc3MgaW5jb3JyZWN0 bHktZW5jb2RlZCBjaGFyIGRhdGEgYm90aCB3YXlzLgorICAgIC8vIFdlIHNob3VsZCB1c2UgQmxh Y2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyBpbnN0ZWFkIG9mIFdURjo6U3RyaW5nLgogICAgIE93 blB0cjxSU1NHZW5lcmF0b3I+IGdlbmVyYXRvciA9IGFkb3B0UHRyKG5ldyBSU1NHZW5lcmF0b3Io KSk7CiAgICAgU3RyaW5nIGh0bWwgPSBnZW5lcmF0b3ItPmdlbmVyYXRlSHRtbChwYXJzZXItPm1f cm9vdCk7Ci0gICAgcmVzdWx0ID0gaHRtbC51dGY4KFN0cmluZzo6U3RyaWN0Q29udmVyc2lvbiku ZGF0YSgpOworCisgICAgQVNTRVJUKGh0bWwuaXM4Qml0KCkpOworICAgIHJlc3VsdC5hc3NpZ24o cmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4oaHRtbC5jaGFyYWN0ZXJzOCgpKSwgaHRtbC5s ZW5ndGgoKSk7CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9yc3MvUlNTR2VuZXJhdG9yLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9yc3MvUlNTR2VuZXJhdG9y LmNwcAppbmRleCBkOTNlMDRjOWIuLjQ2ZWU0NTQ2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L3Jzcy9SU1NHZW5lcmF0b3IuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9yc3MvUlNTR2VuZXJh dG9yLmNwcApAQCAtODMsMTAgKzgzLDEwIEBAIFN0cmluZyBSU1NHZW5lcmF0b3I6OmdlbmVyYXRl SHRtbChSU1NGZWVkKiBmZWVkKQogICAgICAgICBidWlsZGVyLmFwcGVuZChhcnRpY2xlTmFtZSk7 CiAgICAgICAgIGJ1aWxkZXIuYXBwZW5kTGl0ZXJhbCgiXCIgY2xhc3M9XCJhcnRpY2xlXCI+XG48 YSBocmVmPVwiIik7CiAgICAgICAgIGlmICghaXRlbS0+bV9saW5rLmlzRW1wdHkoKSkKLSAgICAg ICAgICAgIGJ1aWxkZXIuYXBwZW5kKGl0ZW0tPm1fbGluay51dGY4KFN0cmluZzo6U3RyaWN0Q29u dmVyc2lvbikuZGF0YSgpKTsKKyAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKGl0ZW0tPm1fbGlu ayk7CiAgICAgICAgIGJ1aWxkZXIuYXBwZW5kTGl0ZXJhbCgiXCI+PGI+Iik7CiAgICAgICAgIGlm ICghaXRlbS0+bV90aXRsZS5pc0VtcHR5KCkpCi0gICAgICAgICAgICBidWlsZGVyLmFwcGVuZChp dGVtLT5tX3RpdGxlLnV0ZjgoU3RyaW5nOjpTdHJpY3RDb252ZXJzaW9uKS5kYXRhKCkpOworICAg ICAgICAgICAgYnVpbGRlci5hcHBlbmQoaXRlbS0+bV90aXRsZSk7CiAgICAgICAgIGVsc2UKICAg ICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKHNfZGVmYXVsdEVudHJ5VGl0bGUpOwogICAgICAgICBi dWlsZGVyLmFwcGVuZExpdGVyYWwoIjwvYj48L2E+XG48YnIgLz4iKTsKQEAgLTk0LDEzICs5NCwx MyBAQCBTdHJpbmcgUlNTR2VuZXJhdG9yOjpnZW5lcmF0ZUh0bWwoUlNTRmVlZCogZmVlZCkKICAg ICAgICAgaWYgKCFpdGVtLT5tX2F1dGhvci5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgIGJ1aWxk ZXIuYXBwZW5kKGkxOG4oIkJ5IikpOwogICAgICAgICAgICAgYnVpbGRlci5hcHBlbmRMaXRlcmFs KCIgPGI+Iik7Ci0gICAgICAgICAgICBidWlsZGVyLmFwcGVuZChpdGVtLT5tX2F1dGhvci51dGY4 KFN0cmluZzo6U3RyaWN0Q29udmVyc2lvbikuZGF0YSgpKTsKKyAgICAgICAgICAgIGJ1aWxkZXIu YXBwZW5kKGl0ZW0tPm1fYXV0aG9yKTsKICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kTGl0ZXJh bCgiPC9iPiAiKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGlmICghZmVlZC0+bV9h dXRob3IuaXNFbXB0eSgpKSB7CiAgICAgICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoaTE4bigi QnkiKSk7CiAgICAgICAgICAgICAgICAgYnVpbGRlci5hcHBlbmRMaXRlcmFsKCIgPGI+Iik7Ci0g ICAgICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoZmVlZC0+bV9hdXRob3IudXRmOChTdHJpbmc6 OlN0cmljdENvbnZlcnNpb24pLmRhdGEoKSk7CisgICAgICAgICAgICAgICAgYnVpbGRlci5hcHBl bmQoZmVlZC0+bV9hdXRob3IpOwogICAgICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kTGl0ZXJh bCgiPC9iPiAiKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpAQCAtMTEzLDcgKzExMyw3IEBA IFN0cmluZyBSU1NHZW5lcmF0b3I6OmdlbmVyYXRlSHRtbChSU1NGZWVkKiBmZWVkKQogCiAgICAg ICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgaXRlbS0+bV9jYXRlZ29yaWVzLnNpemUo KSA7ICsraSkgewogICAgICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kTGl0ZXJhbCgiPGI+Iik7 Ci0gICAgICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoaXRlbS0+bV9jYXRlZ29yaWVzW2ldLnV0 ZjgoU3RyaW5nOjpTdHJpY3RDb252ZXJzaW9uKS5kYXRhKCkpOworICAgICAgICAgICAgICAgIGJ1 aWxkZXIuYXBwZW5kKGl0ZW0tPm1fY2F0ZWdvcmllc1tpXSk7CiAgICAgICAgICAgICAgICAgYnVp bGRlci5hcHBlbmRMaXRlcmFsKCI8L2I+Iik7CiAKICAgICAgICAgICAgICAgICBpZiAoaSA8IGl0 ZW0tPm1fY2F0ZWdvcmllcy5zaXplKCkgLSAxKQpAQCAtMTIzLDExICsxMjMsMTEgQEAgU3RyaW5n IFJTU0dlbmVyYXRvcjo6Z2VuZXJhdGVIdG1sKFJTU0ZlZWQqIGZlZWQpCiAKICAgICAgICAgYnVp bGRlci5hcHBlbmRMaXRlcmFsKCI8YnIgLz4iKTsKICAgICAgICAgaWYgKCFpdGVtLT5tX3B1YkRh dGUuaXNFbXB0eSgpKQotICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoaXRlbS0+bV9wdWJEYXRl LnV0ZjgoU3RyaW5nOjpTdHJpY3RDb252ZXJzaW9uKS5kYXRhKCkpOworICAgICAgICAgICAgYnVp bGRlci5hcHBlbmQoaXRlbS0+bV9wdWJEYXRlKTsKIAogICAgICAgICBidWlsZGVyLmFwcGVuZExp dGVyYWwoIjxiciAvPiIpOwogICAgICAgICBpZiAoIWl0ZW0tPm1fZGVzY3JpcHRpb24uaXNFbXB0 eSgpKQotICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoaXRlbS0+bV9kZXNjcmlwdGlvbi51dGY4 KFN0cmluZzo6U3RyaWN0Q29udmVyc2lvbikuZGF0YSgpKTsKKyAgICAgICAgICAgIGJ1aWxkZXIu YXBwZW5kKGl0ZW0tPm1fZGVzY3JpcHRpb24pOwogICAgICAgICBidWlsZGVyLmFwcGVuZExpdGVy YWwoIjxiciAvPiIpOwogCiAgICAgICAgIGlmIChpdGVtLT5tX2VuY2xvc3VyZSkgewo= 180189 2012-12-19 10:05:52 -0800 2012-12-19 21:29:27 -0800 Patch patch.diff text/plain 4836 ctruta ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1OGYyY2I2YjEuLjZlNjEwNzkwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsx LDIxIEBACisyMDEyLTEyLTE5ICBDb3NtaW4gVHJ1dGEgIDxjdHJ1dGFAcmltLmNvbT4KKworICAg ICAgICBbQmxhY2tCZXJyeV0gUlNTIHJlYWRlciBtYW5nbGVzIFVURi04CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDU0NDAKKworICAgICAgICBSSU0g UFIgMjM1MDk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAg IFJldmlld2VkIGludGVybmFsbHkgYnkgTGlhbSBRdWlubi4KKworICAgICAgICBUaGUgSFRNTCBz dHJpbmcgYnVpbHQgZnJvbSBSU1MgcGFyc2UgZGF0YSBpcyBlbmNvZGVkIGluIFVURi04LAorICAg ICAgICBhbmQgaXQgc2hvdWxkIG5vdCBiZSBjb252ZXJ0ZWQgdG8gVVRGLTggcmVwZWF0ZWRseS4K KworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9yc3MvUlNTRmlsdGVyU3Ry ZWFtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJTU0ZpbHRlclN0cmVhbTo6Y29udmVydENvbnRl bnRUb0h0bWwpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9yc3MvUlNT R2VuZXJhdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJTU0dlbmVyYXRvcjo6Z2VuZXJhdGVI dG1sKToKKwogMjAxMi0xMi0xOSAgQW5kcmV5IEx1c2huaWtvdiAgPGx1c2huaWtvdkBjaHJvbWl1 bS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogcmVmYWN0b3IgRGVmYXVsdFRleHRFZGl0 b3IncyB8ZXhwYW5kZWR8IHNldHRlcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvYmxhY2tiZXJyeS9yc3MvUlNTRmlsdGVyU3RyZWFtLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9yc3MvUlNTRmlsdGVyU3RyZWFtLmNw cAppbmRleCBjYTBlODBlMjEuLjhiODQ0NmFiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L3Jzcy9SU1NGaWx0ZXJTdHJlYW0uY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9yc3MvUlNTRmlsdGVy U3RyZWFtLmNwcApAQCAtNTI1LDkgKzUyNSwxNiBAQCBib29sIFJTU0ZpbHRlclN0cmVhbTo6Y29u dmVydENvbnRlbnRUb0h0bWwoc3RkOjpzdHJpbmcmIHJlc3VsdCkKICAgICBpZiAoIXN1Y2Nlc3Mp CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorICAgIC8vIEZJWE1FOgorICAgIC8vIFRoZSBIVE1M IHN0cmluZyBnZW5lcmF0ZWQgYmVsb3cgcHVycG9ydHMgdG8gYmUgYSBVVEY4LWVuY29kZWQKKyAg ICAvLyBXVEY6OlN0cmluZywgYWx0aG91Z2ggaXRzIGNoYXJhY3RlcnM4KCkgZGF0YSBzaG91bGQg YmUgTGF0aW4xLgorICAgIC8vIFdlIGJ1aWxkIHRoZW4gZXh0cmFjdCB0aGlzIHN0cmluZywgcHJl dGVuZGluZyB0aGF0IHdlIGRvbid0IGtub3cKKyAgICAvLyB0aGF0IHdlIHBhc3MgaW5jb3JyZWN0 bHktZW5jb2RlZCBjaGFyIGRhdGEgYm90aCB3YXlzLgorICAgIC8vIFdlIHNob3VsZCB1c2UgQmxh Y2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyBpbnN0ZWFkIG9mIFdURjo6U3RyaW5nLgogICAgIE93 blB0cjxSU1NHZW5lcmF0b3I+IGdlbmVyYXRvciA9IGFkb3B0UHRyKG5ldyBSU1NHZW5lcmF0b3Io KSk7CiAgICAgU3RyaW5nIGh0bWwgPSBnZW5lcmF0b3ItPmdlbmVyYXRlSHRtbChwYXJzZXItPm1f cm9vdCk7Ci0gICAgcmVzdWx0ID0gaHRtbC51dGY4KFN0cmluZzo6U3RyaWN0Q29udmVyc2lvbiku ZGF0YSgpOworICAgIEFTU0VSVChodG1sLmlzOEJpdCgpKTsKKyAgICByZXN1bHQuYXNzaWduKHJl aW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KGh0bWwuY2hhcmFjdGVyczgoKSksIGh0bWwubGVu Z3RoKCkpOwogCiAgICAgcmV0dXJuIHRydWU7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvcnNzL1JTU0dlbmVyYXRvci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvcnNzL1JTU0dlbmVyYXRvci5j cHAKaW5kZXggZDkzZTA0YzliLi40NmVlNDU0NjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9yc3MvUlNTR2VuZXJhdG9yLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvcnNzL1JTU0dlbmVyYXRv ci5jcHAKQEAgLTgzLDEwICs4MywxMCBAQCBTdHJpbmcgUlNTR2VuZXJhdG9yOjpnZW5lcmF0ZUh0 bWwoUlNTRmVlZCogZmVlZCkKICAgICAgICAgYnVpbGRlci5hcHBlbmQoYXJ0aWNsZU5hbWUpOwog ICAgICAgICBidWlsZGVyLmFwcGVuZExpdGVyYWwoIlwiIGNsYXNzPVwiYXJ0aWNsZVwiPlxuPGEg aHJlZj1cIiIpOwogICAgICAgICBpZiAoIWl0ZW0tPm1fbGluay5pc0VtcHR5KCkpCi0gICAgICAg ICAgICBidWlsZGVyLmFwcGVuZChpdGVtLT5tX2xpbmsudXRmOChTdHJpbmc6OlN0cmljdENvbnZl cnNpb24pLmRhdGEoKSk7CisgICAgICAgICAgICBidWlsZGVyLmFwcGVuZChpdGVtLT5tX2xpbmsp OwogICAgICAgICBidWlsZGVyLmFwcGVuZExpdGVyYWwoIlwiPjxiPiIpOwogICAgICAgICBpZiAo IWl0ZW0tPm1fdGl0bGUuaXNFbXB0eSgpKQotICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoaXRl bS0+bV90aXRsZS51dGY4KFN0cmluZzo6U3RyaWN0Q29udmVyc2lvbikuZGF0YSgpKTsKKyAgICAg ICAgICAgIGJ1aWxkZXIuYXBwZW5kKGl0ZW0tPm1fdGl0bGUpOwogICAgICAgICBlbHNlCiAgICAg ICAgICAgICBidWlsZGVyLmFwcGVuZChzX2RlZmF1bHRFbnRyeVRpdGxlKTsKICAgICAgICAgYnVp bGRlci5hcHBlbmRMaXRlcmFsKCI8L2I+PC9hPlxuPGJyIC8+Iik7CkBAIC05NCwxMyArOTQsMTMg QEAgU3RyaW5nIFJTU0dlbmVyYXRvcjo6Z2VuZXJhdGVIdG1sKFJTU0ZlZWQqIGZlZWQpCiAgICAg ICAgIGlmICghaXRlbS0+bV9hdXRob3IuaXNFbXB0eSgpKSB7CiAgICAgICAgICAgICBidWlsZGVy LmFwcGVuZChpMThuKCJCeSIpKTsKICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kTGl0ZXJhbCgi IDxiPiIpOwotICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoaXRlbS0+bV9hdXRob3IudXRmOChT dHJpbmc6OlN0cmljdENvbnZlcnNpb24pLmRhdGEoKSk7CisgICAgICAgICAgICBidWlsZGVyLmFw cGVuZChpdGVtLT5tX2F1dGhvcik7CiAgICAgICAgICAgICBidWlsZGVyLmFwcGVuZExpdGVyYWwo IjwvYj4gIik7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBpZiAoIWZlZWQtPm1fYXV0 aG9yLmlzRW1wdHkoKSkgewogICAgICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKGkxOG4oIkJ5 IikpOwogICAgICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kTGl0ZXJhbCgiIDxiPiIpOwotICAg ICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKGZlZWQtPm1fYXV0aG9yLnV0ZjgoU3RyaW5nOjpT dHJpY3RDb252ZXJzaW9uKS5kYXRhKCkpOworICAgICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5k KGZlZWQtPm1fYXV0aG9yKTsKICAgICAgICAgICAgICAgICBidWlsZGVyLmFwcGVuZExpdGVyYWwo IjwvYj4gIik7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KQEAgLTExMyw3ICsxMTMsNyBAQCBT dHJpbmcgUlNTR2VuZXJhdG9yOjpnZW5lcmF0ZUh0bWwoUlNTRmVlZCogZmVlZCkKIAogICAgICAg ICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGl0ZW0tPm1fY2F0ZWdvcmllcy5zaXplKCkg OyArK2kpIHsKICAgICAgICAgICAgICAgICBidWlsZGVyLmFwcGVuZExpdGVyYWwoIjxiPiIpOwot ICAgICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKGl0ZW0tPm1fY2F0ZWdvcmllc1tpXS51dGY4 KFN0cmluZzo6U3RyaWN0Q29udmVyc2lvbikuZGF0YSgpKTsKKyAgICAgICAgICAgICAgICBidWls ZGVyLmFwcGVuZChpdGVtLT5tX2NhdGVnb3JpZXNbaV0pOwogICAgICAgICAgICAgICAgIGJ1aWxk ZXIuYXBwZW5kTGl0ZXJhbCgiPC9iPiIpOwogCiAgICAgICAgICAgICAgICAgaWYgKGkgPCBpdGVt LT5tX2NhdGVnb3JpZXMuc2l6ZSgpIC0gMSkKQEAgLTEyMywxMSArMTIzLDExIEBAIFN0cmluZyBS U1NHZW5lcmF0b3I6OmdlbmVyYXRlSHRtbChSU1NGZWVkKiBmZWVkKQogCiAgICAgICAgIGJ1aWxk ZXIuYXBwZW5kTGl0ZXJhbCgiPGJyIC8+Iik7CiAgICAgICAgIGlmICghaXRlbS0+bV9wdWJEYXRl LmlzRW1wdHkoKSkKLSAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKGl0ZW0tPm1fcHViRGF0ZS51 dGY4KFN0cmluZzo6U3RyaWN0Q29udmVyc2lvbikuZGF0YSgpKTsKKyAgICAgICAgICAgIGJ1aWxk ZXIuYXBwZW5kKGl0ZW0tPm1fcHViRGF0ZSk7CiAKICAgICAgICAgYnVpbGRlci5hcHBlbmRMaXRl cmFsKCI8YnIgLz4iKTsKICAgICAgICAgaWYgKCFpdGVtLT5tX2Rlc2NyaXB0aW9uLmlzRW1wdHko KSkKLSAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKGl0ZW0tPm1fZGVzY3JpcHRpb24udXRmOChT dHJpbmc6OlN0cmljdENvbnZlcnNpb24pLmRhdGEoKSk7CisgICAgICAgICAgICBidWlsZGVyLmFw cGVuZChpdGVtLT5tX2Rlc2NyaXB0aW9uKTsKICAgICAgICAgYnVpbGRlci5hcHBlbmRMaXRlcmFs KCI8YnIgLz4iKTsKIAogICAgICAgICBpZiAoaXRlbS0+bV9lbmNsb3N1cmUpIHsK