pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/firefox3 Add a patch to avoid a crash reported by ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bcedd861c237
branches:  trunk
changeset: 553858:bcedd861c237
user:      martin <martin%pkgsrc.org@localhost>
date:      Sun Feb 01 13:03:58 2009 +0000

description:
Add a patch to avoid a crash reported by Raymond Meyer and filed upstream as
Bugzilla Ticket 476345.

diffstat:

 www/firefox3/distinfo         |   3 ++-
 www/firefox3/patches/patch-el |  36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletions(-)

diffs (57 lines):

diff -r 3e7446326943 -r bcedd861c237 www/firefox3/distinfo
--- a/www/firefox3/distinfo     Sun Feb 01 12:37:37 2009 +0000
+++ b/www/firefox3/distinfo     Sun Feb 01 13:03:58 2009 +0000
@@ -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-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 -r 3e7446326943 -r bcedd861c237 www/firefox3/patches/patch-el
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox3/patches/patch-el     Sun Feb 01 13:03:58 2009 +0000
@@ -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)                                         \



Home | Main Index | Thread Index | Old Index