Hello David,
Le 11/07/2016 03:30, David Gibson a écrit :
On Mon, Jul 11, 2016 at 12:17:08AM +0200, Jean-Christophe Dubois wrote:
Signed-off-by: Jean-Christophe Dubois <jcd@xxxxxxxxxxxxxxx>
A patch like this really needs a commit message describing when the
situation it's guarding against can occur. In this case when can
pos->file be non-NULL, but pos->file->name == NULL.
I stumbled on these issues while running some code checkers on previous
versions of the DTC compiler.
In general it's seems like a good idea for a function to protect itself
against bad use. I have not looked at the DTC source tree to check if
such bad use could happen at present (and I don't know about future) but
I do feel safer with these kinds of checks in place.
It's not exactly high priority, since srcpos_dump() has no current
users AFAICT.
srcpos_dump() doesn't seem to be used for now but the forced cast of the
"file" member as a (char *) is a bit disturbing in the source code. The
first user might be surprised of the output.
srcpos_string() seems to be used mainly in error case (srcpos_verror,
srcpos_error, ...) which might be considered as unimportant (?) but
still, I feel safer with the check (a more meaningful output?).
Now it is certainly not high priority (everything is working OK in the
normal case) but it is cheap to fix.
Regards
JC
---
srcpos.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpos.c b/srcpos.c
index af7fb3c..927ac54 100644
--- a/srcpos.c
+++ b/srcpos.c
@@ -252,7 +252,7 @@ void
srcpos_dump(struct srcpos *pos)
{
printf("file : \"%s\"\n",
- pos->file ? (char *) pos->file : "<no file>");
+ (pos->file && pos->file->name) ? pos->file->name : "<no file>");
printf("first_line : %d\n", pos->first_line);
printf("first_column: %d\n", pos->first_column);
printf("last_line : %d\n", pos->last_line);
@@ -267,7 +267,7 @@ srcpos_string(struct srcpos *pos)
const char *fname = "<no-file>";
char *pos_str;
- if (pos)
+ if (pos->file && pos->file->name)
fname = pos->file->name;
--
To unsubscribe from this list: send the line "unsubscribe devicetree-compiler" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
