51367 2010-12-20 17:40:41 -0800 Deallocate GregorianDateTime.timeZone (if allocated) when copying so that we don't leak memory. 2010-12-21 13:22:42 -0800 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dbates dbates buildbot darin eric ggaren staikos oldest_to_newest 324678 0 dbates 2010-12-20 17:40:41 -0800 When copying a GregorianDateTime object B to A using GregorianDateTime.copyFrom() we don't deallocate the timeZone of A before allocating a new timeZone buffer and copying the timeZone of B. Hence, we are leaking memory. Instead, we should deallocate the timeZone buffer of A then allocate a new timeZone buffer for A and copy the timeZone from B into it. 324680 1 77060 dbates 2010-12-20 17:43:58 -0800 Created attachment 77060 Patch 324684 2 77060 eric 2010-12-20 18:25:28 -0800 Comment on attachment 77060 Patch Can't we use an OwnArrayPtr here? That would be much cleaner. 324685 3 77060 tonikitoo 2010-12-20 18:26:31 -0800 Comment on attachment 77060 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=77060&action=review > JavaScriptCore/wtf/DateMath.h:204 > + delete [] timeZone; should we also set it to '0', in case if (rhs.timeZone) fails? 324741 4 77077 dbates 2010-12-20 20:06:15 -0800 Created attachment 77077 Patch Updated patch based on Eric Seidel's suggestion. 324742 5 dbates 2010-12-20 20:08:02 -0800 (In reply to comment #3) > (From update of attachment 77060 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=77060&action=review > > > JavaScriptCore/wtf/DateMath.h:204 > > + delete [] timeZone; > > should we also set it to '0', in case if (rhs.timeZone) fails? Notice, we do this by line 209 in <http://trac.webkit.org/browser/trunk/JavaScriptCore/wtf/DateMath.h?rev=72884#L209>. 324745 6 77077 eric 2010-12-20 20:15:40 -0800 Comment on attachment 77077 Patch OK... so now I wonder why we wouldn't just use Vector<char> here. 324746 7 77077 eric 2010-12-20 20:16:17 -0800 Comment on attachment 77077 Patch This is strictly better than what we have, so OK. 324758 8 buildbot 2010-12-20 20:47:13 -0800 Attachment 77077 did not build on win: Build output: http://queues.webkit.org/results/7292081 325087 9 77077 darin 2010-12-21 11:18:42 -0800 Comment on attachment 77077 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=77077&action=review Should find out why the Windows build broke. > JavaScriptCore/wtf/DateMath.cpp:1132 > - tm.timeZone = NULL; > + tm.timeZone.clear(); Side note: The most modern idiom for this is to assign to nullptr. We are going to deprecate clear(). > JavaScriptCore/wtf/DateMath.h:202 > + timeZone.set(new char[inZoneSize]); The most modern idiom for this is: timeZone = adoptArrayPtr(new char[inZoneSize]); We are going to deprecate set soon. 325101 10 dbates 2010-12-21 11:28:02 -0800 (In reply to comment #9) > (From update of attachment 77077 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=77077&action=review > > Should find out why the Windows build broke. Will look into and fix before landing. > > > JavaScriptCore/wtf/DateMath.cpp:1132 > > - tm.timeZone = NULL; > > + tm.timeZone.clear(); > > Side note: The most modern idiom for this is to assign to nullptr. We are going to deprecate clear(). Will change. > > > JavaScriptCore/wtf/DateMath.h:202 > > + timeZone.set(new char[inZoneSize]); > > The most modern idiom for this is: > > timeZone = adoptArrayPtr(new char[inZoneSize]); Will change. > > We are going to deprecate set soon. 325169 11 dbates 2010-12-21 13:22:42 -0800 Committed r74424: <http://trac.webkit.org/changeset/74424> 77060 2010-12-20 17:43:58 -0800 2010-12-20 20:06:15 -0800 Patch Bug51367.patch text/plain 1164 dbates SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc0Mzc3KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMTItMjAgIERhbmllbCBC YXRlcyAgPGRiYXRlc0ByaW0uY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIERlYWxsb2NhdGUgR3JlZ29yaWFuRGF0ZVRpbWUudGltZVpvbmUgKGlm IGFsbG9jYXRlZCkgd2hlbiBjb3B5aW5nIHNvIHRoYXQgd2UgZG9uJ3QgbGVhayBtZW1vcnkuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MTM2NworCisg ICAgICAgIFBhdGNoIGJ5IEdlb3JnZSBTdGFpa29zLgorCisgICAgICAgICogd3RmL0RhdGVNYXRo Lmg6CisgICAgICAgIChKU0M6OkdyZWdvcmlhbkRhdGVUaW1lOjpjb3B5RnJvbSk6CisKIDIwMTAt MTItMjAgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBHZW9mZnJleSBHYXJlbi4KSW5kZXg6IEphdmFTY3JpcHRDb3JlL3d0Zi9EYXRlTWF0aC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL3d0Zi9EYXRlTWF0aC5oCShyZXZpc2lvbiA3 NDM3NSkKKysrIEphdmFTY3JpcHRDb3JlL3d0Zi9EYXRlTWF0aC5oCSh3b3JraW5nIGNvcHkpCkBA IC0yMDEsNiArMjAxLDcgQEAgc3RydWN0IEdyZWdvcmlhbkRhdGVUaW1lIDogTm9uY29weWFibGUg ewogICAgICAgICB5ZWFyID0gcmhzLnllYXI7CiAgICAgICAgIGlzRFNUID0gcmhzLmlzRFNUOwog ICAgICAgICB1dGNPZmZzZXQgPSByaHMudXRjT2Zmc2V0OworICAgICAgICBkZWxldGUgW10gdGlt ZVpvbmU7CiAgICAgICAgIGlmIChyaHMudGltZVpvbmUpIHsKICAgICAgICAgICAgIGludCBpblpv bmVTaXplID0gc3RybGVuKHJocy50aW1lWm9uZSkgKyAxOwogICAgICAgICAgICAgdGltZVpvbmUg PSBuZXcgY2hhcltpblpvbmVTaXplXTsK 77077 2010-12-20 20:06:15 -0800 2010-12-21 11:18:42 -0800 Patch Bug51367_1.patch text/plain 3774 dbates SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc0Mzg0KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMTItMjAgIERhbmllbCBC YXRlcyAgPGRiYXRlc0ByaW0uY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIERlYWxsb2NhdGUgR3JlZ29yaWFuRGF0ZVRpbWUudGltZVpvbmUgKGlm IGFsbG9jYXRlZCkgd2hlbiBjb3B5aW5nIHNvIHRoYXQgd2UgZG9uJ3QgbGVhayBtZW1vcnkuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MTM2NworCisg ICAgICAgIEluc3BpcmVkIGJ5IGEgcGF0Y2ggYnkgR2VvcmdlIFN0YWlrb3MuCisKKyAgICAgICAg KiB3dGYvRGF0ZU1hdGguY3BwOgorICAgICAgICAoSlNDOjptc1RvR3JlZ29yaWFuRGF0ZVRpbWUp OiBNb2RpZmllZCB0byBjYWxsIE93blB0ckFycmF5OjpjbGVhcigpIGluc3RlYWQgb2Ygc2V0dGlu ZyB0aGUgcG9pbnRlciB0byAwLgorICAgICAgICAqIHd0Zi9EYXRlTWF0aC5oOiBDaGFuZ2UgdGlt ZVpvbmUgdG8gdHlwZSBPd25BcnJheVB0cjxjaGFyPjsgUmVtb3ZlZCBkZXN0cnVjdG9yIHNpbmNl IGl0IGlzIG5vIGxvbmdlciBuZWVkZWQuCisgICAgICAgIChKU0M6OkdyZWdvcmlhbkRhdGVUaW1l OjpHcmVnb3JpYW5EYXRlVGltZSk6IE1vZGlmaWVkIHRvIHVzZSBPd25QdHJBcnJheSBzZW1hbnRp Y3MgZm9yIHRpbWVab25lLgorICAgICAgICAoSlNDOjpHcmVnb3JpYW5EYXRlVGltZTo6b3BlcmF0 b3IgdG0pOiBEaXR0by4KKyAgICAgICAgKEpTQzo6R3JlZ29yaWFuRGF0ZVRpbWU6OmNvcHlGcm9t KTogRGl0dG8uCisKIDIwMTAtMTItMjAgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hA YXBwbGUuY29tPgogCiAgICAgICAgIFBQQyBidWlsZCBmaXg7IHN0b3AgdXNpbmcgc3RkOjpzd2Fw IG9uIFBhZ2VBbGxvY2F0aW9uL1BhZ2VSZXNlcnZhdGlvbiwKSW5kZXg6IEphdmFTY3JpcHRDb3Jl L3d0Zi9EYXRlTWF0aC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUvd3RmL0RhdGVN YXRoLmNwcAkocmV2aXNpb24gNzQzNzUpCisrKyBKYXZhU2NyaXB0Q29yZS93dGYvRGF0ZU1hdGgu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTI5LDcgKzExMjksNyBAQCB2b2lkIG1zVG9HcmVnb3Jp YW5EYXRlVGltZShFeGVjU3RhdGUqIGV4CiAgICAgdG0ueWVhciAgICAgPSAgeWVhciAtIDE5MDA7 CiAgICAgdG0uaXNEU1QgICAgPSAgZHN0T2ZmICE9IDAuMDsKICAgICB0bS51dGNPZmZzZXQgPSBz dGF0aWNfY2FzdDxsb25nPigoZHN0T2ZmICsgdXRjT2ZmKSAvIFdURjo6bXNQZXJTZWNvbmQpOwot ICAgIHRtLnRpbWVab25lID0gTlVMTDsKKyAgICB0bS50aW1lWm9uZS5jbGVhcigpOwogfQogCiBk b3VibGUgcGFyc2VEYXRlRnJvbU51bGxUZXJtaW5hdGVkQ2hhcmFjdGVycyhFeGVjU3RhdGUqIGV4 ZWMsIGNvbnN0IGNoYXIqIGRhdGVTdHJpbmcpCkluZGV4OiBKYXZhU2NyaXB0Q29yZS93dGYvRGF0 ZU1hdGguaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS93dGYvRGF0ZU1hdGguaAkocmV2 aXNpb24gNzQzNzUpCisrKyBKYXZhU2NyaXB0Q29yZS93dGYvRGF0ZU1hdGguaAkod29ya2luZyBj b3B5KQpAQCAtNDcsNiArNDcsNyBAQAogI2luY2x1ZGUgPHRpbWUuaD4KICNpbmNsdWRlIDx3dGYv Q3VycmVudFRpbWUuaD4KICNpbmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4KKyNpbmNsdWRlIDx3 dGYvT3duQXJyYXlQdHIuaD4KICNpbmNsdWRlIDx3dGYvVW51c2VkUGFyYW0uaD4KIAogbmFtZXNw YWNlIFdURiB7CkBAIC0xMzIsMTEgKzEzMyw2IEBAIHN0cnVjdCBHcmVnb3JpYW5EYXRlVGltZSA6 IE5vbmNvcHlhYmxlIHsKICAgICB7CiAgICAgfQogCi0gICAgfkdyZWdvcmlhbkRhdGVUaW1lKCkK LSAgICB7Ci0gICAgICAgIGRlbGV0ZSBbXSB0aW1lWm9uZTsKLSAgICB9Ci0KICAgICBHcmVnb3Jp YW5EYXRlVGltZShFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IHRtJiBpblRtKQogICAgICAgICA6IHNl Y29uZChpblRtLnRtX3NlYykKICAgICAgICAgLCBtaW51dGUoaW5UbS50bV9taW4pCkBAIC0xNTcs OCArMTUzLDggQEAgc3RydWN0IEdyZWdvcmlhbkRhdGVUaW1lIDogTm9uY29weWFibGUgewogCiAj aWYgSEFWRShUTV9aT05FKQogICAgICAgICBpbnQgaW5ab25lU2l6ZSA9IHN0cmxlbihpblRtLnRt X3pvbmUpICsgMTsKLSAgICAgICAgdGltZVpvbmUgPSBuZXcgY2hhcltpblpvbmVTaXplXTsKLSAg ICAgICAgc3RybmNweSh0aW1lWm9uZSwgaW5UbS50bV96b25lLCBpblpvbmVTaXplKTsKKyAgICAg ICAgdGltZVpvbmUuc2V0KG5ldyBjaGFyW2luWm9uZVNpemVdKTsKKyAgICAgICAgc3RybmNweSh0 aW1lWm9uZS5nZXQoKSwgaW5UbS50bV96b25lLCBpblpvbmVTaXplKTsKICNlbHNlCiAgICAgICAg IHRpbWVab25lID0gMDsKICNlbmRpZgpAQCAtMTgzLDcgKzE3OSw3IEBAIHN0cnVjdCBHcmVnb3Jp YW5EYXRlVGltZSA6IE5vbmNvcHlhYmxlIHsKICAgICAgICAgcmV0LnRtX2dtdG9mZiA9IHN0YXRp Y19jYXN0PGxvbmc+KHV0Y09mZnNldCk7CiAjZW5kaWYKICNpZiBIQVZFKFRNX1pPTkUpCi0gICAg ICAgIHJldC50bV96b25lID0gdGltZVpvbmU7CisgICAgICAgIHJldC50bV96b25lID0gdGltZVpv bmUuZ2V0KCk7CiAjZW5kaWYKIAogICAgICAgICByZXR1cm4gcmV0OwpAQCAtMjAyLDExICsxOTgs MTEgQEAgc3RydWN0IEdyZWdvcmlhbkRhdGVUaW1lIDogTm9uY29weWFibGUgewogICAgICAgICBp c0RTVCA9IHJocy5pc0RTVDsKICAgICAgICAgdXRjT2Zmc2V0ID0gcmhzLnV0Y09mZnNldDsKICAg ICAgICAgaWYgKHJocy50aW1lWm9uZSkgewotICAgICAgICAgICAgaW50IGluWm9uZVNpemUgPSBz dHJsZW4ocmhzLnRpbWVab25lKSArIDE7Ci0gICAgICAgICAgICB0aW1lWm9uZSA9IG5ldyBjaGFy W2luWm9uZVNpemVdOwotICAgICAgICAgICAgc3RybmNweSh0aW1lWm9uZSwgcmhzLnRpbWVab25l LCBpblpvbmVTaXplKTsKKyAgICAgICAgICAgIGludCBpblpvbmVTaXplID0gc3RybGVuKHJocy50 aW1lWm9uZS5nZXQoKSkgKyAxOworICAgICAgICAgICAgdGltZVpvbmUuc2V0KG5ldyBjaGFyW2lu Wm9uZVNpemVdKTsKKyAgICAgICAgICAgIHN0cm5jcHkodGltZVpvbmUuZ2V0KCksIHJocy50aW1l Wm9uZS5nZXQoKSwgaW5ab25lU2l6ZSk7CiAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAgdGlt ZVpvbmUgPSAwOworICAgICAgICAgICAgdGltZVpvbmUuY2xlYXIoKTsKICAgICB9CiAKICAgICBp bnQgc2Vjb25kOwpAQCAtMjE5LDcgKzIxNSw3IEBAIHN0cnVjdCBHcmVnb3JpYW5EYXRlVGltZSA6 IE5vbmNvcHlhYmxlIHsKICAgICBpbnQgeWVhcjsKICAgICBpbnQgaXNEU1Q7CiAgICAgaW50IHV0 Y09mZnNldDsKLSAgICBjaGFyKiB0aW1lWm9uZTsKKyAgICBPd25BcnJheVB0cjxjaGFyPiB0aW1l Wm9uZTsKIH07CiAKIHN0YXRpYyBpbmxpbmUgaW50IGdtdG9mZnNldChjb25zdCBHcmVnb3JpYW5E YXRlVGltZSYgdCkK