|
 |
a5b3ec3 |
From bfa6b2ecbe48edc69a7d9d22a12419aed25960b8 Mon Sep 17 00:00:00 2001
|
|
|
a5b3ec3 |
From: Chris Liddell <chris.liddell@artifex.com>
|
|
|
a5b3ec3 |
Date: Thu, 6 Apr 2017 16:44:54 +0100
|
|
|
a5b3ec3 |
Subject: [PATCH] Bug 697548: use the correct param list enumerator
|
|
|
a5b3ec3 |
|
|
|
a5b3ec3 |
When we encountered dictionary in a ref_param_list, we were using the enumerator
|
|
|
a5b3ec3 |
for the "parent" param_list, rather than the enumerator for the param_list
|
|
|
a5b3ec3 |
we just created for the dictionary. That parent was usually the stack
|
|
|
a5b3ec3 |
list enumerator, and caused a segfault.
|
|
|
a5b3ec3 |
|
|
|
a5b3ec3 |
Using the correct enumerator works better.
|
|
|
a5b3ec3 |
---
|
|
|
a5b3ec3 |
psi/iparam.c | 7 ++++---
|
|
|
a5b3ec3 |
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
a5b3ec3 |
|
|
|
a5b3ec3 |
diff --git a/psi/iparam.c b/psi/iparam.c
|
|
|
a5b3ec3 |
index 4e63b6d..b2fa85f 100644
|
|
|
a5b3ec3 |
--- a/psi/iparam.c
|
|
|
a5b3ec3 |
+++ b/psi/iparam.c
|
|
|
a5b3ec3 |
@@ -770,12 +770,13 @@ ref_param_read_typed(gs_param_list * plist, gs_param_name pkey,
|
|
|
a5b3ec3 |
gs_param_enumerator_t enumr;
|
|
|
a5b3ec3 |
gs_param_key_t key;
|
|
|
a5b3ec3 |
ref_type keytype;
|
|
|
a5b3ec3 |
+ dict_param_list *dlist = (dict_param_list *) pvalue->value.d.list;
|
|
|
a5b3ec3 |
|
|
|
a5b3ec3 |
param_init_enumerator(&enumr);
|
|
|
a5b3ec3 |
- if (!(*((iparam_list *) plist)->enumerate)
|
|
|
a5b3ec3 |
- ((iparam_list *) pvalue->value.d.list, &enumr, &key, &keytype)
|
|
|
a5b3ec3 |
+ if (!(*(dlist->enumerate))
|
|
|
a5b3ec3 |
+ ((iparam_list *) dlist, &enumr, &key, &keytype)
|
|
|
a5b3ec3 |
&& keytype == t_integer) {
|
|
|
a5b3ec3 |
- ((dict_param_list *) pvalue->value.d.list)->int_keys = 1;
|
|
|
a5b3ec3 |
+ dlist->int_keys = 1;
|
|
|
a5b3ec3 |
pvalue->type = gs_param_type_dict_int_keys;
|
|
|
a5b3ec3 |
}
|
|
|
a5b3ec3 |
}
|
|
|
a5b3ec3 |
--
|
|
|
a5b3ec3 |
2.9.3
|
|
|
a5b3ec3 |
|