Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--pdf/xpdf/XRef.cc3
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index be6b69c..e586389 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-19 Marco Pesenti Gritti <marco@gnome.org>
+
+ * pdf/xpdf/XRef.cc:
+
+ Fix CAN-2005-0064
+
Wed Jan 19 01:10:57 2005 Jonathan Blandford <jrb@redhat.com>
* backend/Makefile.am:
diff --git a/pdf/xpdf/XRef.cc b/pdf/xpdf/XRef.cc
index afb787d..f5c4159 100644
--- a/pdf/xpdf/XRef.cc
+++ b/pdf/xpdf/XRef.cc
@@ -819,6 +819,9 @@ GBool XRef::checkEncrypted(GString *ownerPassword, GString *userPassword) {
} else {
keyLength = 5;
}
+ if (keyLength > 16) {
+ keyLength = 16;
+ }
permFlags = permissions.getInt();
if (encVersion >= 1 && encVersion <= 2 &&
encRevision >= 2 && encRevision <= 3) {