From: Martin Mares <mj@ucw.cz>
Date: Fri, 28 May 2004 11:46:02 +0000 (+0000)
Subject: Bug fixes to format_agp_rate().
X-Git-Tag: v3.0.0~124
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=b569ef09d76169e6cdac8934885fa3862c48a2ac;p=pciutils.git

Bug fixes to format_agp_rate().

git-archimport-id: mj@ucw.cz--public/pciutils--main--2.2--patch-41
---

diff --git a/ChangeLog b/ChangeLog
index 8e9e487..ba719ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-05-28  Martin Mares  <mj@ucw.cz>
 
+	* lspci.c (format_agp_rate): Write "x16", not "x@".
+	(show_agp): rate[] could overflow.
+	Bugs reported by Jakub Bogusz <qboosh@pld-linux.org>.
+
 	* lspci.c (show_ht_*): Show HyperTransport capability with all its
 	details. Once again code by Maciej simplified (i.e., possibly broken)
 	by me.
diff --git a/lspci.c b/lspci.c
index 6e0a77f..af94eeb 100644
--- a/lspci.c
+++ b/lspci.c
@@ -404,8 +404,7 @@ format_agp_rate(int rate, char *buf, int agp3)
       {
 	if (c != buf)
 	  *c++ = ',';
-	*c++ = 'x';
-	*c++ = '0' + (1 << (i + 2*agp3));
+	c += sprintf(c, "x%d", 1 << (i + 2*agp3));
       }
   if (c != buf)
     *c = 0;
@@ -417,7 +416,7 @@ static void
 show_agp(struct device *d, int where, int cap)
 {
   u32 t;
-  char rate[8];
+  char rate[16];
   int ver, rev;
   int agp3 = 0;