Merge branch 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux.git] / scripts / dtc / data.c

diff --git a/scripts/dtc/data.c b/scripts/dtc/data.c
index aa37a16c889186aff62274ec708e89dea7dbd971..4a204145cc7b9cfdcad70ef7afde1efbe4e71f29 100644 (file)
--- a/scripts/dtc/data.c
+++ b/scripts/dtc/data.c
@@ -74,7 +74,8 @@ struct data data_copy_escape_string(const char *s, int len)
        struct data d;
        char *q;
 
-       d = data_grow_for(empty_data, len + 1);
+       d = data_add_marker(empty_data, TYPE_STRING, NULL);
+       d = data_grow_for(d, len + 1);
 
        q = d.val;
        while (i < len) {
@@ -94,6 +95,7 @@ struct data data_copy_file(FILE *f, size_t maxlen)
 {
        struct data d = empty_data;
 
+       d = data_add_marker(d, TYPE_NONE, NULL);
        while (!feof(f) && (d.len < maxlen)) {
                size_t chunksize, ret;