|
 |
ea5d11 |
From 950c602dc2dbbcbf5a856e85dba99bc8ac8420b9 Mon Sep 17 00:00:00 2001
|
|
|
ea5d11 |
From: Chris Liddell <chris.liddell@artifex.com>
|
|
|
ea5d11 |
Date: Sat, 5 Mar 2016 14:56:03 -0800
|
|
|
ea5d11 |
Subject: [PATCH 1/1] Bug 694724: Have filenameforall and getenv honor SAFER
|
|
|
ea5d11 |
|
|
|
ea5d11 |
---
|
|
|
ea5d11 |
Resource/Init/gs_init.ps | 1 +
|
|
|
ea5d11 |
psi/zfile.c | 36 ++++++++++++++++++++----------------
|
|
|
ea5d11 |
2 files changed, 21 insertions(+), 16 deletions(-)
|
|
|
ea5d11 |
|
|
|
ea5d11 |
diff --git a/Resource/Init/gs_init.ps b/Resource/Init/gs_init.ps
|
|
|
ea5d11 |
index c3f567d..abb9489 100644
|
|
|
ea5d11 |
--- a/Resource/Init/gs_init.ps
|
|
|
ea5d11 |
+++ b/Resource/Init/gs_init.ps
|
|
|
ea5d11 |
@@ -2019,6 +2019,7 @@ readonly def
|
|
|
ea5d11 |
/LockFilePermissions //true
|
|
|
ea5d11 |
>> setuserparams
|
|
|
ea5d11 |
}
|
|
|
ea5d11 |
+ systemdict /getenv {pop //false} put
|
|
|
ea5d11 |
if
|
|
|
ea5d11 |
% setpagedevice has the side effect of clearing the page, but
|
|
|
ea5d11 |
% we will just document that. Using setpagedevice keeps the device
|
|
|
ea5d11 |
diff --git a/psi/zfile.c b/psi/zfile.c
|
|
|
ea5d11 |
index 4011789..dd05919 100644
|
|
|
ea5d11 |
--- a/psi/zfile.c
|
|
|
ea5d11 |
+++ b/psi/zfile.c
|
|
|
ea5d11 |
@@ -371,22 +371,26 @@ file_continue(i_ctx_t *i_ctx_p)
|
|
|
ea5d11 |
|
|
|
ea5d11 |
if (len < devlen)
|
|
|
ea5d11 |
return_error(e_rangecheck); /* not even room for device len */
|
|
|
ea5d11 |
- memcpy((char *)pscratch->value.bytes, iodev->dname, devlen);
|
|
|
ea5d11 |
- code = iodev->procs.enumerate_next(pfen, (char *)pscratch->value.bytes + devlen,
|
|
|
ea5d11 |
- len - devlen);
|
|
|
ea5d11 |
- if (code == ~(uint) 0) { /* all done */
|
|
|
ea5d11 |
- esp -= 5; /* pop proc, pfen, devlen, iodev , mark */
|
|
|
ea5d11 |
- return o_pop_estack;
|
|
|
ea5d11 |
- } else if (code > len) /* overran string */
|
|
|
ea5d11 |
- return_error(e_rangecheck);
|
|
|
ea5d11 |
- else {
|
|
|
ea5d11 |
- push(1);
|
|
|
ea5d11 |
- ref_assign(op, pscratch);
|
|
|
ea5d11 |
- r_set_size(op, code + devlen);
|
|
|
ea5d11 |
- push_op_estack(file_continue); /* come again */
|
|
|
ea5d11 |
- *++esp = pscratch[2]; /* proc */
|
|
|
ea5d11 |
- return o_push_estack;
|
|
|
ea5d11 |
- }
|
|
|
ea5d11 |
+
|
|
|
ea5d11 |
+ do {
|
|
|
ea5d11 |
+ memcpy((char *)pscratch->value.bytes, iodev->dname, devlen);
|
|
|
ea5d11 |
+ code = iodev->procs.enumerate_next(pfen, (char *)pscratch->value.bytes + devlen,
|
|
|
ea5d11 |
+ len - devlen);
|
|
|
ea5d11 |
+ if (code == ~(uint) 0) { /* all done */
|
|
|
ea5d11 |
+ esp -= 5; /* pop proc, pfen, devlen, iodev , mark */
|
|
|
ea5d11 |
+ return o_pop_estack;
|
|
|
ea5d11 |
+ } else if (code > len) /* overran string */
|
|
|
ea5d11 |
+ return_error(gs_error_rangecheck);
|
|
|
ea5d11 |
+ else if (iodev != iodev_default(imemory)
|
|
|
ea5d11 |
+ || (check_file_permissions_reduced(i_ctx_p, (char *)pscratch->value.bytes, code + devlen, "PermitFileReading")) == 0) {
|
|
|
ea5d11 |
+ push(1);
|
|
|
ea5d11 |
+ ref_assign(op, pscratch);
|
|
|
ea5d11 |
+ r_set_size(op, code + devlen);
|
|
|
ea5d11 |
+ push_op_estack(file_continue); /* come again */
|
|
|
ea5d11 |
+ *++esp = pscratch[2]; /* proc */
|
|
|
ea5d11 |
+ return o_push_estack;
|
|
|
ea5d11 |
+ }
|
|
|
ea5d11 |
+ } while(1);
|
|
|
ea5d11 |
}
|
|
|
ea5d11 |
/* Cleanup procedure for enumerating files */
|
|
|
ea5d11 |
static int
|
|
|
ea5d11 |
--
|
|
|
ea5d11 |
2.7.4
|
|
|
ea5d11 |
|