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 be6b69c41c18c951ab65b9dccf3c14553be4256f..e5863890371adb00364bb0b41e1294f7ede85cb0 100644 (file)
--- 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 afb787d43c8e10dccdb83f3ad84a3c905c63aa2d..f5c4159bf692f929607e7297b6a8bd38811c43a8 100644 (file)
--- 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) {