aboutsummaryrefslogtreecommitdiffstats
path: root/editors/calligra
diff options
context:
space:
mode:
authorlofi <lofi@FreeBSD.org>2005-01-21 07:22:58 +0800
committerlofi <lofi@FreeBSD.org>2005-01-21 07:22:58 +0800
commit18006a0b3fd0488ff380e18018d03572e12c27a0 (patch)
tree903a05ae486ef16212c1e332860e232516d261c8 /editors/calligra
parentb38fdb4081267e891aa4ad1e61da51598b06a04d (diff)
downloadfreebsd-ports-graphics-18006a0b3fd0488ff380e18018d03572e12c27a0.tar.gz
freebsd-ports-graphics-18006a0b3fd0488ff380e18018d03572e12c27a0.tar.zst
freebsd-ports-graphics-18006a0b3fd0488ff380e18018d03572e12c27a0.zip
Fix yet another buffer overflow in imported xpdf sources.
References: http://www.koffice.org/security/advisory-20050120-1.txt http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2005-0064 http://www.idefense.com/application/poi/display?id=186&type=vulnerabilities
Diffstat (limited to 'editors/calligra')
-rw-r--r--editors/calligra/Makefile2
-rw-r--r--editors/calligra/files/patch-post-1.3.5-koffice.diff15
2 files changed, 16 insertions, 1 deletions
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 3b6102eac61..b5ec778f322 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -8,7 +8,7 @@
PORTNAME= koffice
PORTVERSION= 1.3.5
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= editors kde
MASTER_SITES= ${MASTER_SITE_KDE}
diff --git a/editors/calligra/files/patch-post-1.3.5-koffice.diff b/editors/calligra/files/patch-post-1.3.5-koffice.diff
new file mode 100644
index 00000000000..4635b7562fa
--- /dev/null
+++ b/editors/calligra/files/patch-post-1.3.5-koffice.diff
@@ -0,0 +1,15 @@
+--- filters/kword/pdf/xpdf/xpdf/XRef.cc 30 Oct 2004 16:35:33 -0000 1.6
++++ filters/kword/pdf/xpdf/xpdf/XRef.cc 20 Jan 2005 17:36:38 -0000 1.8
+@@ -501,6 +501,12 @@ GBool XRef::checkEncrypted(GString *owne
+ } else {
+ keyLength = 5;
+ }
++ if (keyLength < 1) {
++ keyLength = 1;
++ }
++ if (keyLength > 16) {
++ keyLength = 16;
++ }
+ permFlags = permissions.getInt();
+ if (encVersion >= 1 && encVersion <= 2 &&
+ encRevision >= 2 && encRevision <= 3) {