Update changelog.

Update documentation.
Fix missing ivlen initializer for 40-bit RC4 (Issue #51 )
2025-04-30 12:26:46 +02:00 · 2023-11-15 10:14:02 -05:00 · 2023-11-15 09:28:57 -05:00 · 2023-11-15 08:43:07 -05:00 · 2023-11-15 08:38:47 -05:00
7 changed files with 26 additions and 11 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@ -2,10 +2,11 @@ Changes in PDFio
 ================


-v1.1.3 (Month DD, YYYY)
-----------------------
+v1.1.3 (November 15, 2023)
+--------------------------

 - Fixed Unicode font support (Issue #16)
+- Fixed missing initializer for 40-bit RC4 encryption (Issue #51)


 v1.1.2 (October 10, 2023)
--- a/doc/pdfio.3
+++ b/doc/pdfio.3
@ -1,4 +1,4 @@
-.TH pdfio 3 "pdf read/write library" "2023-10-06" "pdf read/write library"
+.TH pdfio 3 "pdf read/write library" "2023-11-15" "pdf read/write library"
 .SH NAME
 pdfio \- pdf read/write library
 .SH Introduction
--- a/doc/pdfio.html
+++ b/doc/pdfio.html
@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-<title>PDFio Programming Manual v1.1.2</title>
+<title>PDFio Programming Manual v1.1.3</title>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
 <meta name="generator" content="codedoc v3.7">
 <meta name="author" content="Michael R Sweet">
 <meta name="language" content="en-US">
 <meta name="copyright" content="Copyright © 2021-2023 by Michael R Sweet">
-<meta name="version" content="1.1.2">
+<meta name="version" content="1.1.3">
 <style type="text/css"><!--
 body {
  background: white;
@ -245,7 +245,7 @@ span.string {
 <body>
 <div class="header">
 <p><img class="title" src="pdfio-512.png"></p>
-<h1 class="title">PDFio Programming Manual v1.1.2</h1>
+<h1 class="title">PDFio Programming Manual v1.1.3</h1>
 <p>Michael R Sweet</p>
 <p>Copyright © 2021-2023 by Michael R Sweet</p>
 </div>
--- a/pdfio-common.c
+++ b/pdfio-common.c
@ -375,9 +375,9 @@ _pdfioFileSeek(pdfio_file_t *pdf,	// I - PDF file
    if (whence != SEEK_END && offset >= pdf->bufpos && offset < (pdf->bufpos + pdf->bufend - pdf->buffer))
    {
      // Yes, seek within existing buffer...
-      pdf->bufptr = pdf->buffer + offset - pdf->bufpos;
+      pdf->bufptr = pdf->buffer + (offset - pdf->bufpos);
      PDFIO_DEBUG("_pdfioFileSeek: Seek within buffer, bufpos=%ld.\n", (long)pdf->bufpos);
-      PDFIO_DEBUG("_pdfioFileSeek: buffer=%p, bufptr=%p, bufend=%p\n", pdf->buffer, pdf->bufptr, pdf->bufend);
+      PDFIO_DEBUG("_pdfioFileSeek: buffer=%p, bufptr=%p(<%02X%02X...>), bufend=%p\n", pdf->buffer, pdf->bufptr, pdf->bufptr[0] & 255, pdf->bufptr[1] & 255, pdf->bufend);
      return (offset);
    }

--- a/pdfio-crypto.c
+++ b/pdfio-crypto.c
@ -1,7 +1,7 @@
 //
 // Cryptographic support functions for PDFio.
 //
-// Copyright © 2021 by Michael R Sweet.
+// Copyright © 2021-2023 by Michael R Sweet.
 //
 // Licensed under Apache License v2.0.  See the file "LICENSE" for more
 // information.
@ -446,6 +446,7 @@ _pdfio_crypto_cb_t			// O  - Decryption callback or `NULL` for none

        // Initialize the RC4 context using 40 bits of the digest...
 	_pdfioCryptoRC4Init(&ctx->rc4, digest, 5);
+	*ivlen = 0;
 	return ((_pdfio_crypto_cb_t)_pdfioCryptoRC4Crypt);

    case PDFIO_ENCRYPTION_RC4_128 :
--- a/pdfio-file.c
+++ b/pdfio-file.c
@ -1514,6 +1514,7 @@ load_obj_stream(pdfio_obj_t *obj)	// I - Object to load

    // Skip offset
    _pdfioTokenGet(&tb, buffer, sizeof(buffer));
+    PDFIO_DEBUG("load_obj_stream: %ld at offset %s\n", (long)number, buffer);
  }

  if (!buffer[0])
@ -1865,9 +1866,19 @@ load_xref(
 		break;
 	    }

-	    if (i >= num_sobjs && num_sobjs < (sizeof(sobjs) / sizeof(sobjs[0])))
+	    if (i >= num_sobjs)
+	    {
+	      if (num_sobjs < (sizeof(sobjs) / sizeof(sobjs[0])))
+	      {
 		sobjs[num_sobjs ++] = (size_t)offset;
 	      }
+	      else
+	      {
+		_pdfioFileError(pdf, "Too many object streams.");
+	        return (false);
+	      }
+	    }
+	  }
 	  else if (!current)
 	  {
 	    // Add this object...
--- a/pdfio-stream.c
+++ b/pdfio-stream.c
@ -452,6 +452,7 @@ _pdfioStreamOpen(pdfio_obj_t *obj,	// I - Object
      return (NULL);
    }

+    PDFIO_DEBUG("_pdfioStreamOpen: ivlen=%d\n", (int)ivlen);
    if (ivlen > 0)
      _pdfioFileConsume(st->pdf, ivlen);

@ -567,6 +568,7 @@ _pdfioStreamOpen(pdfio_obj_t *obj,	// I - Object
      else
        st->predictor = _PDFIO_PREDICTOR_NONE;

+      PDFIO_DEBUG("_pdfioStreamOpen: pos=%ld\n", (long)_pdfioFileTell(st->pdf));
      if (sizeof(st->cbuffer) > st->remaining)
 	rbytes = _pdfioFileRead(st->pdf, st->cbuffer, st->remaining);
      else
Author	SHA1	Message	Date
Michael R Sweet	9fec2195d0	Update changelog.	2023-11-15 10:14:02 -05:00
Michael R Sweet	8ccbdaed94	Update documentation.	2023-11-15 09:28:57 -05:00
Michael R Sweet	4804db38a5	Fix missing ivlen initializer for 40-bit RC4 (Issue #51 )	2023-11-15 08:43:07 -05:00
Michael R Sweet	ddd984215a	Save work (debug printfs, etc.)	2023-11-15 08:38:47 -05:00