35190 2010-02-19 23:51:29 -0800 Don't use system malloc in Java bindings 2010-02-20 01:33:40 -0800 1 1 1 Unclassified WebKit Java 528+ (Nightly build) Mac All RESOLVED FIXED P2 Normal --- 1 ap ap oldest_to_newest 192144 0 ap 2010-02-19 23:51:29 -0800 There is no reason to, and the current code can actually leak. 192146 1 49121 ap 2010-02-20 00:23:32 -0800 Created attachment 49121 proposed patch 192152 2 49121 mjs 2010-02-20 01:30:15 -0800 Comment on attachment 49121 proposed patch r=me 192153 3 ap 2010-02-20 01:33:40 -0800 Committed revision 55045. 49121 2010-02-20 00:23:32 -0800 2010-02-20 01:30:15 -0800 proposed patch JavaMalloc.txt text/plain 5858 ap SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NTA0MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTIgQEAKKzIwMTAtMDItMTkgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBs ZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1MTkwCisgICAgICAgIERv bid0IHVzZSBzeXN0ZW0gbWFsbG9jIGluIEphdmEgYmluZGluZ3MKKworICAgICAgICAqIGJyaWRn ZS9qbmkvanNjL0phdmFJbnN0YW5jZUpTQy5jcHA6IChKYXZhSW5zdGFuY2U6Omludm9rZU1ldGhv ZCk6IFN3aXRjaGVkIHRvIFdURjo6VmVjdG9yLgorCiAyMDEwLTAyLTE5ICBNYWNpZWogU3RhY2hv d2lhayAgPG1qc0BhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4u CkluZGV4OiBXZWJDb3JlL2JyaWRnZS9qbmkvanNjL0phdmFJbnN0YW5jZUpTQy5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9icmlkZ2Uvam5pL2pzYy9KYXZhSW5zdGFuY2VKU0MuY3BwCShyZXZp c2lvbiA1NTA0MikKKysrIFdlYkNvcmUvYnJpZGdlL2puaS9qc2MvSmF2YUluc3RhbmNlSlNDLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTA1LDggKzEwNSw4IEBAIEpTVmFsdWUgSmF2YUluc3RhbmNl Ojpib29sZWFuVmFsdWUoKSBjb24KIAogSlNWYWx1ZSBKYXZhSW5zdGFuY2U6Omludm9rZU1ldGhv ZChFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IE1ldGhvZExpc3QmIG1ldGhvZExpc3QsIGNvbnN0IEFy Z0xpc3QgJmFyZ3MpCiB7Ci0gICAgaW50IGksIGNvdW50ID0gYXJncy5zaXplKCk7Ci0gICAganZh bHVlKiBqQXJnczsKKyAgICBpbnQgaTsKKyAgICBpbnQgY291bnQgPSBhcmdzLnNpemUoKTsKICAg ICBKU1ZhbHVlIHJlc3VsdFZhbHVlOwogICAgIE1ldGhvZCogbWV0aG9kID0gMDsKICAgICBzaXpl X3QgbnVtTWV0aG9kcyA9IG1ldGhvZExpc3Quc2l6ZSgpOwpAQCAtMTE2LDkgKzExNiw4IEBAIEpT VmFsdWUgSmF2YUluc3RhbmNlOjppbnZva2VNZXRob2QoRXhlY1MKICAgICAvLyBub3Rpb24gb2Yg bWV0aG9kIG92ZXJsb2FkaW5nIGFuZCBKYXZhIGRvZXMuICBXZSBjb3VsZAogICAgIC8vIGdldCBh IGJpdCBtb3JlIHNvcGhpc3RpY2F0ZWQgYW5kIGF0dGVtcHQgdG8gZG9lcyBzb21lCiAgICAgLy8g dHlwZSBjaGVja2luZyBhcyB3ZSBhcyBjaGVja2luZyB0aGUgbnVtYmVyIG9mIHBhcmFtZXRlcnMu Ci0gICAgTWV0aG9kKiBhTWV0aG9kOwogICAgIGZvciAoc2l6ZV90IG1ldGhvZEluZGV4ID0gMDsg bWV0aG9kSW5kZXggPCBudW1NZXRob2RzOyBtZXRob2RJbmRleCsrKSB7Ci0gICAgICAgIGFNZXRo b2QgPSBtZXRob2RMaXN0W21ldGhvZEluZGV4XTsKKyAgICAgICAgTWV0aG9kKiBhTWV0aG9kID0g bWV0aG9kTGlzdFttZXRob2RJbmRleF07CiAgICAgICAgIGlmIChhTWV0aG9kLT5udW1QYXJhbWV0 ZXJzKCkgPT0gY291bnQpIHsKICAgICAgICAgICAgIG1ldGhvZCA9IGFNZXRob2Q7CiAgICAgICAg ICAgICBicmVhazsKQEAgLTEzMiwxMCArMTMxLDcgQEAgSlNWYWx1ZSBKYXZhSW5zdGFuY2U6Omlu dm9rZU1ldGhvZChFeGVjUwogICAgIGNvbnN0IEphdmFNZXRob2QqIGpNZXRob2QgPSBzdGF0aWNf Y2FzdDxjb25zdCBKYXZhTWV0aG9kKj4obWV0aG9kKTsKICAgICBMT0coTGl2ZUNvbm5lY3QsICJK YXZhSW5zdGFuY2U6Omludm9rZU1ldGhvZCBjYWxsICVzICVzIG9uICVwIiwgVVN0cmluZyhqTWV0 aG9kLT5uYW1lKCkpLlVURjhTdHJpbmcoKS5jX3N0cigpLCBqTWV0aG9kLT5zaWduYXR1cmUoKSwg bV9pbnN0YW5jZS0+bV9pbnN0YW5jZSk7CiAKLSAgICBpZiAoY291bnQgPiAwKQotICAgICAgICBq QXJncyA9IChqdmFsdWUqKW1hbGxvYyhjb3VudCAqIHNpemVvZihqdmFsdWUpKTsKLSAgICBlbHNl Ci0gICAgICAgIGpBcmdzID0gMDsKKyAgICBWZWN0b3I8anZhbHVlPiBqQXJncyhjb3VudCk7CiAK ICAgICBmb3IgKGkgPSAwOyBpIDwgY291bnQ7IGkrKykgewogICAgICAgICBKYXZhUGFyYW1ldGVy KiBhUGFyYW1ldGVyID0gak1ldGhvZC0+cGFyYW1ldGVyQXQoaSk7CkBAIC0xNTcsMTAgKzE1Myw5 IEBAIEpTVmFsdWUgSmF2YUluc3RhbmNlOjppbnZva2VNZXRob2QoRXhlY1MKICAgICAgICAgam9i amVjdCBvYmogPSBtX2luc3RhbmNlLT5tX2luc3RhbmNlOwogICAgICAgICBKU1ZhbHVlIGV4Y2Vw dGlvbkRlc2NyaXB0aW9uOwogICAgICAgICBjb25zdCBjaGFyICpjYWxsaW5nVVJMID0gMDsgLy8g RklYTUUsIG5lZWQgdG8gcHJvcGFnYXRlIGNhbGxpbmcgVVJMIHRvIEphdmEKLSAgICAgICAgaGFu ZGxlZCA9IGRpc3BhdGNoSk5JQ2FsbChleGVjLCByb290T2JqZWN0LT5uYXRpdmVIYW5kbGUoKSwg b2JqLCBqTWV0aG9kLT5pc1N0YXRpYygpLCBqTWV0aG9kLT5KTklSZXR1cm5UeXBlKCksIGpNZXRo b2QtPm1ldGhvZElEKG9iaiksIGpBcmdzLCByZXN1bHQsIGNhbGxpbmdVUkwsIGV4Y2VwdGlvbkRl c2NyaXB0aW9uKTsKKyAgICAgICAgaGFuZGxlZCA9IGRpc3BhdGNoSk5JQ2FsbChleGVjLCByb290 T2JqZWN0LT5uYXRpdmVIYW5kbGUoKSwgb2JqLCBqTWV0aG9kLT5pc1N0YXRpYygpLCBqTWV0aG9k LT5KTklSZXR1cm5UeXBlKCksIGpNZXRob2QtPm1ldGhvZElEKG9iaiksIGpBcmdzLmRhdGEoKSwg cmVzdWx0LCBjYWxsaW5nVVJMLCBleGNlcHRpb25EZXNjcmlwdGlvbik7CiAgICAgICAgIGlmIChl eGNlcHRpb25EZXNjcmlwdGlvbikgewogICAgICAgICAgICAgdGhyb3dFcnJvcihleGVjLCBHZW5l cmFsRXJyb3IsIGV4Y2VwdGlvbkRlc2NyaXB0aW9uLnRvU3RyaW5nKGV4ZWMpKTsKLSAgICAgICAg ICAgIGZyZWUoakFyZ3MpOwogICAgICAgICAgICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7CiAgICAg ICAgIH0KICAgICB9CkBAIC0xNzEsMzggKzE2NiwzOCBAQCBKU1ZhbHVlIEphdmFJbnN0YW5jZTo6 aW52b2tlTWV0aG9kKEV4ZWNTCiAgICAgICAgIGpvYmplY3Qgb2JqID0gbV9pbnN0YW5jZS0+bV9p bnN0YW5jZTsKICAgICAgICAgc3dpdGNoIChqTWV0aG9kLT5KTklSZXR1cm5UeXBlKCkpIHsKICAg ICAgICAgY2FzZSB2b2lkX3R5cGU6Ci0gICAgICAgICAgICBjYWxsSk5JTWV0aG9kSURBPHZvaWQ+ KG9iaiwgak1ldGhvZC0+bWV0aG9kSUQob2JqKSwgakFyZ3MpOworICAgICAgICAgICAgY2FsbEpO SU1ldGhvZElEQTx2b2lkPihvYmosIGpNZXRob2QtPm1ldGhvZElEKG9iaiksIGpBcmdzLmRhdGEo KSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBvYmplY3RfdHlwZToKLSAgICAg ICAgICAgIHJlc3VsdC5sID0gY2FsbEpOSU1ldGhvZElEQTxqb2JqZWN0PihvYmosIGpNZXRob2Qt Pm1ldGhvZElEKG9iaiksIGpBcmdzKTsKKyAgICAgICAgICAgIHJlc3VsdC5sID0gY2FsbEpOSU1l dGhvZElEQTxqb2JqZWN0PihvYmosIGpNZXRob2QtPm1ldGhvZElEKG9iaiksIGpBcmdzLmRhdGEo KSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBib29sZWFuX3R5cGU6Ci0gICAg ICAgICAgICByZXN1bHQueiA9IGNhbGxKTklNZXRob2RJREE8amJvb2xlYW4+KG9iaiwgak1ldGhv ZC0+bWV0aG9kSUQob2JqKSwgakFyZ3MpOworICAgICAgICAgICAgcmVzdWx0LnogPSBjYWxsSk5J TWV0aG9kSURBPGpib29sZWFuPihvYmosIGpNZXRob2QtPm1ldGhvZElEKG9iaiksIGpBcmdzLmRh dGEoKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBieXRlX3R5cGU6Ci0gICAg ICAgICAgICByZXN1bHQuYiA9IGNhbGxKTklNZXRob2RJREE8amJ5dGU+KG9iaiwgak1ldGhvZC0+ bWV0aG9kSUQob2JqKSwgakFyZ3MpOworICAgICAgICAgICAgcmVzdWx0LmIgPSBjYWxsSk5JTWV0 aG9kSURBPGpieXRlPihvYmosIGpNZXRob2QtPm1ldGhvZElEKG9iaiksIGpBcmdzLmRhdGEoKSk7 CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBjaGFyX3R5cGU6Ci0gICAgICAgICAg ICByZXN1bHQuYyA9IGNhbGxKTklNZXRob2RJREE8amNoYXI+KG9iaiwgak1ldGhvZC0+bWV0aG9k SUQob2JqKSwgakFyZ3MpOworICAgICAgICAgICAgcmVzdWx0LmMgPSBjYWxsSk5JTWV0aG9kSURB PGpjaGFyPihvYmosIGpNZXRob2QtPm1ldGhvZElEKG9iaiksIGpBcmdzLmRhdGEoKSk7CiAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBzaG9ydF90eXBlOgotICAgICAgICAgICAgcmVz dWx0LnMgPSBjYWxsSk5JTWV0aG9kSURBPGpzaG9ydD4ob2JqLCBqTWV0aG9kLT5tZXRob2RJRChv YmopLCBqQXJncyk7CisgICAgICAgICAgICByZXN1bHQucyA9IGNhbGxKTklNZXRob2RJREE8anNo b3J0PihvYmosIGpNZXRob2QtPm1ldGhvZElEKG9iaiksIGpBcmdzLmRhdGEoKSk7CiAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgY2FzZSBpbnRfdHlwZToKLSAgICAgICAgICAgIHJlc3VsdC5p ID0gY2FsbEpOSU1ldGhvZElEQTxqaW50PihvYmosIGpNZXRob2QtPm1ldGhvZElEKG9iaiksIGpB cmdzKTsKKyAgICAgICAgICAgIHJlc3VsdC5pID0gY2FsbEpOSU1ldGhvZElEQTxqaW50PihvYmos IGpNZXRob2QtPm1ldGhvZElEKG9iaiksIGpBcmdzLmRhdGEoKSk7CiAgICAgICAgICAgICBicmVh azsKIAogICAgICAgICBjYXNlIGxvbmdfdHlwZToKLSAgICAgICAgICAgIHJlc3VsdC5qID0gY2Fs bEpOSU1ldGhvZElEQTxqbG9uZz4ob2JqLCBqTWV0aG9kLT5tZXRob2RJRChvYmopLCBqQXJncyk7 CisgICAgICAgICAgICByZXN1bHQuaiA9IGNhbGxKTklNZXRob2RJREE8amxvbmc+KG9iaiwgak1l dGhvZC0+bWV0aG9kSUQob2JqKSwgakFyZ3MuZGF0YSgpKTsKICAgICAgICAgICAgIGJyZWFrOwog ICAgICAgICBjYXNlIGZsb2F0X3R5cGU6Ci0gICAgICAgICAgICByZXN1bHQuZiA9IGNhbGxKTklN ZXRob2RJREE8amZsb2F0PihvYmosIGpNZXRob2QtPm1ldGhvZElEKG9iaiksIGpBcmdzKTsKKyAg ICAgICAgICAgIHJlc3VsdC5mID0gY2FsbEpOSU1ldGhvZElEQTxqZmxvYXQ+KG9iaiwgak1ldGhv ZC0+bWV0aG9kSUQob2JqKSwgakFyZ3MuZGF0YSgpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICBjYXNlIGRvdWJsZV90eXBlOgotICAgICAgICAgICAgcmVzdWx0LmQgPSBjYWxsSk5JTWV0 aG9kSURBPGpkb3VibGU+KG9iaiwgak1ldGhvZC0+bWV0aG9kSUQob2JqKSwgakFyZ3MpOworICAg ICAgICAgICAgcmVzdWx0LmQgPSBjYWxsSk5JTWV0aG9kSURBPGpkb3VibGU+KG9iaiwgak1ldGhv ZC0+bWV0aG9kSUQob2JqKSwgakFyZ3MuZGF0YSgpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICBjYXNlIGludmFsaWRfdHlwZToKLSAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgY2FzZSBh cnJheV90eXBlOgogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICB9CkBAIC0yNzYs MTUgKzI3MSwxMyBAQCBKU1ZhbHVlIEphdmFJbnN0YW5jZTo6aW52b2tlTWV0aG9kKEV4ZWNTCiAg ICAgICAgIGJyZWFrOwogCiAgICAgY2FzZSBpbnZhbGlkX3R5cGU6Ci0gICAgZGVmYXVsdDoKKyAg ICBjYXNlIGFycmF5X3R5cGU6CiAgICAgICAgIHsKICAgICAgICAgICAgIHJlc3VsdFZhbHVlID0g anNVbmRlZmluZWQoKTsKICAgICAgICAgfQogICAgICAgICBicmVhazsKICAgICB9CiAKLSAgICBm cmVlKGpBcmdzKTsKLQogICAgIHJldHVybiByZXN1bHRWYWx1ZTsKIH0KIAo=