dtc: complain about unparsed digits in cell lists
Check that strtoul() parsed the complete string. As with the number overflow case, write a non-fatal error message to stdout. Signed-off-by: Milton Miller <miltonm@bga.com>
This commit is contained in:
committed by
Jon Loeliger
parent
6d7b222430
commit
85ab5cc6ec
14
dtc-parser.y
14
dtc-parser.y
@@ -192,19 +192,27 @@ void yyerror (char const *s)
|
||||
* Convert a string representation of a numeric cell
|
||||
* in the given base into a cell.
|
||||
*
|
||||
* FIXME: The string "abc123", base 10, should be flagged
|
||||
* as an error due to the leading "a", but isn't yet.
|
||||
* FIXME: should these specification errors be fatal instead?
|
||||
*/
|
||||
|
||||
cell_t cell_from_string(char *s, unsigned int base)
|
||||
{
|
||||
cell_t c;
|
||||
char *e;
|
||||
|
||||
c = strtoul(s, &e, base);
|
||||
if (*e) {
|
||||
fprintf(stderr,
|
||||
"Line %d: Invalid cell value '%s' : "
|
||||
"%c is not a base %d digit; %d assumed\n",
|
||||
yylloc.first_line, s, *e, base, c);
|
||||
}
|
||||
|
||||
c = strtoul(s, NULL, base);
|
||||
if (errno == EINVAL || errno == ERANGE) {
|
||||
fprintf(stderr,
|
||||
"Line %d: Invalid cell value '%s'; %d assumed\n",
|
||||
yylloc.first_line, s, c);
|
||||
errno = 0;
|
||||
}
|
||||
|
||||
return c;
|
||||
|
||||
Reference in New Issue
Block a user