Fix util_is_printable_string

Fix util_is_printable_string

[Pantelis Antoniou]

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

Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
---
 util.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/util.c b/util.c
index 2422c34..45f186b 100644
--- a/util.c
+++ b/util.c
@@ -72,7 +72,7 @@ char *join_path(const char *path, const char *name)
 int util_is_printable_string(const void *data, int len)
 {
 	const char *s = data;
-	const char *ss;
+	const char *ss, *se;
 
 	/* zero length is not */
 	if (len == 0)
@@ -82,13 +82,19 @@ int util_is_printable_string(const void *data, int len)
 	if (s[len - 1] != '\0')
 		return 0;
 
-	ss = s;
-	while (*s && isprint(*s))
-		s++;
+	se = s + len;
 
-	/* not zero, or not done yet */
-	if (*s != '\0' || (s + 1 - ss) < len)
-		return 0;
+	while (s < se) {
+		ss = s;
+		while (s < se && *s && isprint(*s))
+			s++;
+
+		/* not zero, or not done yet */
+		if (*s != '\0' || s == ss)
+			return 0;
+
+		s++;
+	}
 
 	return 1;
 }
-- 
1.7.12

Re: Fix util_is_printable_string

[David Gibson]

[-- Attachment #1.1: Type: text/plain, Size: 794 bytes --]

On Fri, Jan 04, 2013 at 09:12:58PM +0200, Pantelis Antoniou wrote:
> The method used did not account for multi-part strings.
> 
> Signed-off-by: Pantelis Antoniou <panto-wVdstyuyKrO8r51toPun2/C9HSW9iNxf@public.gmane.org>

I think it could do with some more commenting of exactly what it's
considering a printable string(s).  I'm pretty sure it's doing the
right thing, but if you're not already familiar with the OF
multi-string convention, it would be easy to get confused by the
code.  Other than that

Acked-by: David Gibson <david-xT8FGy+AXnRB3Ne2BGzF6laj5H9X9Tb+@public.gmane.org>

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[-- Attachment #2: Type: text/plain, Size: 192 bytes --]

_______________________________________________
devicetree-discuss mailing list
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
https://lists.ozlabs.org/listinfo/devicetree-discuss

Re: Fix util_is_printable_string

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 740 bytes --]

On Fri, Jan 04, 2013 at 09:12:58PM +0200, Pantelis Antoniou wrote:
> The method used did not account for multi-part strings.
> 
> Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>

I think it could do with some more commenting of exactly what it's
considering a printable string(s).  I'm pretty sure it's doing the
right thing, but if you're not already familiar with the OF
multi-string convention, it would be easy to get confused by the
code.  Other than that

Acked-by: David Gibson <david@gibson.dropbear.id.au>

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: Fix util_is_printable_string

[Jon Loeliger]

> The method used did not account for multi-part strings.
> 
> Signed-off-by: Pantelis Antoniou <panto-wVdstyuyKrO8r51toPun2/C9HSW9iNxf@public.gmane.org>


Applied.

Plese consider a follow-up patch to address David's concerns.

Thanks,
jdl

Re: Fix util_is_printable_string

[Jon Loeliger]

> The method used did not account for multi-part strings.
> 
> Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>


Applied.

Plese consider a follow-up patch to address David's concerns.

Thanks,
jdl