From cf581db7ab6f5cc08a36bfed732b1f0b7295ea7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= <dhrdlicka@users.noreply.github.com>
Date: Wed, 15 Apr 2020 23:42:20 +0200
Subject: [PATCH] prt_ps: Rewrite non-printable character processing Should fix
 hangs and slowdowns during printing.

---
 src/printer/prt_ps.c | 60 ++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 33 deletions(-)

diff --git a/src/printer/prt_ps.c b/src/printer/prt_ps.c
index 1003907c3..ffbcdddff 100644
--- a/src/printer/prt_ps.c
+++ b/src/printer/prt_ps.c
@@ -246,45 +246,39 @@ ps_write_data(uint8_t val, void *p)
     dev->data = (char) val;
 }
 
-static bool
-process_nonprintable(ps_t *dev)
-{
-	switch (dev->data) {
-		case '\b':
-			dev->buffer_pos--;
-			break;
-		case '\r':
-			dev->buffer_pos = 0;
-			if (dev->autofeed)
-				write_buffer(dev, true);
-			break;
-		case '\v':
-		case '\f':
-		case '\n':
-			write_buffer(dev, true);
-			break;
-		case 0x04:	// Ctrl+D
-			write_buffer(dev, false);
-			finish_document(dev);
-			break;
-		
-		/* Characters that should be written to the buffer as-is */
-		case '\t':
-			return false;
-	}
-
-	return true;
-}
-
 static void
 process_data(ps_t *dev)
 {
+    /* Check for non-printable characters */
     if (dev->data < 0x20 || dev->data == 0x7F) {
-	if (process_nonprintable(dev))
-		return;
+	switch (dev->data) {
+		/* The following characters are considered white-space
+		   by the PostScript specification */
+		case '\t':
+		case '\n':
+		case '\f':
+		case '\r':
+			break;
+
+		/* Same with NUL, except we better change it to a space first */
+		case '\0':
+			dev->data = ' ';
+			break;
+
+		/* Ctrl+D (0x04) marks the end of the document */
+		case '\4':
+			write_buffer(dev, false);
+			finish_document(dev);
+			return;
+
+		/* Don't bother with the others */
+		default:
+			return;
+	}
     }
 
-    if (dev->buffer_pos == POSTSCRIPT_BUFFER_LENGTH) {
+    /* Flush the buffer if we have run to its end */
+    if (dev->buffer_pos == POSTSCRIPT_BUFFER_LENGTH - 1) {
 	write_buffer(dev, false);
 	dev->buffer_pos = 0;
     }