Merge lp:~akkzilla/ubuntu/natty/gmemusage/gmemusage-fix-370735 into lp:ubuntu/natty/gmemusage

[Akkana Peck]

Merge patch that's been sitting in bug 370735, so gmemusage will no longer crash on startup with a stack-smashing error.

[Marc Deslauriers (mdeslaur)]

The gmemusage uses the CDBS patch system. Please add the fix as a proper patch.

review: Needs Fixing

[Chris Coulson (chrisccoulson)]

Oh, I didn't see this had a merge proposal too. I'll add my comment from the bug report in here too:

Hi,

Thanks for working on this. I have a couple of comments though:

- The scope of the patch seems to expand beyond the original bug. Whilst it's perfectly ok for you to fix the additional issues, would you mind splitting those changes in to a separate patch? (I'm referring to the cast you added in draw_window and the prototype change to main() ).

- You hardcode "%15s" in the format string for sscanf, when you use a constant everywhere else. Why not do something like this?

     char *format ;
     asprintf ( &format , "%%*s %%%ds" , PROCNAMELEN - 1 ) ;
     sscanf ( buf , format , procName ) ;
     free ( format ) ;

(Note that this doesn't make sure asprintf succeeded, which isn't good - but it doesn't look like this application checks that any other call succeeds either, so I'm not sure that matters so much here).

Let me know what you think, but I'd certainly sponsor this once you've addressed the first point

review: Needs Fixing

Unmerged revisions

5. By Akkana Peck on 2011-05-16

Fix stack smashing crash on startup, bug 370735.

=== modified file 'common.h'
--- common.h	2002-04-11 20:54:15 +0000
+++ common.h	2011-05-16 20:18:30 +0000
@@ -8,11 +8,12 @@
  */
 #define	kernelname "linux"
 #define freename "free"
+#define PROCNAMELEN 16
 
 struct ProcInfo
 {
       char
-	 procname [14] ;
+	 procname [PROCNAMELEN] ;
       int
 	 totMem ,
 	 totRSS ,
 
=== modified file 'debian/changelog'
--- debian/changelog	2008-11-28 14:18:17 +0000
+++ debian/changelog	2011-05-16 20:18:30 +0000
@@ -1,3 +1,9 @@
+gmemusage (0.2-11ubuntu1) natty; urgency=low
+
+  * Fix stack smashing crash on startup, bug 370735. 
+
+ -- Akkana Peck <[e-mail]>  Mon, 16 May 2011 12:54:25 -0700
+
 gmemusage (0.2-11) unstable; urgency=low
 
   * Adopt the package (Closes: #486759).
 
=== modified file 'gmemusage.c'
--- gmemusage.c	2008-11-28 14:18:17 +0000
+++ gmemusage.c	2011-05-16 20:18:30 +0000
@@ -92,7 +92,7 @@
 void draw_window ( void ) ;
 void TooSmall ( Window win , GC gc , XFontStruct *font_into ) ;
 
-void main ( int argc , char **argv )
+int main ( int argc , char **argv )
 {
    int
       default_height ,
@@ -700,7 +700,7 @@
 /*
  * We can accept alarms again
  */
-   (void) signal ( SIGALRM , draw_window ) ;
+   (void) signal ( SIGALRM , (__sighandler_t)draw_window ) ;
    return ;
 }
    
 
=== modified file 'hash.c'
--- hash.c	2002-04-11 20:54:15 +0000
+++ hash.c	2011-05-16 20:18:30 +0000
@@ -7,6 +7,8 @@
  * See file COPYING (included in this distribution) for copyright information.
  */
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <malloc.h>
 #include "common.h"
 
@@ -71,7 +73,7 @@
       }
 /* printf("allocated %d procs\n",lastallocated); */
       thisproc = nextproc = procs ;
-      strcpy ( thisproc -> procname , procname ) ;
+      strncpy ( thisproc -> procname , procname , PROCNAMELEN ) ;
       thisproc -> totMem = mem ;
       thisproc -> totRSS = rss ;
       thisproc -> nProcs = 1 ;
@@ -98,7 +100,7 @@
 /* printf("allocated %d procs\n",lastallocated); */
       }
       thisproc = procs + nProcs ;
-      strcpy ( thisproc -> procname , procname ) ;
+      strncpy ( thisproc -> procname , procname , PROCNAMELEN ) ;
       thisproc -> totMem = mem ;
       thisproc -> totRSS = rss ;
       thisproc -> nProcs = 1 ;
 
=== modified file 'proc.c'
--- proc.c	2008-11-28 14:18:17 +0000
+++ proc.c	2011-05-16 20:18:30 +0000
@@ -7,6 +7,7 @@
  * See file COPYING (included in this distribution) for copyright information.
  */
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <dirent.h>
@@ -93,7 +94,7 @@
    char
       buf [128] ;
    char
-      procName [14] ;
+      procName [PROCNAMELEN] ;
    int
       procSize ,
       procRSS ,
@@ -164,7 +165,8 @@
 	 if ( !strncmp ( buf , NameLine , NameLineLen ) )
 	 {
 	    /* Name: procName */
-	    sscanf ( buf , "%*s %s" , procName ) ;
+            /* The field width here should correspond to PROCNAMELEN-1 */
+	    sscanf ( buf , "%*s %15s" , procName ) ;
 	 }
 	 else if ( !strncmp ( buf , VmSizeLine , VmSizeLineLen ) )
 	 {