From: Marco Pesenti Gritti <marco@gnome.org>
Date: Wed, 19 Jan 2005 19:32:44 +0000 (+0000)
Subject: Fix CAN-2005-0064
X-Git-Tag: EVINCE_0_1_1~34
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=dd1c805ae5ff6e6379c67e1dca48affd1306b6e9;p=evince.git

Fix CAN-2005-0064

2005-01-19  Marco Pesenti Gritti  <marco@gnome.org>

        * pdf/xpdf/XRef.cc:

        Fix CAN-2005-0064
---

diff --git a/ChangeLog b/ChangeLog
index be6b69c4..e5863890 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 afb787d4..f5c4159b 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) {