circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-13 22:34:23 +00:00
Code Issues Projects Releases Wiki Activity

Fail an integer format expression with a NaN or out-of-range value, from

Browse Source 
someone in GitHub issue 5725.
This commit is contained in:
nicm
2026-10-12 10:53:59 +00:00
committed by tmux update bot
parent 7a2ea39a3e
commit 4caff240c8
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
format.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: format.c,v 1.425 2026/10/05 10:59:37 nicm Exp $ */ /* $OpenBSD: format.c,v 1.426 2026/10/12 10:53:59 nicm Exp $ */
/* /*
* Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -5785,6 +5785,17 @@ format_loop_clients(struct format_expand_state *es, const char *fmt)
return (value); return (value);
} }
/* Truncate a value to a long long, failing if it is NaN or out of range. */
static int
format_truncate_integer(double *v)
{
/* (double)LLONG_MAX is 2^63, which does not fit; -2^63 does. */
if (isnan(*v) || *v >= (double)LLONG_MAX || *v < (double)LLONG_MIN)
return (-1);
*v = (long long)*v;
return (0);
}
static char * static char *
format_replace_expression(struct format_modifier *mexp, format_replace_expression(struct format_modifier *mexp,
struct format_expand_state *es, const char *copy) struct format_expand_state *es, const char *copy)
@@ -5870,9 +5881,11 @@ format_replace_expression(struct format_modifier *mexp,
goto fail; goto fail;
} }
if (!use_fp) { if (!use_fp &&
mleft = (long long)mleft; (format_truncate_integer(&mleft) != 0 ||
mright = (long long)mright; format_truncate_integer(&mright) != 0)) {
format_log(es, "expression side is out of range");
goto fail;
} }
format_log(es, "expression left side is: %.*f", prec, mleft); format_log(es, "expression left side is: %.*f", prec, mleft);
format_log(es, "expression right side is: %.*f", prec, mright); format_log(es, "expression right side is: %.*f", prec, mright);
@@ -5912,10 +5925,11 @@ format_replace_expression(struct format_modifier *mexp,
result = (mleft <= mright); result = (mleft <= mright);
break; break;
} }
if (use_fp) if (!use_fp && format_truncate_integer(&result) != 0) {
xasprintf(&value, "%.*f", prec, result); format_log(es, "expression result is out of range");
else goto fail;
xasprintf(&value, "%.*f", prec, (double)(long long)result); }
xasprintf(&value, "%.*f", prec, result);
format_log(es, "expression result is %s", value); format_log(es, "expression result is %s", value);
free(right); free(right);