https://gcc.gnu.org/g:2b8ecbfe2ce6558637d42fdcb7efb3f878feb56b
commit r15-6039-g2b8ecbfe2ce6558637d42fdcb7efb3f878feb56b
Author: Heiko Eißfeldt <he...@hexco.de>
Date: Mon Dec 9 10:39:50 2024 +0100
replace atoi with stroul in c_parser_gimple_parse_bb_spec [PR114541]
The full treatment of these invalid values was considered out of
scope for this patch.
PR c/114541
* gimple-parser.cc (c_parser_gimple_parse_bb_spec):
Use strtoul with ERANGE check instead of atoi to avoid UB
and detect invalid __BB#.
Signed-off-by: Heiko Eißfeldt <he...@hexco.de>
Diff:
---
gcc/c/gimple-parser.cc | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/gcc/c/gimple-parser.cc b/gcc/c/gimple-parser.cc
index 78e85d934879..1a677fc26c78 100644
--- a/gcc/c/gimple-parser.cc
+++ b/gcc/c/gimple-parser.cc
@@ -133,11 +133,21 @@ c_parser_gimple_parse_bb_spec (tree val, int *index)
{
if (!startswith (IDENTIFIER_POINTER (val), "__BB"))
return false;
- for (const char *p = IDENTIFIER_POINTER (val) + 4; *p; ++p)
- if (!ISDIGIT (*p))
- return false;
- *index = atoi (IDENTIFIER_POINTER (val) + 4);
- return *index > 0;
+
+ const char *bb = IDENTIFIER_POINTER (val) + 4;
+ if (! ISDIGIT (*bb))
+ return false;
+
+ char *pend;
+ errno = 0;
+ const unsigned long number = strtoul (bb, &pend, 10);
+ if (errno == ERANGE
+ || *pend != '\0'
+ || number > INT_MAX)
+ return false;
+
+ *index = number;
+ return true;
}
/* See if VAL is an identifier matching __BB<num> and return <num>
