41025 2010-06-22 17:10:29 -0700 editing/execCommand/copy-without-selection.html fails on Qt after r61637 2010-06-27 07:14:44 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 eric webkit-unassigned commit-queue hausmann kling ossy oldest_to_newest 241549 0 eric 2010-06-22 17:10:29 -0700 editing/execCommand/copy-without-selection.html fails on Qt after r61637 Looks like the test somehow depended on NULL characters being stripped during fragment parsing. Just not sure how it did that since it's clearly setting the string "SUCCESS" and getting out "S\0U\0..." converted to \xFFFD in the parser. The failure appears to be Qt specific. 241553 1 eric 2010-06-22 17:11:49 -0700 --- /home/webkitbuildbot/slaves/release32bit/buildslave/qt-linux-release/build/layout-test-results/editing/execCommand/copy-without-selection-expected.txt 2010-06-22 16:54:03.788189611 -0700 +++ /home/webkitbuildbot/slaves/release32bit/buildslave/qt-linux-release/build/layout-test-results/editing/execCommand/copy-without-selection-actual.txt 2010-06-22 16:54:03.788189611 -0700 @@ -1 +1 @@ -SUCCESS +S�U�C�C�E�S�S� 241554 2 eric 2010-06-22 17:12:12 -0700 � is \xFFFD, the HTML5 replacement character. 241555 3 eric 2010-06-22 17:13:03 -0700 I think the Qt code might be setting a UTF-16 string as UTF-8, and we just didn't notice before. :) 241556 4 eric 2010-06-22 17:14:59 -0700 Ooooooooh , i'm soooo goood! Bad bad Qt: http://trac.webkit.org/browser/trunk/WebCore/platform/qt/ClipboardQt.cpp#L146 241557 5 eric 2010-06-22 17:18:50 -0700 See how the Mac code deals with the arguments as strings: http://trac.webkit.org/browser/trunk/WebCore/platform/mac/ClipboardMac.mm#L238 241559 6 eric 2010-06-22 17:25:35 -0700 Committed r61641: <http://trac.webkit.org/changeset/61641> 241560 7 eric 2010-06-22 17:26:37 -0700 Skipped the test until the ClipboardQt::setData bug can be fixed. 241624 8 59470 kling 2010-06-22 20:43:03 -0700 Created attachment 59470 Proposed patch Use QMimeData::text() and QMimeData::setText() for "text/plain" data to avoid encoding confusion. 242443 9 59638 kling 2010-06-24 04:40:12 -0700 Created attachment 59638 Proposed patch, more ChangeLog 243238 10 59638 commit-queue 2010-06-25 15:59:56 -0700 Comment on attachment 59638 Proposed patch, more ChangeLog Rejecting patch 59638 from commit-queue. Failed to run "[u'/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Simon Hausmann', u'--force']" exit_code: 1 Parsed 4 diffs from patch file(s). patching file LayoutTests/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file LayoutTests/platform/qt/Skipped Hunk #1 FAILED at 5446. 1 out of 1 hunk FAILED -- saving rejects to file LayoutTests/platform/qt/Skipped.rej patching file WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebCore/platform/qt/ClipboardQt.cpp Full output: http://webkit-commit-queue.appspot.com/results/3281789 243355 11 59828 kling 2010-06-26 02:42:32 -0700 Created attachment 59828 Proposed patch, updated to apply 243460 12 59828 commit-queue 2010-06-27 07:14:39 -0700 Comment on attachment 59828 Proposed patch, updated to apply Clearing flags on attachment: 59828 Committed r61968: <http://trac.webkit.org/changeset/61968> 243461 13 commit-queue 2010-06-27 07:14:44 -0700 All reviewed patches have been landed. Closing bug. 59470 2010-06-22 20:43:03 -0700 2010-06-24 04:40:12 -0700 Proposed patch bug-41025.diff text/plain 3927 kling ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4MGYxMDg2Li5mYmRjZThjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDYt MjIgIEFuZHJlYXMgS2xpbmcgIDxhbmRyZWFzLmtsaW5nQG5va2lhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBlZGl0aW5nL2V4ZWNDb21tYW5k L2NvcHktd2l0aG91dC1zZWxlY3Rpb24uaHRtbCBmYWlscyBvbiBRdCBhZnRlciByNjE2MzcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMDI1CisKKyAg ICAgICAgVXNlIFFNaW1lRGF0YSdzIHRleHQoKSBpbnRlcmZhY2UgKFFTdHJpbmcpIGZvciB0ZXh0 L3BsYWluIGRhdGEuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9Ta2lwcGVkOiBVbnNraXAgZWRp dGluZy9leGVjQ29tbWFuZC9jb3B5LXdpdGhvdXQtc2VsZWN0aW9uLmh0bWwKKwogMjAxMC0wNi0y MiAgQWRlbGUgUGV0ZXJzb24gIDxhZGVsZUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lw cGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAppbmRleCBhZDY2MjRlLi5mNjEx MWZkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCisrKyBiL0xh eW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKQEAgLTU0MzksNyArNTQzOSwzIEBAIGZhc3Qv anMvc3B1dG5pay9Db25mb3JtYW5jZS8xMF9FeGVjdXRpb25fQ29udGV4dHMvMTAuMl9FbnRlcmlu Z19Bbl9FeGVjdXRpb25fQ29uCiBmYXN0L2pzL3NwdXRuaWsvQ29uZm9ybWFuY2UvMTBfRXhlY3V0 aW9uX0NvbnRleHRzLzEwLjJfRW50ZXJpbmdfQW5fRXhlY3V0aW9uX0NvbnRleHQvMTAuMi4yX0V2 YWxfQ29kZS9TMTAuMi4yX0ExLjJfVDcuaHRtbAogZmFzdC9qcy9zcHV0bmlrL0NvbmZvcm1hbmNl LzEwX0V4ZWN1dGlvbl9Db250ZXh0cy8xMC4yX0VudGVyaW5nX0FuX0V4ZWN1dGlvbl9Db250ZXh0 LzEwLjIuMl9FdmFsX0NvZGUvUzEwLjIuMl9BMS4xX1Q5Lmh0bWwKIGZhc3QvanMvc3B1dG5pay9D b25mb3JtYW5jZS8xMF9FeGVjdXRpb25fQ29udGV4dHMvMTAuMl9FbnRlcmluZ19Bbl9FeGVjdXRp b25fQ29udGV4dC8xMC4yLjJfRXZhbF9Db2RlL1MxMC4yLjJfQTEuMl9UOS5odG1sCi0KLSMgQ2xp cGJvYXJkOjpzZXREYXRhIGlzIGJyb2tlbiBvbiBRdAotIyBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDEwMjUKLWVkaXRpbmcvZXhlY0NvbW1hbmQvY29weS13aXRob3V0 LXNlbGVjdGlvbi5odG1sCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUv Q2hhbmdlTG9nCmluZGV4IGVjMjBlZDAuLjBlMWQwOWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hh bmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDYt MjIgIEFuZHJlYXMgS2xpbmcgIDxhbmRyZWFzLmtsaW5nQG5va2lhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBlZGl0aW5nL2V4ZWNDb21tYW5k L2NvcHktd2l0aG91dC1zZWxlY3Rpb24uaHRtbCBmYWlscyBvbiBRdCBhZnRlciByNjE2MzcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMDI1CisKKyAg ICAgICAgVXNlIFFNaW1lRGF0YSdzIHRleHQoKSBpbnRlcmZhY2UgKFFTdHJpbmcpIGZvciB0ZXh0 L3BsYWluIGRhdGEuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9DbGlwYm9hcmRRdC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjppc1RleHRNaW1lVHlwZSk6CisgICAgICAgIChXZWJDb3JlOjpDbGlw Ym9hcmRRdDo6Z2V0RGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpDbGlwYm9hcmRRdDo6c2V0RGF0 YSk6CisKIDIwMTAtMDYtMjIgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFVucmV2aWV3ZWQsIGJ1aWxkIGZpeCBmb3IgcjYxNjQ4LgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9wbGF0Zm9ybS9xdC9DbGlwYm9hcmRRdC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL3F0L0Ns aXBib2FyZFF0LmNwcAppbmRleCA0ODVkMGQxLi5mNDc4ZTY0IDEwMDY0NAotLS0gYS9XZWJDb3Jl L3BsYXRmb3JtL3F0L0NsaXBib2FyZFF0LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL3F0L0Ns aXBib2FyZFF0LmNwcApAQCAtNTcsNiArNTcsMTEgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewog CitzdGF0aWMgYm9vbCBpc1RleHRNaW1lVHlwZShjb25zdCBTdHJpbmcmIHR5cGUpCit7CisgICAg cmV0dXJuIHR5cGUgPT0gInRleHQvcGxhaW4iIHx8IHR5cGUuc3RhcnRzV2l0aCgidGV4dC9wbGFp bjsiKTsKK30KKwogQ2xpcGJvYXJkUXQ6OkNsaXBib2FyZFF0KENsaXBib2FyZEFjY2Vzc1BvbGlj eSBwb2xpY3ksIGNvbnN0IFFNaW1lRGF0YSogcmVhZGFibGVDbGlwYm9hcmQpCiAgICAgOiBDbGlw Ym9hcmQocG9saWN5LCB0cnVlKQogICAgICwgbV9yZWFkYWJsZURhdGEocmVhZGFibGVDbGlwYm9h cmQpCkBAIC0xMzAsMTAgKzEzNSwxNSBAQCBTdHJpbmcgQ2xpcGJvYXJkUXQ6OmdldERhdGEoY29u c3QgU3RyaW5nJiB0eXBlLCBib29sJiBzdWNjZXNzKSBjb25zdAogICAgICAgICByZXR1cm4gU3Ry aW5nKCk7CiAgICAgfQogCisgICAgaWYgKGlzVGV4dE1pbWVUeXBlKHR5cGUpICYmIG1fcmVhZGFi bGVEYXRhLT5oYXNUZXh0KCkpIHsKKyAgICAgICAgc3VjY2VzcyA9IHRydWU7CisgICAgICAgIHJl dHVybiBtX3JlYWRhYmxlRGF0YS0+dGV4dCgpOworICAgIH0KKwogICAgIEFTU0VSVChtX3JlYWRh YmxlRGF0YSk7CiAgICAgUUJ5dGVBcnJheSBkYXRhID0gbV9yZWFkYWJsZURhdGEtPmRhdGEoUVN0 cmluZyh0eXBlKSk7CiAgICAgc3VjY2VzcyA9ICFkYXRhLmlzRW1wdHkoKTsKLSAgICByZXR1cm4g U3RyaW5nKGRhdGEuZGF0YSgpLCBkYXRhLnNpemUoKSk7CisgICAgcmV0dXJuIFN0cmluZyhkYXRh LmNvbnN0RGF0YSgpLCBkYXRhLnNpemUoKSk7CiB9CiAKIGJvb2wgQ2xpcGJvYXJkUXQ6OnNldERh dGEoY29uc3QgU3RyaW5nJiB0eXBlLCBjb25zdCBTdHJpbmcmIGRhdGEpCkBAIC0xNDMsOSArMTUz LDE0IEBAIGJvb2wgQ2xpcGJvYXJkUXQ6OnNldERhdGEoY29uc3QgU3RyaW5nJiB0eXBlLCBjb25z dCBTdHJpbmcmIGRhdGEpCiAKICAgICBpZiAoIW1fd3JpdGFibGVEYXRhKQogICAgICAgICBtX3dy aXRhYmxlRGF0YSA9IG5ldyBRTWltZURhdGE7Ci0gICAgUUJ5dGVBcnJheSBhcnJheShyZWludGVy cHJldF9jYXN0PGNvbnN0IGNoYXIqPihkYXRhLmNoYXJhY3RlcnMoKSksCi0gICAgICAgICAgICAg ICAgICAgICBkYXRhLmxlbmd0aCgpKjIpOwotICAgIG1fd3JpdGFibGVEYXRhLT5zZXREYXRhKFFT dHJpbmcodHlwZSksIGFycmF5KTsKKworICAgIGlmIChpc1RleHRNaW1lVHlwZSh0eXBlKSkKKyAg ICAgICAgbV93cml0YWJsZURhdGEtPnNldFRleHQoUVN0cmluZyhkYXRhKSk7CisgICAgZWxzZSB7 CisgICAgICAgIFFCeXRlQXJyYXkgYXJyYXkocmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4o ZGF0YS5jaGFyYWN0ZXJzKCkpLCBkYXRhLmxlbmd0aCgpICogMik7CisgICAgICAgIG1fd3JpdGFi bGVEYXRhLT5zZXREYXRhKFFTdHJpbmcodHlwZSksIGFycmF5KTsKKyAgICB9CisKICNpZm5kZWYg UVRfTk9fQ0xJUEJPQVJECiAgICAgaWYgKCFpc0ZvckRyYWdnaW5nKCkpCiAgICAgICAgIFFBcHBs aWNhdGlvbjo6Y2xpcGJvYXJkKCktPnNldE1pbWVEYXRhKG1fd3JpdGFibGVEYXRhKTsK 59638 2010-06-24 04:40:12 -0700 2010-06-26 02:42:32 -0700 Proposed patch, more ChangeLog bug-41025-v2.diff text/plain 4333 kling ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2OGVkMzlmLi4yMzNjYmUyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTAtMDYt MjQgIEFuZHJlYXMgS2xpbmcgIDxhbmRyZWFzLmtsaW5nQG5va2lhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBlZGl0aW5nL2V4ZWNDb21tYW5k L2NvcHktd2l0aG91dC1zZWxlY3Rpb24uaHRtbCBmYWlscyBvbiBRdCBhZnRlciByNjE2MzcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMDI1CisKKyAg ICAgICAgKiBwbGF0Zm9ybS9xdC9Ta2lwcGVkOiBVbnNraXAgZWRpdGluZy9leGVjQ29tbWFuZC9j b3B5LXdpdGhvdXQtc2VsZWN0aW9uLmh0bWwKKwogMjAxMC0wNi0yNCAgS2VudCBUYW11cmEgIDx0 a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQgYi9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9xdC9Ta2lwcGVkCmluZGV4IGU0NTQwZDMuLmU2ZTczN2YgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v cXQvU2tpcHBlZApAQCAtNTQ0Niw3ICs1NDQ2LDMgQEAgZmFzdC9qcy9zcHV0bmlrL0NvbmZvcm1h bmNlLzEwX0V4ZWN1dGlvbl9Db250ZXh0cy8xMC4yX0VudGVyaW5nX0FuX0V4ZWN1dGlvbl9Db24K IGZhc3QvanMvc3B1dG5pay9Db25mb3JtYW5jZS8xMF9FeGVjdXRpb25fQ29udGV4dHMvMTAuMl9F bnRlcmluZ19Bbl9FeGVjdXRpb25fQ29udGV4dC8xMC4yLjJfRXZhbF9Db2RlL1MxMC4yLjJfQTEu Ml9UNy5odG1sCiBmYXN0L2pzL3NwdXRuaWsvQ29uZm9ybWFuY2UvMTBfRXhlY3V0aW9uX0NvbnRl eHRzLzEwLjJfRW50ZXJpbmdfQW5fRXhlY3V0aW9uX0NvbnRleHQvMTAuMi4yX0V2YWxfQ29kZS9T MTAuMi4yX0ExLjFfVDkuaHRtbAogZmFzdC9qcy9zcHV0bmlrL0NvbmZvcm1hbmNlLzEwX0V4ZWN1 dGlvbl9Db250ZXh0cy8xMC4yX0VudGVyaW5nX0FuX0V4ZWN1dGlvbl9Db250ZXh0LzEwLjIuMl9F dmFsX0NvZGUvUzEwLjIuMl9BMS4yX1Q5Lmh0bWwKLQotIyBDbGlwYm9hcmQ6OnNldERhdGEgaXMg YnJva2VuIG9uIFF0Ci0jIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00 MTAyNQotZWRpdGluZy9leGVjQ29tbWFuZC9jb3B5LXdpdGhvdXQtc2VsZWN0aW9uLmh0bWwKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTA3 M2Y3OS4uMTFhM2Y3OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29y ZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMC0wNi0yNCAgQW5kcmVhcyBLbGluZyAg PGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIGVkaXRpbmcvZXhlY0NvbW1hbmQvY29weS13aXRob3V0LXNlbGVj dGlvbi5odG1sIGZhaWxzIG9uIFF0IGFmdGVyIHI2MTYzNworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDEwMjUKKworICAgICAgICBUaGUgcHJvYmxlbSB3 YXMgdGhhdCB3aGVuIGdldHRpbmcgZGF0YSBiYWNrIHZpYSBDbGlwYm9hcmQ6OmdldERhdGEoKSwK KyAgICAgICAgdGhlIFN0cmluZzo6U3RyaW5nKGNvbnN0IGNoYXIqLCBpbnQpIGNvbnN0cnVjdG9y IHdhcyBjYWxsZWQKKyAgICAgICAgd2l0aCBVVEYtMTYgZGF0YS4KKworICAgICAgICBUaGUgc29s dXRpb24gaXMgdG8gdXNlIFFNaW1lRGF0YSdzIHRleHQoKSBhbmQgc2V0VGV4dCgpIGZvciAidGV4 dC9wbGFpbiIuCisKKyAgICAgICAgc2V0VGV4dCgpIHdoaWNoIG1ha2VzIHN1cmUgUXQgcGFzc2Vz IHRoZSBzdHJpbmcgaW4gcHJvcGVyIGZvcm1hdCB0byB0aGUKKyAgICAgICAgc3lzdGVtIGNsaXBi b2FyZC4gKFRoZSBwcmV2aW91cyBpbXBsZW1lbnRhdGlvbiB3b3VsZCBjb252ZXJ0IGl0IHRvIFVU Ri04KQorCisgICAgICAgIHRleHQoKSBtYWtlcyBzdXJlIHRoYXQgdGhlIGNvcnJlY3QgZW5jb2Rp bmcgaXMgdXNlZCAoVVRGLTE2KSBhbmQgdGhhdAorICAgICAgICB3ZSBnZXQgYmFjayB3aGF0ZXZl ciB3ZSBvcmlnaW5hbGx5IHB1dCBpbiB0aGVyZS4KKworICAgICAgICAqIHBsYXRmb3JtL3F0L0Ns aXBib2FyZFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmlzVGV4dE1pbWVUeXBlKToKKyAgICAg ICAgKFdlYkNvcmU6OkNsaXBib2FyZFF0OjpnZXREYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OkNs aXBib2FyZFF0OjpzZXREYXRhKToKKwogMjAxMC0wNi0yNCAgS2VudCBUYW11cmEgIDx0a2VudEBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdp dCBhL1dlYkNvcmUvcGxhdGZvcm0vcXQvQ2xpcGJvYXJkUXQuY3BwIGIvV2ViQ29yZS9wbGF0Zm9y bS9xdC9DbGlwYm9hcmRRdC5jcHAKaW5kZXggNDg1ZDBkMS4uZjQ3OGU2NCAxMDA2NDQKLS0tIGEv V2ViQ29yZS9wbGF0Zm9ybS9xdC9DbGlwYm9hcmRRdC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9y bS9xdC9DbGlwYm9hcmRRdC5jcHAKQEAgLTU3LDYgKzU3LDExIEBACiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAorc3RhdGljIGJvb2wgaXNUZXh0TWltZVR5cGUoY29uc3QgU3RyaW5nJiB0eXBlKQor eworICAgIHJldHVybiB0eXBlID09ICJ0ZXh0L3BsYWluIiB8fCB0eXBlLnN0YXJ0c1dpdGgoInRl eHQvcGxhaW47Iik7Cit9CisKIENsaXBib2FyZFF0OjpDbGlwYm9hcmRRdChDbGlwYm9hcmRBY2Nl c3NQb2xpY3kgcG9saWN5LCBjb25zdCBRTWltZURhdGEqIHJlYWRhYmxlQ2xpcGJvYXJkKQogICAg IDogQ2xpcGJvYXJkKHBvbGljeSwgdHJ1ZSkKICAgICAsIG1fcmVhZGFibGVEYXRhKHJlYWRhYmxl Q2xpcGJvYXJkKQpAQCAtMTMwLDEwICsxMzUsMTUgQEAgU3RyaW5nIENsaXBib2FyZFF0OjpnZXRE YXRhKGNvbnN0IFN0cmluZyYgdHlwZSwgYm9vbCYgc3VjY2VzcykgY29uc3QKICAgICAgICAgcmV0 dXJuIFN0cmluZygpOwogICAgIH0KIAorICAgIGlmIChpc1RleHRNaW1lVHlwZSh0eXBlKSAmJiBt X3JlYWRhYmxlRGF0YS0+aGFzVGV4dCgpKSB7CisgICAgICAgIHN1Y2Nlc3MgPSB0cnVlOworICAg ICAgICByZXR1cm4gbV9yZWFkYWJsZURhdGEtPnRleHQoKTsKKyAgICB9CisKICAgICBBU1NFUlQo bV9yZWFkYWJsZURhdGEpOwogICAgIFFCeXRlQXJyYXkgZGF0YSA9IG1fcmVhZGFibGVEYXRhLT5k YXRhKFFTdHJpbmcodHlwZSkpOwogICAgIHN1Y2Nlc3MgPSAhZGF0YS5pc0VtcHR5KCk7Ci0gICAg cmV0dXJuIFN0cmluZyhkYXRhLmRhdGEoKSwgZGF0YS5zaXplKCkpOworICAgIHJldHVybiBTdHJp bmcoZGF0YS5jb25zdERhdGEoKSwgZGF0YS5zaXplKCkpOwogfQogCiBib29sIENsaXBib2FyZFF0 OjpzZXREYXRhKGNvbnN0IFN0cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiBkYXRhKQpAQCAtMTQz LDkgKzE1MywxNCBAQCBib29sIENsaXBib2FyZFF0OjpzZXREYXRhKGNvbnN0IFN0cmluZyYgdHlw ZSwgY29uc3QgU3RyaW5nJiBkYXRhKQogCiAgICAgaWYgKCFtX3dyaXRhYmxlRGF0YSkKICAgICAg ICAgbV93cml0YWJsZURhdGEgPSBuZXcgUU1pbWVEYXRhOwotICAgIFFCeXRlQXJyYXkgYXJyYXko cmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4oZGF0YS5jaGFyYWN0ZXJzKCkpLAotICAgICAg ICAgICAgICAgICAgICAgZGF0YS5sZW5ndGgoKSoyKTsKLSAgICBtX3dyaXRhYmxlRGF0YS0+c2V0 RGF0YShRU3RyaW5nKHR5cGUpLCBhcnJheSk7CisKKyAgICBpZiAoaXNUZXh0TWltZVR5cGUodHlw ZSkpCisgICAgICAgIG1fd3JpdGFibGVEYXRhLT5zZXRUZXh0KFFTdHJpbmcoZGF0YSkpOworICAg IGVsc2UgeworICAgICAgICBRQnl0ZUFycmF5IGFycmF5KHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3Qg Y2hhcio+KGRhdGEuY2hhcmFjdGVycygpKSwgZGF0YS5sZW5ndGgoKSAqIDIpOworICAgICAgICBt X3dyaXRhYmxlRGF0YS0+c2V0RGF0YShRU3RyaW5nKHR5cGUpLCBhcnJheSk7CisgICAgfQorCiAj aWZuZGVmIFFUX05PX0NMSVBCT0FSRAogICAgIGlmICghaXNGb3JEcmFnZ2luZygpKQogICAgICAg ICBRQXBwbGljYXRpb246OmNsaXBib2FyZCgpLT5zZXRNaW1lRGF0YShtX3dyaXRhYmxlRGF0YSk7 Cg== 59828 2010-06-26 02:42:32 -0700 2010-06-27 07:14:38 -0700 Proposed patch, updated to apply bug-41025-v3.diff text/plain 4428 kling ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlODE1YjRhLi41ZTAyYzk5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDYt MjYgIEFuZHJlYXMgS2xpbmcgIDxhbmRyZWFzLmtsaW5nQG5va2lhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBlZGl0aW5nL2V4ZWNDb21tYW5k L2NvcHktd2l0aG91dC1zZWxlY3Rpb24uaHRtbCBmYWlscyBvbiBRdCBhZnRlciByNjE2MzcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMDI1CisKKyAg ICAgICAgVW5za2lwIGVkaXRpbmcvZXhlY0NvbW1hbmQvY29weS13aXRob3V0LXNlbGVjdGlvbi5o dG1sIGZvciBRdC4KKworICAgICAgICAqIHBsYXRmb3JtL3F0L1NraXBwZWQ6CisKIDIwMTAtMDYt MjUgIFpoZW55YW8gTW8gIDx6bW9AZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBE aW1pdHJpIEdsYXprb3YuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lw cGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAppbmRleCA4NzQ5Njc1Li40YTE5 OTBhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCisrKyBiL0xh eW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKQEAgLTU0NDMsMTAgKzU0NDMsNiBAQCBmYXN0 L2pzL3NwdXRuaWsvQ29uZm9ybWFuY2UvMTBfRXhlY3V0aW9uX0NvbnRleHRzLzEwLjJfRW50ZXJp bmdfQW5fRXhlY3V0aW9uX0NvbgogZmFzdC9qcy9zcHV0bmlrL0NvbmZvcm1hbmNlLzEwX0V4ZWN1 dGlvbl9Db250ZXh0cy8xMC4yX0VudGVyaW5nX0FuX0V4ZWN1dGlvbl9Db250ZXh0LzEwLjIuMl9F dmFsX0NvZGUvUzEwLjIuMl9BMS4xX1Q5Lmh0bWwKIGZhc3QvanMvc3B1dG5pay9Db25mb3JtYW5j ZS8xMF9FeGVjdXRpb25fQ29udGV4dHMvMTAuMl9FbnRlcmluZ19Bbl9FeGVjdXRpb25fQ29udGV4 dC8xMC4yLjJfRXZhbF9Db2RlL1MxMC4yLjJfQTEuMl9UOS5odG1sCiAKLSMgQ2xpcGJvYXJkOjpz ZXREYXRhIGlzIGJyb2tlbiBvbiBRdAotIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDEwMjUKLWVkaXRpbmcvZXhlY0NvbW1hbmQvY29weS13aXRob3V0LXNlbGVjdGlv bi5odG1sCi0KICMgW1F0XSBSZWdyZXNzaW9uKHI2MTc0OSk6IGluc3BlY3Rvci9kZWJ1Z2dlci1w YXVzZS1vbi1kZWJ1Z2dlci1zdGF0ZW1lbnQuaHRtbCBmYWlscwogIyBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDExNDcKIGluc3BlY3Rvci9kZWJ1Z2dlci1wYXVzZS1v bi1kZWJ1Z2dlci1zdGF0ZW1lbnQuaHRtbApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjZDUzM2IxLi41ZDliMjhlIDEwMDY0NAotLS0gYS9X ZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBA CisyMDEwLTA2LTI2ICBBbmRyZWFzIEtsaW5nICA8YW5kcmVhcy5rbGluZ0Bub2tpYS5jb20+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgZWRpdGluZy9l eGVjQ29tbWFuZC9jb3B5LXdpdGhvdXQtc2VsZWN0aW9uLmh0bWwgZmFpbHMgb24gUXQgYWZ0ZXIg cjYxNjM3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00 MTAyNQorCisgICAgICAgIFRoZSBwcm9ibGVtIHdhcyB0aGF0IHdoZW4gZ2V0dGluZyBkYXRhIGJh Y2sgdmlhIENsaXBib2FyZDo6Z2V0RGF0YSgpLAorICAgICAgICB0aGUgU3RyaW5nOjpTdHJpbmco Y29uc3QgY2hhciosIGludCkgY29uc3RydWN0b3Igd2FzIGNhbGxlZAorICAgICAgICB3aXRoIFVU Ri0xNiBkYXRhLgorCisgICAgICAgIFRoZSBzb2x1dGlvbiBpcyB0byB1c2UgUU1pbWVEYXRhJ3Mg dGV4dCgpIGFuZCBzZXRUZXh0KCkgZm9yICJ0ZXh0L3BsYWluIi4KKworICAgICAgICBzZXRUZXh0 KCkgd2hpY2ggbWFrZXMgc3VyZSBRdCBwYXNzZXMgdGhlIHN0cmluZyBpbiBwcm9wZXIgZm9ybWF0 IHRvIHRoZQorICAgICAgICBzeXN0ZW0gY2xpcGJvYXJkLiAoVGhlIHByZXZpb3VzIGltcGxlbWVu dGF0aW9uIHdvdWxkIGNvbnZlcnQgaXQgdG8gVVRGLTgpCisKKyAgICAgICAgdGV4dCgpIG1ha2Vz IHN1cmUgdGhhdCB0aGUgY29ycmVjdCBlbmNvZGluZyBpcyB1c2VkIChVVEYtMTYpIGFuZCB0aGF0 CisgICAgICAgIHdlIGdldCBiYWNrIHdoYXRldmVyIHdlIG9yaWdpbmFsbHkgcHV0IGluIHRoZXJl LgorCisgICAgICAgICogcGxhdGZvcm0vcXQvQ2xpcGJvYXJkUXQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6aXNUZXh0TWltZVR5cGUpOgorICAgICAgICAoV2ViQ29yZTo6Q2xpcGJvYXJkUXQ6Omdl dERhdGEpOgorICAgICAgICAoV2ViQ29yZTo6Q2xpcGJvYXJkUXQ6OnNldERhdGEpOgorCiAyMDEw LTA2LTI2ICBUb255IEdlbnRpbGNvcmUgIDx0b255Z0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9y bS9xdC9DbGlwYm9hcmRRdC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL3F0L0NsaXBib2FyZFF0LmNw cAppbmRleCA0ODVkMGQxLi5mNDc4ZTY0IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL3F0 L0NsaXBib2FyZFF0LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL3F0L0NsaXBib2FyZFF0LmNw cApAQCAtNTcsNiArNTcsMTEgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitzdGF0aWMgYm9v bCBpc1RleHRNaW1lVHlwZShjb25zdCBTdHJpbmcmIHR5cGUpCit7CisgICAgcmV0dXJuIHR5cGUg PT0gInRleHQvcGxhaW4iIHx8IHR5cGUuc3RhcnRzV2l0aCgidGV4dC9wbGFpbjsiKTsKK30KKwog Q2xpcGJvYXJkUXQ6OkNsaXBib2FyZFF0KENsaXBib2FyZEFjY2Vzc1BvbGljeSBwb2xpY3ksIGNv bnN0IFFNaW1lRGF0YSogcmVhZGFibGVDbGlwYm9hcmQpCiAgICAgOiBDbGlwYm9hcmQocG9saWN5 LCB0cnVlKQogICAgICwgbV9yZWFkYWJsZURhdGEocmVhZGFibGVDbGlwYm9hcmQpCkBAIC0xMzAs MTAgKzEzNSwxNSBAQCBTdHJpbmcgQ2xpcGJvYXJkUXQ6OmdldERhdGEoY29uc3QgU3RyaW5nJiB0 eXBlLCBib29sJiBzdWNjZXNzKSBjb25zdAogICAgICAgICByZXR1cm4gU3RyaW5nKCk7CiAgICAg fQogCisgICAgaWYgKGlzVGV4dE1pbWVUeXBlKHR5cGUpICYmIG1fcmVhZGFibGVEYXRhLT5oYXNU ZXh0KCkpIHsKKyAgICAgICAgc3VjY2VzcyA9IHRydWU7CisgICAgICAgIHJldHVybiBtX3JlYWRh YmxlRGF0YS0+dGV4dCgpOworICAgIH0KKwogICAgIEFTU0VSVChtX3JlYWRhYmxlRGF0YSk7CiAg ICAgUUJ5dGVBcnJheSBkYXRhID0gbV9yZWFkYWJsZURhdGEtPmRhdGEoUVN0cmluZyh0eXBlKSk7 CiAgICAgc3VjY2VzcyA9ICFkYXRhLmlzRW1wdHkoKTsKLSAgICByZXR1cm4gU3RyaW5nKGRhdGEu ZGF0YSgpLCBkYXRhLnNpemUoKSk7CisgICAgcmV0dXJuIFN0cmluZyhkYXRhLmNvbnN0RGF0YSgp LCBkYXRhLnNpemUoKSk7CiB9CiAKIGJvb2wgQ2xpcGJvYXJkUXQ6OnNldERhdGEoY29uc3QgU3Ry aW5nJiB0eXBlLCBjb25zdCBTdHJpbmcmIGRhdGEpCkBAIC0xNDMsOSArMTUzLDE0IEBAIGJvb2wg Q2xpcGJvYXJkUXQ6OnNldERhdGEoY29uc3QgU3RyaW5nJiB0eXBlLCBjb25zdCBTdHJpbmcmIGRh dGEpCiAKICAgICBpZiAoIW1fd3JpdGFibGVEYXRhKQogICAgICAgICBtX3dyaXRhYmxlRGF0YSA9 IG5ldyBRTWltZURhdGE7Ci0gICAgUUJ5dGVBcnJheSBhcnJheShyZWludGVycHJldF9jYXN0PGNv bnN0IGNoYXIqPihkYXRhLmNoYXJhY3RlcnMoKSksCi0gICAgICAgICAgICAgICAgICAgICBkYXRh Lmxlbmd0aCgpKjIpOwotICAgIG1fd3JpdGFibGVEYXRhLT5zZXREYXRhKFFTdHJpbmcodHlwZSks IGFycmF5KTsKKworICAgIGlmIChpc1RleHRNaW1lVHlwZSh0eXBlKSkKKyAgICAgICAgbV93cml0 YWJsZURhdGEtPnNldFRleHQoUVN0cmluZyhkYXRhKSk7CisgICAgZWxzZSB7CisgICAgICAgIFFC eXRlQXJyYXkgYXJyYXkocmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4oZGF0YS5jaGFyYWN0 ZXJzKCkpLCBkYXRhLmxlbmd0aCgpICogMik7CisgICAgICAgIG1fd3JpdGFibGVEYXRhLT5zZXRE YXRhKFFTdHJpbmcodHlwZSksIGFycmF5KTsKKyAgICB9CisKICNpZm5kZWYgUVRfTk9fQ0xJUEJP QVJECiAgICAgaWYgKCFpc0ZvckRyYWdnaW5nKCkpCiAgICAgICAgIFFBcHBsaWNhdGlvbjo6Y2xp cGJvYXJkKCktPnNldE1pbWVEYXRhKG1fd3JpdGFibGVEYXRhKTsK