From: Dmitry V. Levin <ldv@altlinux.org>
Date: Wed, 11 Oct 2006 22:58:31 +0000 (+0000)
Subject: 2006-09-01  Dmitry V. Levin  <ldv@altlinux.org>
X-Git-Tag: v4.5.18~269
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=504eb0b9c6550808a09e4c959f2d772d22197974;p=strace

2006-09-01  Dmitry V. Levin  <ldv@altlinux.org>

	* file.c (print_xattr_val): Fix memory corruption bug reported
	by James Antill.
	Fixes RH#200621.
---

diff --git a/ChangeLog b/ChangeLog
index e77e19ba..c08ba9d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-01  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* file.c (print_xattr_val): Fix memory corruption bug reported
+	by James Antill.
+	Fixes RH#200621.
+
 2006-04-21  Dmitry V. Levin  <ldv@altlinux.org>
 
 	* defs.h [LINUX && X86_64 && !__NR_exit_group]: Define
diff --git a/file.c b/file.c
index dd825b0f..6d74e3d9 100644
--- a/file.c
+++ b/file.c
@@ -2360,7 +2360,7 @@ unsigned long insize, size;
 		    *out++ = tohex(in[i] % 16);
 		}
 	    /* Don't print terminating NUL if there is one.  */
-	    if (in[i - 1] == '\0')
+	    if (i > 0 && in[i - 1] == '\0')
 		out -= 4;
 	    *out = '\0';
 	    tprintf(", \"%s\", %ld", buf, insize);