tags 602975 + patch tags 602975 + pending thanks Attached. I apologise for the quilt cruft.
-- see shy jo
diff -Nru procmeter3-3.5c/debian/changelog procmeter3-3.5c/debian/changelog --- procmeter3-3.5c/debian/changelog 2010-06-30 14:11:37.000000000 -0400 +++ procmeter3-3.5c/debian/changelog 2011-01-04 12:44:52.000000000 -0400 @@ -1,3 +1,10 @@ +procmeter3 (3.5c-1.1) unstable; urgency=low + + * Ironic NMU + * Fix crash when /proc/interrupts is > 64 chars long. Closes: #602975 + + -- Joey Hess <jo...@debian.org> Tue, 04 Jan 2011 12:44:50 -0400 + procmeter3 (3.5c-1) unstable; urgency=low * New maintainer (Closes: #483255) diff -Nru procmeter3-3.5c/debian/patches/debian-changes-3.5c-1.1 procmeter3-3.5c/debian/patches/debian-changes-3.5c-1.1 --- procmeter3-3.5c/debian/patches/debian-changes-3.5c-1.1 1969-12-31 20:00:00.000000000 -0400 +++ procmeter3-3.5c/debian/patches/debian-changes-3.5c-1.1 2011-01-04 12:46:49.000000000 -0400 @@ -0,0 +1,53 @@ +Description: Upstream changes introduced in version 3.5c-1.1 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + procmeter3 (3.5c-1.1) unstable; urgency=low + . + * Ironic NMU + * Fix crash when /proc/interrupts is > 64 chars long. Closes: #602975 + . + The person named in the Author field signed this changelog entry. +Author: Joey Hess <jo...@debian.org> +Bug-Debian: http://bugs.debian.org/602975 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- procmeter3-3.5c.orig/modules/stat-intr.c ++++ procmeter3-3.5c/modules/stat-intr.c +@@ -64,9 +64,11 @@ ProcMeterModule module= + }; + + +-/* The line buffer */ ++/* The line buffers */ + static char *line=NULL; + static size_t length=0; ++static char *line2=NULL; ++static size_t length2=0; + + /*+ The number of interrupts. +*/ + static int nintr=0; +@@ -139,9 +141,7 @@ ProcMeterOutput **Initialise(char *optio + f2=fopen("/proc/interrupts","r"); + if(f2) + { +- char line2[64]; +- +- while(fgets(line2,64,f2)) ++ while(fgets_realloc(&line2,&length2,f2)) + { + int j,p2; + diff -Nru procmeter3-3.5c/debian/patches/series procmeter3-3.5c/debian/patches/series --- procmeter3-3.5c/debian/patches/series 2010-06-30 14:05:27.000000000 -0400 +++ procmeter3-3.5c/debian/patches/series 2011-01-04 12:46:50.000000000 -0400 @@ -1,3 +1,4 @@ makefile.patch manpages.patch dont-override-flags.patch +debian-changes-3.5c-1.1
signature.asc
Description: Digital signature
