---

yaml --- r: 325646 b: refs/heads/master c: ee8b593 h: refs/heads/master v: v3
git-mirror · Aug 10, 2012 · 79cdde2 · 79cdde2
1 parent 8844d7f
commit 79cdde2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f06fb543c1d0cbd721250b72ee1244178a38aa9d
+refs/heads/master: ee8b593affdf893012e57f4c54a21984d1b0d92e
diff --git a/trunk/drivers/char/ttyprintk.c b/trunk/drivers/char/ttyprintk.c
@@ -67,7 +67,7 @@ static int tpk_printk(const unsigned char *buf, int count)
 				tmp[tpk_curr + 1] = '\0';
 				printk(KERN_INFO "%s%s", tpk_tag, tmp);
 				tpk_curr = 0;
-				if (buf[i + 1] == '\n')
+				if ((i + 1) < count && buf[i + 1] == '\n')
 					i++;
 				break;
 			case '\n':