47393 2010-10-07 19:11:20 -0700 More StringImpl / String 64-bit cleanliness issues 2010-10-08 12:38:28 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 cevans cevans barraclough commit-queue levin oldest_to_newest 291396 0 cevans 2010-10-07 19:11:20 -0700 I saw a few more issues whilst fixing some unrelated things. I think it's best I describe the bugs with a patch to be honest. Most of the issues are size_t vs. unsigned confusion on 64-bit, but also a couple of cases where it looks prudent to check for integer overflows. Patch forthcoming. 291400 1 70188 cevans 2010-10-07 19:20:53 -0700 Created attachment 70188 Patch 291809 2 70188 commit-queue 2010-10-08 12:38:23 -0700 Comment on attachment 70188 Patch Clearing flags on attachment: 70188 Committed r69414: <http://trac.webkit.org/changeset/69414> 291810 3 commit-queue 2010-10-08 12:38:28 -0700 All reviewed patches have been landed. Closing bug. 70188 2010-10-07 19:20:53 -0700 2010-10-08 12:38:23 -0700 Patch 47393_1.diff text/plain 3869 cevans SW5kZXg6IEphdmFTY3JpcHRDb3JlL3d0Zi90ZXh0L1dURlN0cmluZy5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gSmF2YVNjcmlwdENvcmUvd3RmL3RleHQvV1RGU3RyaW5nLmNwcAkocmV2aXNpb24gNjkxODAp CisrKyBKYXZhU2NyaXB0Q29yZS93dGYvdGV4dC9XVEZTdHJpbmcuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC00OCw5ICs0OCwxMiBAQAogICAgIGlmICghc3RyKQogICAgICAgICByZXR1cm47CiAgICAg ICAgIAotICAgIGludCBsZW4gPSAwOworICAgIHNpemVfdCBsZW4gPSAwOwogICAgIHdoaWxlIChz dHJbbGVuXSAhPSBVQ2hhcigwKSkKICAgICAgICAgbGVuKys7CisKKyAgICBpZiAobGVuID4gc3Rk OjpudW1lcmljX2xpbWl0czx1bnNpZ25lZD46Om1heCgpKQorICAgICAgICBDUkFTSCgpOwogICAg IAogICAgIG1faW1wbCA9IFN0cmluZ0ltcGw6OmNyZWF0ZShzdHIsIGxlbik7CiB9CkBAIC0xNzUs NiArMTc4LDggQEAKIAogICAgIEFTU0VSVChjaGFyYWN0ZXJzVG9BcHBlbmQpOwogICAgIFVDaGFy KiBkYXRhOworICAgIGlmIChsZW5ndGhUb0FwcGVuZCA+IHN0ZDo6bnVtZXJpY19saW1pdHM8dW5z aWduZWQ+OjptYXgoKSAtIGxlbmd0aCgpKQorICAgICAgICBDUkFTSCgpOwogICAgIFJlZlB0cjxT dHJpbmdJbXBsPiBuZXdJbXBsID0KICAgICAgICAgU3RyaW5nSW1wbDo6Y3JlYXRlVW5pbml0aWFs aXplZChsZW5ndGgoKSArIGxlbmd0aFRvQXBwZW5kLCBkYXRhKTsKICAgICBtZW1jcHkoZGF0YSwg Y2hhcmFjdGVycygpLCBsZW5ndGgoKSAqIHNpemVvZihVQ2hhcikpOwpAQCAtMTk2LDYgKzIwMSw4 IEBACiAKICAgICBBU1NFUlQoY2hhcmFjdGVyc1RvSW5zZXJ0KTsKICAgICBVQ2hhciogZGF0YTsK KyAgICBpZiAobGVuZ3RoVG9JbnNlcnQgPiBzdGQ6Om51bWVyaWNfbGltaXRzPHVuc2lnbmVkPjo6 bWF4KCkgLSBsZW5ndGgoKSkKKyAgICAgICAgQ1JBU0goKTsKICAgICBSZWZQdHI8U3RyaW5nSW1w bD4gbmV3SW1wbCA9CiAgICAgICBTdHJpbmdJbXBsOjpjcmVhdGVVbmluaXRpYWxpemVkKGxlbmd0 aCgpICsgbGVuZ3RoVG9JbnNlcnQsIGRhdGEpOwogICAgIG1lbWNweShkYXRhLCBjaGFyYWN0ZXJz KCksIHBvc2l0aW9uICogc2l6ZW9mKFVDaGFyKSk7CkBAIC03MTgsNiArNzI1LDkgQEAKIAogU3Ry aW5nIFN0cmluZzo6ZnJvbVVURjgoY29uc3QgY2hhciogc3RyaW5nU3RhcnQsIHNpemVfdCBsZW5n dGgpCiB7CisgICAgaWYgKGxlbmd0aCA+IHN0ZDo6bnVtZXJpY19saW1pdHM8dW5zaWduZWQ+Ojpt YXgoKSkKKyAgICAgICAgQ1JBU0goKTsKKwogICAgIGlmICghc3RyaW5nU3RhcnQpCiAgICAgICAg IHJldHVybiBTdHJpbmcoKTsKIApJbmRleDogSmF2YVNjcmlwdENvcmUvd3RmL3RleHQvU3RyaW5n SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUvd3RmL3RleHQvU3RyaW5nSW1w bC5jcHAJKHJldmlzaW9uIDY5MTgwKQorKysgSmF2YVNjcmlwdENvcmUvd3RmL3RleHQvU3RyaW5n SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgxLDcgKzgxLDcgQEAKICAgICAvLyBBbGxvY2F0 ZSBhIHNpbmdsZSBidWZmZXIgbGFyZ2UgZW5vdWdoIHRvIGNvbnRhaW4gdGhlIFN0cmluZ0ltcGwK ICAgICAvLyBzdHJ1Y3QgYXMgd2VsbCBhcyB0aGUgZGF0YSB3aGljaCBpdCBjb250YWlucy4gVGhp cyByZW1vdmVzIG9uZSAKICAgICAvLyBoZWFwIGFsbG9jYXRpb24gZnJvbSB0aGlzIGNhbGwuCi0g ICAgaWYgKGxlbmd0aCA+ICgoc3RkOjpudW1lcmljX2xpbWl0czxzaXplX3Q+OjptYXgoKSAtIHNp emVvZihTdHJpbmdJbXBsKSkgLyBzaXplb2YoVUNoYXIpKSkKKyAgICBpZiAobGVuZ3RoID4gKChz dGQ6Om51bWVyaWNfbGltaXRzPHVuc2lnbmVkPjo6bWF4KCkgLSBzaXplb2YoU3RyaW5nSW1wbCkp IC8gc2l6ZW9mKFVDaGFyKSkpCiAgICAgICAgIENSQVNIKCk7CiAgICAgc2l6ZV90IHNpemUgPSBz aXplb2YoU3RyaW5nSW1wbCkgKyBsZW5ndGggKiBzaXplb2YoVUNoYXIpOwogICAgIFN0cmluZ0lt cGwqIHN0cmluZyA9IHN0YXRpY19jYXN0PFN0cmluZ0ltcGwqPihmYXN0TWFsbG9jKHNpemUpKTsK SW5kZXg6IEphdmFTY3JpcHRDb3JlL3d0Zi90ZXh0L1N0cmluZ0ltcGwuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBKYXZhU2NyaXB0Q29yZS93dGYvdGV4dC9TdHJpbmdJbXBsLmgJKHJldmlzaW9uIDY5MTgwKQor KysgSmF2YVNjcmlwdENvcmUvd3RmL3RleHQvU3RyaW5nSW1wbC5oCSh3b3JraW5nIGNvcHkpCkBA IC0xNjUsNyArMTY1LDcgQEAKICAgICAgICAgICAgIHJldHVybiBlbXB0eSgpOwogICAgICAgICB9 CiAKLSAgICAgICAgaWYgKGxlbmd0aCA+ICgoc3RkOjpudW1lcmljX2xpbWl0czxzaXplX3Q+Ojpt YXgoKSAtIHNpemVvZihTdHJpbmdJbXBsKSkgLyBzaXplb2YoVUNoYXIpKSkgeworICAgICAgICBp ZiAobGVuZ3RoID4gKChzdGQ6Om51bWVyaWNfbGltaXRzPHVuc2lnbmVkPjo6bWF4KCkgLSBzaXpl b2YoU3RyaW5nSW1wbCkpIC8gc2l6ZW9mKFVDaGFyKSkpIHsKICAgICAgICAgICAgIG91dHB1dCA9 IDA7CiAgICAgICAgICAgICByZXR1cm4gMDsKICAgICAgICAgfQpAQCAtMTg3LDYgKzE4Nyw4IEBA CiAgICAgewogICAgICAgICBpZiAoc2l6ZV90IHNpemUgPSB2ZWN0b3Iuc2l6ZSgpKSB7CiAgICAg ICAgICAgICBBU1NFUlQodmVjdG9yLmRhdGEoKSk7CisgICAgICAgICAgICBpZiAoc2l6ZSA+IHN0 ZDo6bnVtZXJpY19saW1pdHM8dW5zaWduZWQ+OjptYXgoKSkKKyAgICAgICAgICAgICAgICBDUkFT SCgpOwogICAgICAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBTdHJpbmdJbXBsKHZlY3Rvci5y ZWxlYXNlQnVmZmVyKCksIHNpemUpKTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gZW1wdHko KTsKSW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2Ny aXB0Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDY5MTgwKQorKysgSmF2YVNjcmlwdENvcmUvQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMTAtMDcgIENocmlz IEV2YW5zICA8Y2V2YW5zQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQ3MzkzCisKKyAgICAgICAgVXNlIHVuc2lnbmVkIGNvbnNpc3RlbnRseSB0byBjaGVjayBm b3IgbWF4IFN0cmluZ0ltcGwgbGVuZ3RoLgorICAgICAgICBBZGQgYSBmZXcgaW50ZWdlciBvdmVy ZmxvdyBjaGVja3MuCisgICAgICAgIFVzZXMgdGhlIGV4aXN0aW5nIHBhcmFkaWdtIG9mIENSQVNI KCkgd2hlbiB3ZSBjYW4ndCByZWFzb25hYmx5IGhhbmRsZSBhIGNyYXppbHkgbGFyZ2UgcmVxdWVz dC4KKworICAgICAgICAqIHd0Zi90ZXh0L1dURlN0cmluZy5jcHA6CisgICAgICAgICogd3RmL3Rl eHQvU3RyaW5nSW1wbC5oOgorICAgICAgICAqIHd0Zi90ZXh0L1N0cmluZ0ltcGwuY3BwOgorICAg ICAgICBCZXR0ZXIgdXNlIG9mIHNpemVfdCB2cy4gdW5zaWduZWQ7IGNoZWNrIGZvciBpbnRlZ2Vy IG92ZXJmbG93cy4KKwogMjAxMC0xMC0wNSAgS3dhbmcgWXVsIFNlbyAgPHNreXVsQGNvbXBhbnkx MDAubmV0PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEdhdmluIEJhcnJhY2xvdWdoLgo=