diff options
| author | Rob Herring <robh@kernel.org> | 2018-09-26 14:27:08 -0500 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2018-09-27 10:58:35 +1000 |
| commit | 522d81d572f2f8ae683c39089df64f5c74205451 (patch) | |
| tree | fbcb1e3cd4cb625e415730cfcb2495784db09d85 /treesource.c | |
| parent | e45198c9835901efc4763bcafa3cf50b5bdcb6b5 (diff) | |
| download | dtc-522d81d572f2f8ae683c39089df64f5c74205451.zip dtc-522d81d572f2f8ae683c39089df64f5c74205451.tar.gz dtc-522d81d572f2f8ae683c39089df64f5c74205451.tar.bz2 | |
Fix dts output with a REF_PATH marker
Commit 8c59a97ce096 ("Fix missing labels when emitting dts format")
fixed label output, but broke output when there is a REF_PATH marker.
The problem is a REF_PATH marker causes a zero length string to be
emitted. The write_propval_string() function requires a length of at
least 1 (including the terminating '\0'), but that was not being
checked.
For the integer output, a length of 0 is valid as it is possible to have
labels inside the starting '<':
int-prop = < start: 0x1234>;
REF_PHANDLE is another marker that we don't explicitly handle, but it
doesn't cause a problem as it is fundamentally just an int.
Fixes: 8c59a97ce096 ("Fix missing labels when emitting dts format")
Reported-by: Kumar Gala <kumar.gala@linaro.org>
Cc: Grant Likely <grant.likely@arm.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'treesource.c')
| -rw-r--r-- | treesource.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/treesource.c b/treesource.c index c1fdb86..93fd8ac 100644 --- a/treesource.c +++ b/treesource.c @@ -64,6 +64,10 @@ static bool isstring(char c) static void write_propval_string(FILE *f, const char *s, size_t len) { const char *end = s + len - 1; + + if (!len) + return; + assert(*end == '\0'); fprintf(f, "\""); |