kernel
/
dtc
mirror of https://git.kernel.org/pub/scm/utils/dtc/dtc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix util_is_printable_string 

The method used did not account for multi-part strings.

Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
main
Pantelis Antoniou 2013-01-04 21:12:58 +02:00 committed by Jon Loeliger
parent 94a4799b20
commit 1c1efd6954
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
util.c
View File

@ -72,7 +72,7 @@ char *join_path(const char *path, const char *name)
int util_is_printable_string(const void *data, int len) int util_is_printable_string(const void *data, int len)
{ {
const char *s = data; const char *s = data;
const char *ss; const char *ss, *se;


/* zero length is not */ /* zero length is not */
if (len == 0) if (len == 0)
@ -82,14 +82,20 @@ int util_is_printable_string(const void *data, int len)
if (s[len - 1] != '\0') if (s[len - 1] != '\0')
return 0; return 0;


se = s + len;

while (s < se) {
ss = s; ss = s;
while (*s && isprint(*s)) while (s < se && *s && isprint(*s))
s++; s++;


/* not zero, or not done yet */ /* not zero, or not done yet */
if (*s != '\0' || (s + 1 - ss) < len) if (*s != '\0' || s == ss)
return 0; return 0;


s++;
}

return 1; return 1;
} }