34948 2010-02-15 10:51:33 -0800 tryMakeString should fail on error in length calculation 2010-02-15 14:03:48 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 barraclough barraclough oldest_to_newest 190496 0 barraclough 2010-02-15 10:51:33 -0800 The sum of the length of substrings could overflow. 190497 1 48759 barraclough 2010-02-15 10:52:57 -0800 Created attachment 48759 The patch No perf impact. 190529 2 48759 ggaren 2010-02-15 12:40:47 -0800 Comment on attachment 48759 The patch r=me 190540 3 barraclough 2010-02-15 13:00:06 -0800 Sending JavaScriptCore/ChangeLog Sending JavaScriptCore/runtime/UString.h Transmitting file data .. Committed revision 54788. 190558 4 barraclough 2010-02-15 14:03:48 -0800 Errk! - thanks darin/aroben, made the output bool a reference in r54795. Darin - I will separately check the performance of using |=. My instinct is often to go with the branch, since on x86 the setcc instruction used to be multiple cycle, and a well predicted branch can be free. In this case there may be little performance difference, since I don't think makeString is heavily used or performance critical. As such perhaps I should switch to |=, since it's a line shorter. :o) 48759 2010-02-15 10:52:57 -0800 2010-02-15 12:40:46 -0800 The patch patch.ustringoverflow.2.txt text/plain 6707 barraclough SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDU0NzgyKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDItMTUgIEdhdmluIEJh cnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1ZyAzNDk0OCAtIHRyeU1ha2VTdHJpbmcgc2hv dWxkIGZhaWwgb24gZXJyb3IgaW4gbGVuZ3RoIGNhbGN1bGF0aW9uCisKKyAgICAgICAgVGhlIHN1 bSBvZiB0aGUgbGVuZ3RoIG9mIHN1YnN0cmluZ3MgY291bGQgb3ZlcmZsb3cuCisKKyAgICAgICAg KiBydW50aW1lL1VTdHJpbmcuaDoKKyAgICAgICAgKEpTQzo6c3VtV2l0aE92ZXJmbG93KToKKyAg ICAgICAgKEpTQzo6dHJ5TWFrZVN0cmluZyk6CisKIDIwMTAtMDItMTUgIFBhdHJpY2sgR2Fuc3Rl cmVyICA8cGFyb2dhQHBhcm9nYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTGFzemxvIEdv bWJvcy4KSW5kZXg6IEphdmFTY3JpcHRDb3JlL3J1bnRpbWUvVVN0cmluZy5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIEphdmFTY3JpcHRDb3JlL3J1bnRpbWUvVVN0cmluZy5oCShyZXZpc2lvbiA1NDczMSkKKysr IEphdmFTY3JpcHRDb3JlL3J1bnRpbWUvVVN0cmluZy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMjcs NiArMzI3LDE0IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICB1bnNpZ25lZCBtX2xlbmd0aDsK ICAgICB9OwogCisgICAgaW5saW5lIHZvaWQgc3VtV2l0aE92ZXJmbG93KHVuc2lnbmVkJiB0b3Rh bCwgdW5zaWduZWQgYWRkZW5kLCBib29sIG92ZXJmbG93KQorICAgIHsKKyAgICAgICAgdW5zaWdu ZWQgb2xkVG90YWwgPSB0b3RhbDsKKyAgICAgICAgdG90YWwgPSBvbGRUb3RhbCArIGFkZGVuZDsK KyAgICAgICAgaWYgKHRvdGFsIDwgb2xkVG90YWwpCisgICAgICAgICAgICBvdmVyZmxvdyA9IHRy dWU7CisgICAgfQorCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgU3RyaW5nVHlwZTEsIHR5cGVuYW1l IFN0cmluZ1R5cGUyPgogICAgIFBhc3NSZWZQdHI8VVN0cmluZ0ltcGw+IHRyeU1ha2VTdHJpbmco U3RyaW5nVHlwZTEgc3RyaW5nMSwgU3RyaW5nVHlwZTIgc3RyaW5nMikKICAgICB7CkBAIC0zMzQs NyArMzQyLDExIEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBTdHJpbmdUeXBlQWRhcHRlcjxT dHJpbmdUeXBlMj4gYWRhcHRlcjIoc3RyaW5nMik7CiAKICAgICAgICAgVUNoYXIqIGJ1ZmZlcjsK LSAgICAgICAgdW5zaWduZWQgbGVuZ3RoID0gYWRhcHRlcjEubGVuZ3RoKCkgKyBhZGFwdGVyMi5s ZW5ndGgoKTsKKyAgICAgICAgYm9vbCBvdmVyZmxvdyA9IGZhbHNlOworICAgICAgICB1bnNpZ25l ZCBsZW5ndGggPSBhZGFwdGVyMS5sZW5ndGgoKTsKKyAgICAgICAgc3VtV2l0aE92ZXJmbG93KGxl bmd0aCwgYWRhcHRlcjIubGVuZ3RoKCksIG92ZXJmbG93KTsKKyAgICAgICAgaWYgKG92ZXJmbG93 KQorICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgIFBhc3NSZWZQdHI8VVN0cmluZ0ltcGw+ IHJlc3VsdEltcGwgPSBVU3RyaW5nSW1wbDo6dHJ5Q3JlYXRlVW5pbml0aWFsaXplZChsZW5ndGgs IGJ1ZmZlcik7CiAgICAgICAgIGlmICghcmVzdWx0SW1wbCkKICAgICAgICAgICAgIHJldHVybiAw OwpAQCAtMzU1LDcgKzM2NywxMiBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgU3RyaW5nVHlw ZUFkYXB0ZXI8U3RyaW5nVHlwZTM+IGFkYXB0ZXIzKHN0cmluZzMpOwogCiAgICAgICAgIFVDaGFy KiBidWZmZXI7Ci0gICAgICAgIHVuc2lnbmVkIGxlbmd0aCA9IGFkYXB0ZXIxLmxlbmd0aCgpICsg YWRhcHRlcjIubGVuZ3RoKCkgKyBhZGFwdGVyMy5sZW5ndGgoKTsKKyAgICAgICAgYm9vbCBvdmVy ZmxvdyA9IGZhbHNlOworICAgICAgICB1bnNpZ25lZCBsZW5ndGggPSBhZGFwdGVyMS5sZW5ndGgo KTsKKyAgICAgICAgc3VtV2l0aE92ZXJmbG93KGxlbmd0aCwgYWRhcHRlcjIubGVuZ3RoKCksIG92 ZXJmbG93KTsKKyAgICAgICAgc3VtV2l0aE92ZXJmbG93KGxlbmd0aCwgYWRhcHRlcjMubGVuZ3Ro KCksIG92ZXJmbG93KTsKKyAgICAgICAgaWYgKG92ZXJmbG93KQorICAgICAgICAgICAgcmV0dXJu IDA7CiAgICAgICAgIFBhc3NSZWZQdHI8VVN0cmluZ0ltcGw+IHJlc3VsdEltcGwgPSBVU3RyaW5n SW1wbDo6dHJ5Q3JlYXRlVW5pbml0aWFsaXplZChsZW5ndGgsIGJ1ZmZlcik7CiAgICAgICAgIGlm ICghcmVzdWx0SW1wbCkKICAgICAgICAgICAgIHJldHVybiAwOwpAQCAtMzc5LDcgKzM5NiwxMyBA QCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgU3RyaW5nVHlwZUFkYXB0ZXI8U3RyaW5nVHlwZTQ+ IGFkYXB0ZXI0KHN0cmluZzQpOwogCiAgICAgICAgIFVDaGFyKiBidWZmZXI7Ci0gICAgICAgIHVu c2lnbmVkIGxlbmd0aCA9IGFkYXB0ZXIxLmxlbmd0aCgpICsgYWRhcHRlcjIubGVuZ3RoKCkgKyBh ZGFwdGVyMy5sZW5ndGgoKSArIGFkYXB0ZXI0Lmxlbmd0aCgpOworICAgICAgICBib29sIG92ZXJm bG93ID0gZmFsc2U7CisgICAgICAgIHVuc2lnbmVkIGxlbmd0aCA9IGFkYXB0ZXIxLmxlbmd0aCgp OworICAgICAgICBzdW1XaXRoT3ZlcmZsb3cobGVuZ3RoLCBhZGFwdGVyMi5sZW5ndGgoKSwgb3Zl cmZsb3cpOworICAgICAgICBzdW1XaXRoT3ZlcmZsb3cobGVuZ3RoLCBhZGFwdGVyMy5sZW5ndGgo KSwgb3ZlcmZsb3cpOworICAgICAgICBzdW1XaXRoT3ZlcmZsb3cobGVuZ3RoLCBhZGFwdGVyNC5s ZW5ndGgoKSwgb3ZlcmZsb3cpOworICAgICAgICBpZiAob3ZlcmZsb3cpCisgICAgICAgICAgICBy ZXR1cm4gMDsKICAgICAgICAgUGFzc1JlZlB0cjxVU3RyaW5nSW1wbD4gcmVzdWx0SW1wbCA9IFVT dHJpbmdJbXBsOjp0cnlDcmVhdGVVbmluaXRpYWxpemVkKGxlbmd0aCwgYnVmZmVyKTsKICAgICAg ICAgaWYgKCFyZXN1bHRJbXBsKQogICAgICAgICAgICAgcmV0dXJuIDA7CkBAIC00MDYsNyArNDI5 LDE0IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBTdHJpbmdUeXBlQWRhcHRlcjxTdHJpbmdU eXBlNT4gYWRhcHRlcjUoc3RyaW5nNSk7CiAKICAgICAgICAgVUNoYXIqIGJ1ZmZlcjsKLSAgICAg ICAgdW5zaWduZWQgbGVuZ3RoID0gYWRhcHRlcjEubGVuZ3RoKCkgKyBhZGFwdGVyMi5sZW5ndGgo KSArIGFkYXB0ZXIzLmxlbmd0aCgpICsgYWRhcHRlcjQubGVuZ3RoKCkgKyBhZGFwdGVyNS5sZW5n dGgoKTsKKyAgICAgICAgYm9vbCBvdmVyZmxvdyA9IGZhbHNlOworICAgICAgICB1bnNpZ25lZCBs ZW5ndGggPSBhZGFwdGVyMS5sZW5ndGgoKTsKKyAgICAgICAgc3VtV2l0aE92ZXJmbG93KGxlbmd0 aCwgYWRhcHRlcjIubGVuZ3RoKCksIG92ZXJmbG93KTsKKyAgICAgICAgc3VtV2l0aE92ZXJmbG93 KGxlbmd0aCwgYWRhcHRlcjMubGVuZ3RoKCksIG92ZXJmbG93KTsKKyAgICAgICAgc3VtV2l0aE92 ZXJmbG93KGxlbmd0aCwgYWRhcHRlcjQubGVuZ3RoKCksIG92ZXJmbG93KTsKKyAgICAgICAgc3Vt V2l0aE92ZXJmbG93KGxlbmd0aCwgYWRhcHRlcjUubGVuZ3RoKCksIG92ZXJmbG93KTsKKyAgICAg ICAgaWYgKG92ZXJmbG93KQorICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgIFBhc3NSZWZQ dHI8VVN0cmluZ0ltcGw+IHJlc3VsdEltcGwgPSBVU3RyaW5nSW1wbDo6dHJ5Q3JlYXRlVW5pbml0 aWFsaXplZChsZW5ndGgsIGJ1ZmZlcik7CiAgICAgICAgIGlmICghcmVzdWx0SW1wbCkKICAgICAg ICAgICAgIHJldHVybiAwOwpAQCAtNDM2LDcgKzQ2NiwxNSBAQCBuYW1lc3BhY2UgSlNDIHsKICAg ICAgICAgU3RyaW5nVHlwZUFkYXB0ZXI8U3RyaW5nVHlwZTY+IGFkYXB0ZXI2KHN0cmluZzYpOwog CiAgICAgICAgIFVDaGFyKiBidWZmZXI7Ci0gICAgICAgIHVuc2lnbmVkIGxlbmd0aCA9IGFkYXB0 ZXIxLmxlbmd0aCgpICsgYWRhcHRlcjIubGVuZ3RoKCkgKyBhZGFwdGVyMy5sZW5ndGgoKSArIGFk YXB0ZXI0Lmxlbmd0aCgpICsgYWRhcHRlcjUubGVuZ3RoKCkgKyBhZGFwdGVyNi5sZW5ndGgoKTsK KyAgICAgICAgYm9vbCBvdmVyZmxvdyA9IGZhbHNlOworICAgICAgICB1bnNpZ25lZCBsZW5ndGgg PSBhZGFwdGVyMS5sZW5ndGgoKTsKKyAgICAgICAgc3VtV2l0aE92ZXJmbG93KGxlbmd0aCwgYWRh cHRlcjIubGVuZ3RoKCksIG92ZXJmbG93KTsKKyAgICAgICAgc3VtV2l0aE92ZXJmbG93KGxlbmd0 aCwgYWRhcHRlcjMubGVuZ3RoKCksIG92ZXJmbG93KTsKKyAgICAgICAgc3VtV2l0aE92ZXJmbG93 KGxlbmd0aCwgYWRhcHRlcjQubGVuZ3RoKCksIG92ZXJmbG93KTsKKyAgICAgICAgc3VtV2l0aE92 ZXJmbG93KGxlbmd0aCwgYWRhcHRlcjUubGVuZ3RoKCksIG92ZXJmbG93KTsKKyAgICAgICAgc3Vt V2l0aE92ZXJmbG93KGxlbmd0aCwgYWRhcHRlcjYubGVuZ3RoKCksIG92ZXJmbG93KTsKKyAgICAg ICAgaWYgKG92ZXJmbG93KQorICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgIFBhc3NSZWZQ dHI8VVN0cmluZ0ltcGw+IHJlc3VsdEltcGwgPSBVU3RyaW5nSW1wbDo6dHJ5Q3JlYXRlVW5pbml0 aWFsaXplZChsZW5ndGgsIGJ1ZmZlcik7CiAgICAgICAgIGlmICghcmVzdWx0SW1wbCkKICAgICAg ICAgICAgIHJldHVybiAwOwpAQCAtNDY5LDcgKzUwNywxNiBAQCBuYW1lc3BhY2UgSlNDIHsKICAg ICAgICAgU3RyaW5nVHlwZUFkYXB0ZXI8U3RyaW5nVHlwZTc+IGFkYXB0ZXI3KHN0cmluZzcpOwog CiAgICAgICAgIFVDaGFyKiBidWZmZXI7Ci0gICAgICAgIHVuc2lnbmVkIGxlbmd0aCA9IGFkYXB0 ZXIxLmxlbmd0aCgpICsgYWRhcHRlcjIubGVuZ3RoKCkgKyBhZGFwdGVyMy5sZW5ndGgoKSArIGFk YXB0ZXI0Lmxlbmd0aCgpICsgYWRhcHRlcjUubGVuZ3RoKCkgKyBhZGFwdGVyNi5sZW5ndGgoKSAr IGFkYXB0ZXI3Lmxlbmd0aCgpOworICAgICAgICBib29sIG92ZXJmbG93ID0gZmFsc2U7CisgICAg ICAgIHVuc2lnbmVkIGxlbmd0aCA9IGFkYXB0ZXIxLmxlbmd0aCgpOworICAgICAgICBzdW1XaXRo T3ZlcmZsb3cobGVuZ3RoLCBhZGFwdGVyMi5sZW5ndGgoKSwgb3ZlcmZsb3cpOworICAgICAgICBz dW1XaXRoT3ZlcmZsb3cobGVuZ3RoLCBhZGFwdGVyMy5sZW5ndGgoKSwgb3ZlcmZsb3cpOworICAg ICAgICBzdW1XaXRoT3ZlcmZsb3cobGVuZ3RoLCBhZGFwdGVyNC5sZW5ndGgoKSwgb3ZlcmZsb3cp OworICAgICAgICBzdW1XaXRoT3ZlcmZsb3cobGVuZ3RoLCBhZGFwdGVyNS5sZW5ndGgoKSwgb3Zl cmZsb3cpOworICAgICAgICBzdW1XaXRoT3ZlcmZsb3cobGVuZ3RoLCBhZGFwdGVyNi5sZW5ndGgo KSwgb3ZlcmZsb3cpOworICAgICAgICBzdW1XaXRoT3ZlcmZsb3cobGVuZ3RoLCBhZGFwdGVyNy5s ZW5ndGgoKSwgb3ZlcmZsb3cpOworICAgICAgICBpZiAob3ZlcmZsb3cpCisgICAgICAgICAgICBy ZXR1cm4gMDsKICAgICAgICAgUGFzc1JlZlB0cjxVU3RyaW5nSW1wbD4gcmVzdWx0SW1wbCA9IFVT dHJpbmdJbXBsOjp0cnlDcmVhdGVVbmluaXRpYWxpemVkKGxlbmd0aCwgYnVmZmVyKTsKICAgICAg ICAgaWYgKCFyZXN1bHRJbXBsKQogICAgICAgICAgICAgcmV0dXJuIDA7CkBAIC01MDUsNyArNTUy LDE3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBTdHJpbmdUeXBlQWRhcHRlcjxTdHJpbmdU eXBlOD4gYWRhcHRlcjgoc3RyaW5nOCk7CiAKICAgICAgICAgVUNoYXIqIGJ1ZmZlcjsKLSAgICAg ICAgdW5zaWduZWQgbGVuZ3RoID0gYWRhcHRlcjEubGVuZ3RoKCkgKyBhZGFwdGVyMi5sZW5ndGgo KSArIGFkYXB0ZXIzLmxlbmd0aCgpICsgYWRhcHRlcjQubGVuZ3RoKCkgKyBhZGFwdGVyNS5sZW5n dGgoKSArIGFkYXB0ZXI2Lmxlbmd0aCgpICsgYWRhcHRlcjcubGVuZ3RoKCkgKyBhZGFwdGVyOC5s ZW5ndGgoKTsKKyAgICAgICAgYm9vbCBvdmVyZmxvdyA9IGZhbHNlOworICAgICAgICB1bnNpZ25l ZCBsZW5ndGggPSBhZGFwdGVyMS5sZW5ndGgoKTsKKyAgICAgICAgc3VtV2l0aE92ZXJmbG93KGxl bmd0aCwgYWRhcHRlcjIubGVuZ3RoKCksIG92ZXJmbG93KTsKKyAgICAgICAgc3VtV2l0aE92ZXJm bG93KGxlbmd0aCwgYWRhcHRlcjMubGVuZ3RoKCksIG92ZXJmbG93KTsKKyAgICAgICAgc3VtV2l0 aE92ZXJmbG93KGxlbmd0aCwgYWRhcHRlcjQubGVuZ3RoKCksIG92ZXJmbG93KTsKKyAgICAgICAg c3VtV2l0aE92ZXJmbG93KGxlbmd0aCwgYWRhcHRlcjUubGVuZ3RoKCksIG92ZXJmbG93KTsKKyAg ICAgICAgc3VtV2l0aE92ZXJmbG93KGxlbmd0aCwgYWRhcHRlcjYubGVuZ3RoKCksIG92ZXJmbG93 KTsKKyAgICAgICAgc3VtV2l0aE92ZXJmbG93KGxlbmd0aCwgYWRhcHRlcjcubGVuZ3RoKCksIG92 ZXJmbG93KTsKKyAgICAgICAgc3VtV2l0aE92ZXJmbG93KGxlbmd0aCwgYWRhcHRlcjgubGVuZ3Ro KCksIG92ZXJmbG93KTsKKyAgICAgICAgaWYgKG92ZXJmbG93KQorICAgICAgICAgICAgcmV0dXJu IDA7CiAgICAgICAgIFBhc3NSZWZQdHI8VVN0cmluZ0ltcGw+IHJlc3VsdEltcGwgPSBVU3RyaW5n SW1wbDo6dHJ5Q3JlYXRlVW5pbml0aWFsaXplZChsZW5ndGgsIGJ1ZmZlcik7CiAgICAgICAgIGlm ICghcmVzdWx0SW1wbCkKICAgICAgICAgICAgIHJldHVybiAwOwo=