diff options
| -rw-r--r-- | sys/src/cmd/gs/src/zfrsd.c | 22 | ||||
| -rw-r--r-- | sys/src/cmd/gs/src/zmisc3.c | 6 |
2 files changed, 21 insertions, 7 deletions
diff --git a/sys/src/cmd/gs/src/zfrsd.c b/sys/src/cmd/gs/src/zfrsd.c index ddff62162..17d3fb78a 100644 --- a/sys/src/cmd/gs/src/zfrsd.c +++ b/sys/src/cmd/gs/src/zfrsd.c @@ -47,13 +47,19 @@ zrsdparams(i_ctx_t *i_ctx_p) ref *pFilter; ref *pDecodeParms; int Intent; - bool AsyncRead; + bool AsyncRead = false; ref empty_array, filter1_array, parms1_array; uint i; - int code; + int code = 0; + + if (ref_stack_count(&o_stack) < 1) + return_error(e_stackunderflow); + if (!r_has_type(op, t_dictionary) && !r_has_type(op, t_null)) + return_error(e_typecheck); make_empty_array(&empty_array, a_readonly); - if (dict_find_string(op, "Filter", &pFilter) > 0) { + if (r_has_type(op, t_dictionary) + && dict_find_string(op, "Filter", &pFilter) > 0) { if (!r_is_array(pFilter)) { if (!r_has_type(pFilter, t_name)) return_error(e_typecheck); @@ -92,10 +98,12 @@ zrsdparams(i_ctx_t *i_ctx_p) return_error(e_typecheck); } } - if ((code = dict_int_param(op, "Intent", 0, 3, 0, &Intent)) < 0 || - (code = dict_bool_param(op, "AsyncRead", false, &AsyncRead)) < 0 - ) - return code; + if (r_has_type(op, t_dictionary)) + code = dict_int_param(op, "Intent", 0, 3, 0, &Intent); + + if (r_has_type(op, t_dictionary)) + if ((code = dict_bool_param(op, "AsyncRead", false, &AsyncRead)) < 0) + return code; push(1); op[-1] = *pFilter; if (pDecodeParms) diff --git a/sys/src/cmd/gs/src/zmisc3.c b/sys/src/cmd/gs/src/zmisc3.c index 228932476..e9f056de6 100644 --- a/sys/src/cmd/gs/src/zmisc3.c +++ b/sys/src/cmd/gs/src/zmisc3.c @@ -55,6 +55,12 @@ zeqproc(i_ctx_t *i_ctx_p) ref2_t stack[MAX_DEPTH + 1]; ref2_t *top = stack; + if (ref_stack_count(&o_stack) < 2) + return_error(e_stackunderflow); + if (!r_is_array(op - 1) || !r_is_array(op)) { + return_error(e_typecheck); + } + make_array(&stack[0].proc1, 0, 1, op - 1); make_array(&stack[0].proc2, 0, 1, op); for (;;) { |