felixfoertsch/remind
1
0
Fork 0
mirror of https://salsa.debian.org/dskoll/remind.git synced 2026-04-16 06:18:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

If evaluating ordx(n) yields an error, then error out instead of continuing with ord(n)

Browse Source
This commit is contained in:
Dianne Skoll
2025-08-12 18:27:20 -04:00
parent 10f7889ef2
commit 0976cd64f3
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/funcs.c
View File

@@ -1168,21 +1168,24 @@ static int FOrd(func_info *info)
val.type = ERR_TYPE;
snprintf(buf, sizeof(buf), "ordx(%d)", ARGV(0));
n = parse_expression(&e, &r, NULL);
if (r == OK) {
in_ford = 1;
r = evaluate_expr_node(n, NULL, &val, &nonconst);
in_ford = 0;
if (r == OK) {
if (nonconst) info->nonconst = nonconst;
r = DoCoerce(STR_TYPE, &val);
if (r == OK) {
DCOPYVAL(RetVal, val);
return r;
}
DestroyValue(val);
}
free_expr_tree(n);
if (r != OK) {
return r;
}
in_ford = 1;
r = evaluate_expr_node(n, NULL, &val, &nonconst);
in_ford = 0;
free_expr_tree(n);
if (r != OK) {
return r;
}
if (nonconst) info->nonconst = nonconst;
r = DoCoerce(STR_TYPE, &val);
if (r != OK) {
DestroyValue(val);
return r;
}
DCOPYVAL(RetVal, val);
return OK;
}
v = ARGV(0);