empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(nstr_comp): Fix handling of condition type mismatch. This bug could

Browse source 
trigger oopses in nstr_exec().

(cond_type_mismatch): Clearer diagnostic message.
This commit is contained in:
Markus Armbruster 2004-05-16 20:14:59 +00:00
parent 654799a8b0
commit eb9d384111
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/lib/subs/nstr.c
View file

@ -86,6 +86,7 @@ nstr_comp(struct nscstr *np, int len, int type, char *str)
/* find operator type, coerce operands */ /* find operator type, coerce operands */
lft_type = nstr_promote(np->lft.val_type); lft_type = nstr_promote(np->lft.val_type);
rgt_type = nstr_promote(np->rgt.val_type); rgt_type = nstr_promote(np->rgt.val_type);
np->optype = NSC_NOTYPE;
if (lft_type == NSC_TYPEID) { if (lft_type == NSC_TYPEID) {
if (!nstr_coerce_val(&np->rgt, NSC_TYPEID, str)) if (!nstr_coerce_val(&np->rgt, NSC_TYPEID, str))
np->optype = NSC_TYPEID; np->optype = NSC_TYPEID;
@ -109,6 +110,8 @@ nstr_comp(struct nscstr *np, int len, int type, char *str)
&& !nstr_coerce_val(&np->rgt, NSC_LONG, str)) && !nstr_coerce_val(&np->rgt, NSC_LONG, str))
np->optype = NSC_LONG; np->optype = NSC_LONG;
} }
if (np->optype == NSC_NOTYPE)
return -1;
/* another condition? */ /* another condition? */
if (*tail == 0) if (*tail == 0)
@ -317,7 +320,7 @@ static int
cond_type_mismatch(char *str) cond_type_mismatch(char *str)
{ {
if (str) if (str)
pr("%s -- condition type mismatch\n", str); pr("%s -- condition operand type mismatch\n", str);
return -1; return -1;
} }