117 lines
4.3 KiB
Diff
117 lines
4.3 KiB
Diff
--- base/gpmisc.c.orig 2022-04-04 15:48:49.000000000 +0200
|
|
+++ base/gpmisc.c 2023-07-04 08:13:02.173325373 +0200
|
|
@@ -1076,16 +1076,29 @@ gp_validate_path_len(const gs_memory_t *
|
|
&& !memcmp(path + cdirstrl, dirsepstr, dirsepstrl)) {
|
|
prefix_len = 0;
|
|
}
|
|
- rlen = len+1;
|
|
- bufferfull = (char *)gs_alloc_bytes(mem->thread_safe_memory, rlen + prefix_len, "gp_validate_path");
|
|
- if (bufferfull == NULL)
|
|
- return gs_error_VMerror;
|
|
|
|
- buffer = bufferfull + prefix_len;
|
|
- if (gp_file_name_reduce(path, (uint)len, buffer, &rlen) != gp_combine_success)
|
|
- return gs_error_invalidfileaccess;
|
|
- buffer[rlen] = 0;
|
|
+ /* "%pipe%" do not follow the normal rules for path definitions, so we
|
|
+ don't "reduce" them to avoid unexpected results
|
|
+ */
|
|
+ if (path[0] == '|' || (len > 5 && memcmp(path, "%pipe", 5) == 0)) {
|
|
+ bufferfull = buffer = (char *)gs_alloc_bytes(mem->thread_safe_memory, len + 1, "gp_validate_path");
|
|
+ if (buffer == NULL)
|
|
+ return gs_error_VMerror;
|
|
+ memcpy(buffer, path, len);
|
|
+ buffer[len] = 0;
|
|
+ rlen = len;
|
|
+ }
|
|
+ else {
|
|
+ rlen = len+1;
|
|
+ bufferfull = (char *)gs_alloc_bytes(mem->thread_safe_memory, rlen + prefix_len, "gp_validate_path");
|
|
+ if (bufferfull == NULL)
|
|
+ return gs_error_VMerror;
|
|
|
|
+ buffer = bufferfull + prefix_len;
|
|
+ if (gp_file_name_reduce(path, (uint)len, buffer, &rlen) != gp_combine_success)
|
|
+ return gs_error_invalidfileaccess;
|
|
+ buffer[rlen] = 0;
|
|
+ }
|
|
while (1) {
|
|
switch (mode[0])
|
|
{
|
|
--- base/gslibctx.c.orig 2022-04-04 15:48:49.000000000 +0200
|
|
+++ base/gslibctx.c 2023-07-04 08:09:47.834639430 +0200
|
|
@@ -740,14 +740,28 @@ gs_add_control_path_len_flags(const gs_m
|
|
return gs_error_rangecheck;
|
|
}
|
|
|
|
- rlen = len+1;
|
|
- buffer = (char *)gs_alloc_bytes(core->memory, rlen, "gp_validate_path");
|
|
- if (buffer == NULL)
|
|
- return gs_error_VMerror;
|
|
-
|
|
- if (gp_file_name_reduce(path, (uint)len, buffer, &rlen) != gp_combine_success)
|
|
- return gs_error_invalidfileaccess;
|
|
- buffer[rlen] = 0;
|
|
+ /* "%pipe%" do not follow the normal rules for path definitions, so we
|
|
+ don't "reduce" them to avoid unexpected results
|
|
+ */
|
|
+ if (path[0] == '|' || (len > 5 && memcmp(path, "%pipe", 5) == 0)) {
|
|
+ buffer = (char *)gs_alloc_bytes(core->memory, len + 1, "gs_add_control_path_len");
|
|
+ if (buffer == NULL)
|
|
+ return gs_error_VMerror;
|
|
+ memcpy(buffer, path, len);
|
|
+ buffer[len] = 0;
|
|
+ rlen = len;
|
|
+ }
|
|
+ else {
|
|
+ rlen = len + 1;
|
|
+
|
|
+ buffer = (char *)gs_alloc_bytes(core->memory, rlen, "gs_add_control_path_len");
|
|
+ if (buffer == NULL)
|
|
+ return gs_error_VMerror;
|
|
+
|
|
+ if (gp_file_name_reduce(path, (uint)len, buffer, &rlen) != gp_combine_success)
|
|
+ return gs_error_invalidfileaccess;
|
|
+ buffer[rlen] = 0;
|
|
+ }
|
|
|
|
n = control->num;
|
|
for (i = 0; i < n; i++)
|
|
@@ -833,14 +847,28 @@ gs_remove_control_path_len_flags(const g
|
|
return gs_error_rangecheck;
|
|
}
|
|
|
|
- rlen = len+1;
|
|
- buffer = (char *)gs_alloc_bytes(core->memory, rlen, "gp_validate_path");
|
|
- if (buffer == NULL)
|
|
- return gs_error_VMerror;
|
|
-
|
|
- if (gp_file_name_reduce(path, (uint)len, buffer, &rlen) != gp_combine_success)
|
|
- return gs_error_invalidfileaccess;
|
|
- buffer[rlen] = 0;
|
|
+ /* "%pipe%" do not follow the normal rules for path definitions, so we
|
|
+ don't "reduce" them to avoid unexpected results
|
|
+ */
|
|
+ if (path[0] == '|' || (len > 5 && memcmp(path, "%pipe", 5) == 0)) {
|
|
+ buffer = (char *)gs_alloc_bytes(core->memory, len + 1, "gs_remove_control_path_len");
|
|
+ if (buffer == NULL)
|
|
+ return gs_error_VMerror;
|
|
+ memcpy(buffer, path, len);
|
|
+ buffer[len] = 0;
|
|
+ rlen = len;
|
|
+ }
|
|
+ else {
|
|
+ rlen = len+1;
|
|
+
|
|
+ buffer = (char *)gs_alloc_bytes(core->memory, rlen, "gs_remove_control_path_len");
|
|
+ if (buffer == NULL)
|
|
+ return gs_error_VMerror;
|
|
+
|
|
+ if (gp_file_name_reduce(path, (uint)len, buffer, &rlen) != gp_combine_success)
|
|
+ return gs_error_invalidfileaccess;
|
|
+ buffer[rlen] = 0;
|
|
+ }
|
|
|
|
n = control->num;
|
|
for (i = 0; i < n; i++) {
|