CHANGES.md

@@ -6,7 +6,6 @@ v1.3.2 - YYYY-MM-DD
 -------------------
 
 - Added some more sanity checks to the TrueType font reader.
-- Fixed an issue when opening certain encrypted PDF files (Issue #62)
 
 
 v1.3.1 - 2024-08-05

pdfio-array.c

@@ -363,9 +363,6 @@ _pdfioArrayDebug(pdfio_array_t *a,	// I - Array
   _pdfio_value_t	*v;		// Current value
 
 
-  if (!a)
-    return;
-
   putc('[', fp);
   for (i = a->num_values, v = a->values; i > 0; i --, v ++)
     _pdfioValueDebug(v, fp);

pdfio-dict.c

@@ -194,9 +194,6 @@ _pdfioDictDebug(pdfio_dict_t *dict,	// I - Dictionary
   _pdfio_pair_t	*pair;			// Current pair
 
 
-  if (!dict)
-    return;
-
   for (i = dict->num_pairs, pair = dict->pairs; i > 0; i --, pair ++)
   {
     fprintf(fp, "/%s", pair->key);

pdfio-file.c

@@ -188,8 +188,6 @@ pdfioFileCreate(
   int		fd;			// File descriptor
 
 
-  PDFIO_DEBUG("pdfioFileCreate(filename=\"%s\", version=\"%s\", media_box=%p, crop_box=%p, error_cb=%p, error_cbdata=%p)\n", filename, version, (void *)media_box, (void *)crop_box, (void *)error_cb, (void *)error_cbdata);
-
   // Range check input...
   if (!filename)
     return (NULL);
@@ -392,8 +390,6 @@ pdfioFileCreateOutput(
     pdfio_error_cb_t  error_cb,		// I - Error callback or `NULL` for default
     void              *error_cbdata)	// I - Error callback data, if any
 {
-  PDFIO_DEBUG("pdfioFileCreate(output_cb=%p, output_cbdata=%p, version=\"%s\", media_box=%p, crop_box=%p, error_cb=%p, error_cbdata=%p)\n", (void *)output_cb, (void *)output_cbdata, version, (void *)media_box, (void *)crop_box, (void *)error_cb, (void *)error_cbdata);
-
   return (create_common("output.pdf", /*fd*/-1, output_cb, output_cbdata, version, media_box, crop_box, error_cb, error_cbdata));
 }
 
@@ -528,8 +524,6 @@ pdfioFileCreateTemporary(
   unsigned	tmpnum;			// Temporary filename number
 
 
-  PDFIO_DEBUG("pdfioFileCreate(buffer=%p, bufsize=%lu, version=\"%s\", media_box=%p, crop_box=%p, error_cb=%p, error_cbdata=%p)\n", (void *)buffer, (unsigned long)bufsize, version, (void *)media_box, (void *)crop_box, (void *)error_cb, (void *)error_cbdata);
-
   // Range check input...
   if (!buffer || bufsize < 32)
   {
@@ -654,12 +648,11 @@ pdfioFileFindObj(
   if ((current = number - 1) >= pdf->num_objs)
     current = pdf->num_objs / 2;
 
-  PDFIO_DEBUG("pdfioFileFindObj: objs[current=%lu]=%p(%lu)\n", (unsigned long)current, (void *)pdf->objs[current], (unsigned long)(pdf->objs[current] ? pdf->objs[current]->number : 0));
+  PDFIO_DEBUG("pdfioFileFindObj: objs[current=%lu]=%p\n", (unsigned long)current, (void *)pdf->objs[current]);
 
   if (number == pdf->objs[current]->number)
   {
     // Fast match...
-    PDFIO_DEBUG("pdfioFileFindObj: Returning %lu (%p)\n", (unsigned long)current, pdf->objs[current]);
     return (pdf->objs[current]);
   }
   else if (number < pdf->objs[current]->number)
@@ -686,20 +679,11 @@ pdfioFileFindObj(
   }
 
   if (number == pdf->objs[left]->number)
-  {
-    PDFIO_DEBUG("pdfioFileFindObj: Returning %lu (%p)\n", (unsigned long)left, pdf->objs[left]);
     return (pdf->objs[left]);
-  }
   else if (number == pdf->objs[right]->number)
-  {
-    PDFIO_DEBUG("pdfioFileFindObj: Returning %lu (%p)\n", (unsigned long)right, pdf->objs[right]);
     return (pdf->objs[right]);
-  }
   else
-  {
-    PDFIO_DEBUG("pdfioFileFindObj: Returning NULL\n");
     return (NULL);
-  }
 }
 
 
@@ -944,8 +928,6 @@ pdfioFileOpen(
   off_t		xref_offset;		// Offset to xref table
 
 
-  PDFIO_DEBUG("pdfioFileOpen(filename=\"%s\", password_cb=%p, password_cbdata=%p, error_cb=%p, error_cbdata=%p)\n", filename, (void *)password_cb, (void *)password_cbdata, (void *)error_cb, (void *)error_cbdata);
-
   // Range check input...
   if (!filename)
     return (NULL);
@@ -1303,8 +1285,6 @@ create_common(
   unsigned char	id_value[16];		// File ID value
 
 
-  PDFIO_DEBUG("create_common(filename=\"%s\", fd=%d, output_cb=%p, output_cbdata=%p, version=\"%s\", media_box=%p, crop_box=%p, error_cb=%p, error_cbdata=%p)\n", filename, fd, (void *)output_cb, (void *)output_cbdata, version, (void *)media_box, (void *)crop_box, (void *)error_cb, (void *)error_cbdata);
-
   // Range check input...
   if (!filename || (fd < 0 && !output_cb))
     return (NULL);

pdfio-stream.c

@@ -408,7 +408,6 @@ _pdfioStreamOpen(pdfio_obj_t *obj,	// I - Object
   pdfio_stream_t	*st;		// Stream
   pdfio_dict_t		*dict = pdfioObjGetDict(obj);
 					// Object dictionary
-  const char		*type;		// Object type
 
 
   PDFIO_DEBUG("_pdfioStreamOpen(obj=%p(%u), decode=%s)\n", obj, (unsigned)obj->number, decode ? "true" : "false");
@@ -435,9 +434,7 @@ _pdfioStreamOpen(pdfio_obj_t *obj,	// I - Object
     return (NULL);
   }
 
-  type = pdfioObjGetType(obj);
-
-  if (obj->pdf->encryption && (!type || strcmp(type, "XRef")))
+  if (obj->pdf->encryption)
   {
     uint8_t	iv[64];			// Initialization vector
     size_t	ivlen;			// Length of initialization vector, if any
@@ -1072,6 +1069,11 @@ stream_read(pdfio_stream_t *st,		// I - Stream
 	_pdfioFileError(st->pdf, "Unable to decompress stream data for object %ld: %s", (long)st->obj->number, zstrerror(status));
 	return (-1);
       }
+      else if (avail_in == st->flate.avail_in && avail_out == st->flate.avail_out)
+      {
+	_pdfioFileError(st->pdf, "Corrupt stream data.");
+	return (-1);
+      }
 
       return (st->flate.next_out - (Bytef *)buffer);
     }

pdfio-value.c

@@ -215,9 +215,6 @@ void
 _pdfioValueDebug(_pdfio_value_t *v,	// I - Value
 		 FILE           *fp)	// I - Output file
 {
-  if (!v)
-    return;
-
   switch (v->type)
   {
     case PDFIO_VALTYPE_ARRAY :