From cf074c2a6d01eb816b4ef9f25003218c62576f29 Mon Sep 17 00:00:00 2001
From: Ken Sharp <Ken.Sharp@artifex.com>
Date: Tue, 26 Mar 2024 12:07:18 +0000
Subject: [PATCH 2/2] Bug 707691 part 2

See bug thread for details

This is the second part of the fix for CVE-2024-33869
---
 base/gpmisc.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/base/gpmisc.c b/base/gpmisc.c
index 48fb5278f..ca8cb0a71 100644
--- a/base/gpmisc.c
+++ b/base/gpmisc.c
@@ -1091,6 +1091,27 @@ gp_validate_path_len(const gs_memory_t *mem,
         rlen = len;
     }
     else {
+        char *test = (char *)path, *test1;
+        uint tlen = len, slen;
+
+        /* Look for any pipe (%pipe% or '|' specifications between path separators
+         * Reject any path spec which has a %pipe% or '|' anywhere except at the start.
+         */
+        while (tlen > 0) {
+            if (test[0] == '|' || (tlen > 5 && memcmp(test, "%pipe", 5) == 0)) {
+                code = gs_note_error(gs_error_invalidfileaccess);
+                goto exit;
+            }
+            test1 = test;
+            slen = search_separator((const char **)&test, path + len, test1, 1);
+            if(slen == 0)
+                break;
+            test += slen;
+            tlen -= test - test1;
+            if (test >= path + len)
+                break;
+        }
+
         rlen = len+1;
         bufferfull = (char *)gs_alloc_bytes(mem->thread_safe_memory, rlen + prefix_len, "gp_validate_path");
         if (bufferfull == NULL)
-- 
2.39.3