95 lines
2.7 KiB
Diff
95 lines
2.7 KiB
Diff
From 22cbc8a4e17ce61aa460c451a26e1bff2c3d2af9 Mon Sep 17 00:00:00 2001
|
|
From: Christian Brabandt <cb@256bit.org>
|
|
Date: Sun, 19 Nov 2023 10:47:21 +0100
|
|
Subject: [PATCH] patch 9.0.2114: overflow detection not accurate when adding
|
|
digits
|
|
|
|
Problem: overflow detection not accurate when adding digits
|
|
Solution: Use a helper function
|
|
|
|
Use a helper function to better detect overflows before adding integer
|
|
digits to a long or an integer variable respectively. Signal the
|
|
overflow to the caller function.
|
|
|
|
closes: #13539
|
|
|
|
Signed-off-by: Christian Brabandt <cb@256bit.org>
|
|
Signed-off-by: Michael Henry <vim@drmikehenry.com>
|
|
Signed-off-by: Ernie Rael <errael@raelity.com>
|
|
---
|
|
src/misc1.c | 25 +++++++++++++++++++++++--
|
|
src/normal.c | 3 +--
|
|
src/proto/misc1.pro | 2 ++
|
|
3 files changed, 26 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/misc1.c b/src/misc1.c
|
|
index 5f9828ebe9544..dc0deae67af93 100644
|
|
--- a/src/misc1.c
|
|
+++ b/src/misc1.c
|
|
@@ -951,9 +951,8 @@ get_number(
|
|
c = safe_vgetc();
|
|
if (VIM_ISDIGIT(c))
|
|
{
|
|
- if (n > INT_MAX / 10)
|
|
+ if (vim_append_digit_int(&n, c - '0') == FAIL)
|
|
return 0;
|
|
- n = n * 10 + c - '0';
|
|
msg_putchar(c);
|
|
++typed;
|
|
}
|
|
@@ -2755,3 +2754,25 @@ may_trigger_modechanged(void)
|
|
restore_v_event(v_event, &save_v_event);
|
|
#endif
|
|
}
|
|
+
|
|
+// For overflow detection, add a digit safely to an int value.
|
|
+ int
|
|
+vim_append_digit_int(int *value, int digit)
|
|
+{
|
|
+ int x = *value;
|
|
+ if (x > ((INT_MAX - digit) / 10))
|
|
+ return FAIL;
|
|
+ *value = x * 10 + digit;
|
|
+ return OK;
|
|
+}
|
|
+
|
|
+// For overflow detection, add a digit safely to a long value.
|
|
+ int
|
|
+vim_append_digit_long(long *value, int digit)
|
|
+{
|
|
+ long x = *value;
|
|
+ if (x > ((LONG_MAX - (long)digit) / 10))
|
|
+ return FAIL;
|
|
+ *value = x * 10 + (long)digit;
|
|
+ return OK;
|
|
+}
|
|
diff --git a/src/normal.c b/src/normal.c
|
|
index 16b4b45069329..61a19c13a43c9 100644
|
|
--- a/src/normal.c
|
|
+++ b/src/normal.c
|
|
@@ -2568,12 +2568,11 @@ nv_z_get_count(cmdarg_T *cap, int *nchar_arg)
|
|
n /= 10;
|
|
else if (VIM_ISDIGIT(nchar))
|
|
{
|
|
- if (n > LONG_MAX / 10)
|
|
+ if (vim_append_digit_long(&n, nchar - '0') == FAIL)
|
|
{
|
|
clearopbeep(cap->oap);
|
|
break;
|
|
}
|
|
- n = n * 10 + (nchar - '0');
|
|
}
|
|
else if (nchar == CAR)
|
|
{
|
|
diff --git a/src/proto/misc1.pro b/src/proto/misc1.pro
|
|
index b87b7ea747576..2b8e9d8f264cb 100644
|
|
--- a/src/proto/misc1.pro
|
|
+++ b/src/proto/misc1.pro
|
|
@@ -52,4 +52,6 @@ int path_with_url(char_u *fname);
|
|
dict_T *get_v_event(save_v_event_T *sve);
|
|
void restore_v_event(dict_T *v_event, save_v_event_T *sve);
|
|
void may_trigger_modechanged(void);
|
|
+int vim_append_digit_int(int *value, int digit);
|
|
+int vim_append_digit_long(long *value, int digit);
|
|
/* vim: set ft=c : */
|