Commit eb35353b332eb22fd0fda53c64303f74ba76fdaf
2023-07-10T10:41:00
wip
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132
diff --git a/libc3/buf_parse_u.c.in b/libc3/buf_parse_u.c.in
index e285c21..d4c3a24 100644
--- a/libc3/buf_parse_u.c.in
+++ b/libc3/buf_parse_u.c.in
@@ -95,6 +95,7 @@ sw buf_parse_u_bits$_base (s_buf *buf, const s_str *base,
sw result = 0;
s_buf_save save;
u_bits$ u = 0;
+ u_bits$ u2 = 0;
assert(buf);
assert(base);
assert(dest);
@@ -126,7 +127,8 @@ sw buf_parse_u_bits$_base (s_buf *buf, const s_str *base,
goto restore;
}
u *= radix;
- if (u > ((u_bits$) (U_BITS$_MAX - digit))) {
+ u2 = U_BITS$_MAX - digit;
+ if (u > u2) {
warnx("buf_parse_u_bits$_base: +: integer overflow");
r = -1;
goto restore;
diff --git a/libc3/buf_parse_u16.c b/libc3/buf_parse_u16.c
index 3c2f497..802890a 100644
--- a/libc3/buf_parse_u16.c
+++ b/libc3/buf_parse_u16.c
@@ -95,6 +95,7 @@ sw buf_parse_u16_base (s_buf *buf, const s_str *base,
sw result = 0;
s_buf_save save;
u16 u = 0;
+ u16 u2 = 0;
assert(buf);
assert(base);
assert(dest);
@@ -126,7 +127,8 @@ sw buf_parse_u16_base (s_buf *buf, const s_str *base,
goto restore;
}
u *= radix;
- if (u > ((u16) (U16_MAX - digit))) {
+ u2 = U16_MAX - digit;
+ if (u > u2) {
warnx("buf_parse_u16_base: +: integer overflow");
r = -1;
goto restore;
diff --git a/libc3/buf_parse_u32.c b/libc3/buf_parse_u32.c
index cf49de9..94992be 100644
--- a/libc3/buf_parse_u32.c
+++ b/libc3/buf_parse_u32.c
@@ -95,6 +95,7 @@ sw buf_parse_u32_base (s_buf *buf, const s_str *base,
sw result = 0;
s_buf_save save;
u32 u = 0;
+ u32 u2 = 0;
assert(buf);
assert(base);
assert(dest);
@@ -126,7 +127,8 @@ sw buf_parse_u32_base (s_buf *buf, const s_str *base,
goto restore;
}
u *= radix;
- if (u > ((u32) (U32_MAX - digit))) {
+ u2 = U32_MAX - digit;
+ if (u > u2) {
warnx("buf_parse_u32_base: +: integer overflow");
r = -1;
goto restore;
diff --git a/libc3/buf_parse_u64.c b/libc3/buf_parse_u64.c
index e648831..74da608 100644
--- a/libc3/buf_parse_u64.c
+++ b/libc3/buf_parse_u64.c
@@ -95,6 +95,7 @@ sw buf_parse_u64_base (s_buf *buf, const s_str *base,
sw result = 0;
s_buf_save save;
u64 u = 0;
+ u64 u2 = 0;
assert(buf);
assert(base);
assert(dest);
@@ -126,7 +127,8 @@ sw buf_parse_u64_base (s_buf *buf, const s_str *base,
goto restore;
}
u *= radix;
- if (u > ((u64) (U64_MAX - digit))) {
+ u2 = U64_MAX - digit;
+ if (u > u2) {
warnx("buf_parse_u64_base: +: integer overflow");
r = -1;
goto restore;
diff --git a/libc3/buf_parse_u8.c b/libc3/buf_parse_u8.c
index c71ef80..7284f5d 100644
--- a/libc3/buf_parse_u8.c
+++ b/libc3/buf_parse_u8.c
@@ -95,6 +95,7 @@ sw buf_parse_u8_base (s_buf *buf, const s_str *base,
sw result = 0;
s_buf_save save;
u8 u = 0;
+ u8 u2 = 0;
assert(buf);
assert(base);
assert(dest);
@@ -126,7 +127,8 @@ sw buf_parse_u8_base (s_buf *buf, const s_str *base,
goto restore;
}
u *= radix;
- if (u > ((u8) (U8_MAX - digit))) {
+ u2 = U8_MAX - digit;
+ if (u > u2) {
warnx("buf_parse_u8_base: +: integer overflow");
r = -1;
goto restore;
diff --git a/libc3/buf_parse_uw.c b/libc3/buf_parse_uw.c
index 4410d89..55d03d0 100644
--- a/libc3/buf_parse_uw.c
+++ b/libc3/buf_parse_uw.c
@@ -95,6 +95,7 @@ sw buf_parse_uw_base (s_buf *buf, const s_str *base,
sw result = 0;
s_buf_save save;
uw u = 0;
+ uw u2 = 0;
assert(buf);
assert(base);
assert(dest);
@@ -126,7 +127,8 @@ sw buf_parse_uw_base (s_buf *buf, const s_str *base,
goto restore;
}
u *= radix;
- if (u > ((uw) (UW_MAX - digit))) {
+ u2 = UW_MAX - digit;
+ if (u > u2) {
warnx("buf_parse_uw_base: +: integer overflow");
r = -1;
goto restore;