diff options
| author | martin <martin> | 2009-02-01 13:03:58 +0000 |
|---|---|---|
| committer | martin <martin> | 2009-02-01 13:03:58 +0000 |
| commit | 22d7c2d04ddcde831f2f4d6973cfd3da8df2ec5a (patch) | |
| tree | 4b8e66fd70bfc7bf9b37cff07beef8823670a0fd /www/firefox3 | |
| parent | 1e27d1711abfed20535a658c0f6da47154fa0efa (diff) | |
| download | pkgsrc-22d7c2d04ddcde831f2f4d6973cfd3da8df2ec5a.tar.gz | |
Add a patch to avoid a crash reported by Raymond Meyer and filed upstream as
Bugzilla Ticket 476345.
Diffstat (limited to 'www/firefox3')
| -rw-r--r-- | www/firefox3/distinfo | 3 | ||||
| -rw-r--r-- | www/firefox3/patches/patch-el | 36 |
2 files changed, 38 insertions, 1 deletions
diff --git a/www/firefox3/distinfo b/www/firefox3/distinfo index 7d574fef4ab..5d6433a9a01 100644 --- a/www/firefox3/distinfo +++ b/www/firefox3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2009/01/05 09:58:36 martin Exp $ +$NetBSD: distinfo,v 1.13 2009/02/01 13:03:58 martin Exp $ SHA1 (firefox-3.0.5-source.tar.bz2) = f934e073efaad3d4dde847c8491fa9529564d5d2 RMD160 (firefox-3.0.5-source.tar.bz2) = ec6e7eab65649c5c79587a5a8ffb9b6b386b5a18 @@ -40,6 +40,7 @@ SHA1 (patch-eh) = 60aca7f94ee04c957386014f7d4df9e3c8ac8ff1 SHA1 (patch-ei) = 4484d57e19e39ef86760716d5886ebf2a3e69f63 SHA1 (patch-ej) = 9b9c708483399fa89c6bf5bdc15e79b31793c89d SHA1 (patch-ek) = b94debcf16ba6f0dccc0a812b5e5fa38a150c413 +SHA1 (patch-el) = 126d7acb14e34939782301c6ed204a10448d91b2 SHA1 (patch-wc) = 2de8665ed6c23c26566ca6d50165c0cf413a753d SHA1 (patch-wd) = fc5c3103ae6f2a2eccc01911a8207f3ca614008b SHA1 (patch-we) = f7fecce05454e9794ff7a4e7789031a5ef49c42d diff --git a/www/firefox3/patches/patch-el b/www/firefox3/patches/patch-el new file mode 100644 index 00000000000..04e77ac0927 --- /dev/null +++ b/www/firefox3/patches/patch-el @@ -0,0 +1,36 @@ +$NetBSD: patch-el,v 1.1 2009/02/01 13:03:58 martin Exp $ + +# hack to solve upstream bug report +# https://bugzilla.mozilla.org/show_bug.cgi?id=476345 +# untill something better gets commited upstream. + + +--- layout/style/nsCSSValue.h.orig 2008-07-02 00:51:43.000000000 +0200 ++++ layout/style/nsCSSValue.h 2009-02-01 12:00:17.000000000 +0100 +@@ -342,18 +342,23 @@ public: + PRUint16 mRefCnt; + PRUint16 mCount; + ++ static size_t alignSize(size_t aSelfSize) { ++ if (aSelfSize < sizeof(void*)) return sizeof (void*); ++ return aSelfSize; ++ } ++ + void* operator new(size_t aSelfSize, PRUint16 aItemCount) CPP_THROW_NEW { +- return ::operator new(aSelfSize + sizeof(nsCSSValue)*aItemCount); ++ return ::operator new(alignSize(aSelfSize) + sizeof(nsCSSValue)*aItemCount); + } + + void operator delete(void* aPtr) { ::operator delete(aPtr); } + + nsCSSValue* First() { +- return (nsCSSValue*) (((char*)this) + sizeof(*this)); ++ return (nsCSSValue*) (((char*)this) + alignSize(sizeof(*this))); + } + + const nsCSSValue* First() const { +- return (const nsCSSValue*) (((const char*)this) + sizeof(*this)); ++ return (const nsCSSValue*) (((const char*)this) + alignSize(sizeof(*this))); + } + + #define CSSVALUE_LIST_FOR_VALUES(var) \ |