[Pkg-wmaker-commits] [wmbattery] 92/241: * Merge acpi change from procmeter3: Limit string length when reading from /proc/.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmbattery.

commit bb7f7bc0a346341324987117d986e26cae5261e8
Author: Joey Hess <joey at kitenet.net>
Date:   Fri Dec 7 15:20:47 2007 -0500

    * Merge acpi change from procmeter3: Limit string length when reading from
      /proc/.
---
 acpi.c           | 2 +-
 debian/changelog | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/acpi.c b/acpi.c
index d665bfe..2e6bd41 100644
--- a/acpi.c
+++ b/acpi.c
@@ -113,7 +113,7 @@ inline char *scan_acpi_value (const char *buf, const char *key) {
 	static char ret[256];
 	
 	if ((ptr = strstr(buf, key))) {
-		if (sscanf(ptr + strlen(key), "%s", ret) == 1)
+		if (sscanf(ptr + strlen(key), "%255s", ret) == 1)
 			return ret;
 	}
 	return NULL;
diff --git a/debian/changelog b/debian/changelog
index 4465de0..5d86bec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-wmbattery (2.32) UNRELEASED; urgency=low
+wmbattery (2.32) unstable; urgency=low
 
   * Guard some divisions against division by zero. I've never seen that
     happen and can't reproduce it, but see #454766.
+  * Merge acpi change from procmeter3: Limit string length when reading from
+    /proc/.
 
- -- Joey Hess <joeyh at debian.org>  Fri, 07 Dec 2007 14:56:01 -0500
+ -- Joey Hess <joeyh at debian.org>  Fri, 07 Dec 2007 14:56:41 -0500
 
 wmbattery (2.31) unstable; urgency=low
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbattery.git