diff options
author | taya <taya> | 2005-04-07 23:48:36 +0000 |
---|---|---|
committer | taya <taya> | 2005-04-07 23:48:36 +0000 |
commit | d12929c2f882659f9146c3766dcceb55e76dbc11 (patch) | |
tree | a5fa5909365f90393e5a3836b65f108fb3dd96d7 /www | |
parent | 4620636e9ef46839d57b480d819fbca24abe72c3 (diff) | |
download | pkgsrc-d12929c2f882659f9146c3766dcceb55e76dbc11.tar.gz |
Add security fix to mozilla & mozilla-gtk2.
fixes "Mozilla Firefox JavaScript Engine Information Disclosure Vulnerability"
See following pages for detail.
http://secunia.com/advisories/14820/
https://bugzilla.mozilla.org/show_bug.cgi?id=288688
Bump PKGREVISION.
Diffstat (limited to 'www')
-rw-r--r-- | www/mozilla-gtk2/Makefile | 3 | ||||
-rw-r--r-- | www/mozilla/Makefile | 3 | ||||
-rw-r--r-- | www/mozilla/distinfo | 3 | ||||
-rw-r--r-- | www/mozilla/patches/patch-bugzilla288688 | 38 |
4 files changed, 44 insertions, 3 deletions
diff --git a/www/mozilla-gtk2/Makefile b/www/mozilla-gtk2/Makefile index 3880f2481cb..b4bcc096b6c 100644 --- a/www/mozilla-gtk2/Makefile +++ b/www/mozilla-gtk2/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.19 2005/04/02 14:38:15 abs Exp $ +# $NetBSD: Makefile,v 1.20 2005/04/07 23:48:36 taya Exp $ MOZILLA= mozilla-gtk2 MOZILLA_BIN= mozilla-bin MOZ_VER= 1.7.6 +PKGREVISION= 1 EXTRACT_SUFX= .tar.bz2 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 558dba1a211..d76d6bda45b 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.142 2005/03/24 14:08:28 taya Exp $ +# $NetBSD: Makefile,v 1.143 2005/04/07 23:48:36 taya Exp $ MOZILLA= mozilla MOZILLA_BIN= mozilla-bin MOZ_VER= 1.7.6 +PKGREVISION= 1 EXTRACT_SUFX= .tar.bz2 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo index ab274ae60fe..00ccc5f8417 100644 --- a/www/mozilla/distinfo +++ b/www/mozilla/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.73 2005/03/24 14:08:28 taya Exp $ +$NetBSD: distinfo,v 1.74 2005/04/07 23:48:36 taya Exp $ SHA1 (mozilla-source-1.7.6.tar.bz2) = 3c47a28173c912098ab37d3fc844451320463d00 RMD160 (mozilla-source-1.7.6.tar.bz2) = 3352d9a67213664bbe72bf1075420837028b3db4 @@ -28,6 +28,7 @@ SHA1 (patch-br) = 52d5b595f1e25ac5d6664864ab0cbe5e14012168 SHA1 (patch-bs) = fb9f8f13ce481c04a0f7ecfd0ad4d8016cddc2e4 SHA1 (patch-bt) = 70746626648624b38cc6e8795eb9c061be992342 SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee +SHA1 (patch-bugzilla288688) = cebe5ad483a4cfcd55c6be0f0823b75ed1bd4aba SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860 SHA1 (patch-bw) = fc3a518d3762be6e85104a6dc7fffd5ae1a463c8 SHA1 (patch-bx) = 046e19c9c4b431369411658373b14c1822841d85 diff --git a/www/mozilla/patches/patch-bugzilla288688 b/www/mozilla/patches/patch-bugzilla288688 new file mode 100644 index 00000000000..13eb93cbc26 --- /dev/null +++ b/www/mozilla/patches/patch-bugzilla288688 @@ -0,0 +1,38 @@ +$NetBSD: patch-bugzilla288688,v 1.1 2005/04/07 23:48:36 taya Exp $ + +diff -ru ../Orig/mozilla/js/src/jsstr.c ./js/src/jsstr.c +--- ../Orig/mozilla/js/src/jsstr.c 2003-12-22 15:13:07.000000000 +0900 ++++ ./js/src/jsstr.c 2005-04-06 23:33:09.000000000 +0900 +@@ -1378,11 +1378,17 @@ + JSBool ok; + + /* +- * Save the rightContext from the current regexp, since it +- * gets stuck at the end of the replacement string and may +- * be clobbered by a RegExp usage in the lambda function. ++ * Save the regExpStatics from the current regexp, since they may be ++ * clobbered by a RegExp usage in the lambda function. Note that all ++ * members of JSRegExpStatics are JSSubStrings, so not GC roots, save ++ * input, which is rooted otherwise via argv[-1] in str_replace. ++ * ++ * We need to clear moreParens in the top-of-stack cx->regExpStatics ++ * to it won't be possibly realloc'ed, leaving the bottom-of-stack ++ * moreParens pointing to freed memory. + */ +- JSSubString saveRightContext = cx->regExpStatics.rightContext; ++ JSRegExpStatics save = cx->regExpStatics; ++ cx->regExpStatics.moreParens = NULL; + + /* + * In the lambda case, not only do we find the replacement string's +@@ -1460,7 +1466,9 @@ + + lambda_out: + js_FreeStack(cx, mark); +- cx->regExpStatics.rightContext = saveRightContext; ++ if (cx->regExpStatics.moreParens) ++ JS_free(cx, cx->regExpStatics.moreParens); ++ cx->regExpStatics = save; + return ok; + } + #endif /* JS_HAS_REPLACE_LAMBDA */ |