From 85ab5cc6ec8442245a969a2f5a0e05962e0e7e67 Mon Sep 17 00:00:00 2001 From: Milton Miller Date: Sat, 7 Jul 2007 01:18:48 -0500 Subject: [PATCH] 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 --- dtc-parser.y | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dtc-parser.y b/dtc-parser.y index 15caf5a..9e7fbcc 100644 --- a/dtc-parser.y +++ b/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;