---

yaml --- r: 215131 b: refs/heads/master c: efc463e h: refs/heads/master i: 215129: 99d7ce2 215127: 397a71a v: v3
git-mirror · Oct 11, 2010 · 859fbb7 · 859fbb7
1 parent 50183cc
commit 859fbb7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b06dbbeadb6488cd00999b61b080bb6f0218503
+refs/heads/master: efc463eb508798da4243625b08c7396462cabf9f
diff --git a/trunk/net/irda/parameters.c b/trunk/net/irda/parameters.c
@@ -298,6 +298,8 @@ static int irda_extract_string(void *self, __u8 *buf, int len, __u8 pi,
 
 	p.pi = pi;     /* In case handler needs to know */
 	p.pl = buf[1]; /* Extract length of value */
+	if (p.pl > 32)
+		p.pl = 32;
 
 	IRDA_DEBUG(2, "%s(), pi=%#x, pl=%d\n", __func__,
 		   p.pi, p.pl);
@@ -318,7 +320,7 @@ static int irda_extract_string(void *self, __u8 *buf, int len, __u8 pi,
 		   (__u8) str[0], (__u8) str[1]);
 
 	/* Null terminate string */
-	str[p.pl+1] = '\0';
+	str[p.pl] = '\0';
 
 	p.pv.c = str; /* Handler will need to take a copy */