From cab74e938f70a0f3e815fa8bc320f40f788bd50b Mon Sep 17 00:00:00 2001
From: Sebastian Rasmussen <sebras@hotmail.com>
Date: Mon, 12 Apr 2010 00:37:05 +0200
Subject: Expect encryption object to be a dictionary instead of taking special
 care of null objects.

---
 mupdf/pdf_xref.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/mupdf/pdf_xref.c b/mupdf/pdf_xref.c
index 5c365f7f..c757fe82 100644
--- a/mupdf/pdf_xref.c
+++ b/mupdf/pdf_xref.c
@@ -138,11 +138,8 @@ pdf_decryptxref(pdf_xref *xref)
 	encrypt = fz_dictgets(xref->trailer, "Encrypt");
 	id = fz_dictgets(xref->trailer, "ID");
 
-	if (encrypt)
+	if (fz_isdict(encrypt))
 	{
-		if (fz_isnull(encrypt))
-			return fz_okay;
-
 		error = pdf_newcrypt(&xref->crypt, encrypt, id);
 		if (error)
 			return fz_rethrow(error, "cannot create decrypter");
-- 
cgit v1.2.3