diff options
author | jlam <jlam> | 2005-09-22 14:14:04 +0000 |
---|---|---|
committer | jlam <jlam> | 2005-09-22 14:14:04 +0000 |
commit | 5f78e5e082543e80c4f663a1b5435c3238585211 (patch) | |
tree | 904249f4e609176a24b66806361ba383c18078e1 /www/firefox/patches/patch-ao | |
parent | b53908eae58f8375ea16005fd8c7777224d3d902 (diff) | |
download | pkgsrc-5f78e5e082543e80c4f663a1b5435c3238585211.tar.gz |
Update www/firefox and www/firefox-gtk1 to version 1.0.7. Changes from
version 1.0.6 include:
* Fix for a potential buffer overflow vulnerability when loading a
hostname with all soft-hyphens
* Fix to prevent URLs passed from external programs from being
parsed by the shell (Linux only)
* Fix to prevent a crash when loading a Proxy Auto-Config (PAC)
script that uses an "eval" statement
* Fix to restore InstallTrigger.getVersion() for Extension authors
* Other stability and security fixes
Approved by taya.
Diffstat (limited to 'www/firefox/patches/patch-ao')
-rw-r--r-- | www/firefox/patches/patch-ao | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/www/firefox/patches/patch-ao b/www/firefox/patches/patch-ao index 9e4bca5a44d..5ee8adeb651 100644 --- a/www/firefox/patches/patch-ao +++ b/www/firefox/patches/patch-ao @@ -1,9 +1,8 @@ -$NetBSD: patch-ao,v 1.2 2004/06/23 16:47:12 taya Exp $ +$NetBSD: patch-ao,v 1.3 2005/09/22 14:14:04 jlam Exp $ -diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11shared/nsFontFreeType.cpp ---- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp 2003-12-25 17:24:52.000000000 +0900 -+++ ./gfx/src/x11shared/nsFontFreeType.cpp 2004-06-15 23:56:14.000000000 +0900 -@@ -177,7 +177,7 @@ +--- gfx/src/x11shared/nsFontFreeType.cpp.orig 2003-12-25 08:24:52.000000000 +0000 ++++ gfx/src/x11shared/nsFontFreeType.cpp +@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace() FTC_Manager mgr; nsresult rv; mFt2->GetFTCacheManager(&mgr); @@ -12,7 +11,7 @@ diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11share NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size"); if (NS_FAILED(rv)) return nsnull; -@@ -191,22 +191,15 @@ +@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy PRBool embedded_bimap = PR_FALSE; mFaceID = aFaceID; mPixelSize = aPixelSize; @@ -39,7 +38,7 @@ diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11share PRUint32 num_embedded_bitmaps, i; PRInt32* embedded_bitmapheights; mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps, -@@ -218,7 +211,6 @@ +@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy if (embedded_bitmapheights[i] == aPixelSize) { embedded_bimap = PR_TRUE; // unhinted must be set for embedded bitmaps to be used @@ -47,7 +46,7 @@ diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11share break; } } -@@ -312,7 +304,7 @@ +@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con if (!face) return NS_ERROR_FAILURE; @@ -56,7 +55,7 @@ diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11share mFt2->GetImageCache(&icache); if (!icache) return NS_ERROR_FAILURE; -@@ -401,7 +393,7 @@ +@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar if (!face) return 0; @@ -65,7 +64,7 @@ diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11share mFt2->GetImageCache(&icache); if (!icache) return 0; -@@ -723,7 +715,7 @@ +@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2); #endif |