rpms/xscreensaver/devel xscreensaver-5.10-apple2-memleak.patch, 1.1, 1.2 xscreensaver.spec, 1.104, 1.105

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22494/devel

Modified Files:
	xscreensaver-5.10-apple2-memleak.patch xscreensaver.spec 
Log Message:
* Fri Feb  5 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-6.1
- A bit more memleak fix


xscreensaver-5.10-apple2-memleak.patch:
 hacks/analogtv.c    |    2 ++
 hacks/apple2-main.c |   10 ++++++++++
 hacks/apple2.c      |   13 ++++++++++++-
 hacks/bsod.c        |    1 +
 hacks/screenhack.c  |   10 ++++++++++
 utils/grabclient.c  |    4 ++++
 6 files changed, 39 insertions(+), 1 deletion(-)

Index: xscreensaver-5.10-apple2-memleak.patch
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver-5.10-apple2-memleak.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xscreensaver-5.10-apple2-memleak.patch	5 Feb 2010 06:18:41 -0000	1.1
+++ xscreensaver-5.10-apple2-memleak.patch	5 Feb 2010 16:51:24 -0000	1.2
@@ -1,6 +1,6 @@
---- xscreensaver-5.10/hacks/analogtv.c.meml	2010-02-05 05:47:34.000000000 +0900
-+++ xscreensaver-5.10/hacks/analogtv.c	2010-02-05 05:47:34.000000000 +0900
-@@ -494,6 +494,8 @@ analogtv_release(analogtv *it)
+--- xscreensaver-5.10/hacks/analogtv.c.meml	2010-02-05 22:17:55.000000000 +0900
++++ xscreensaver-5.10/hacks/analogtv.c	2010-02-05 22:17:55.000000000 +0900
+@@ -494,6 +494,8 @@
    it->gc=NULL;
    if (it->n_colors) XFreeColors(it->dpy, it->colormap, it->colors, it->n_colors, 0L);
    it->n_colors=0;
@@ -10,8 +10,8 @@
  
  
 --- xscreensaver-5.10/hacks/apple2-main.c.meml	2008-02-10 10:34:37.000000000 +0900
-+++ xscreensaver-5.10/hacks/apple2-main.c	2010-02-05 05:47:34.000000000 +0900
-@@ -569,6 +569,10 @@ image_loaded_cb (Screen *screen, Window 
++++ xscreensaver-5.10/hacks/apple2-main.c	2010-02-06 00:33:40.000000000 +0900
+@@ -569,6 +569,10 @@
       image (regardless of whether it started as TrueColor/PseudoColor.)
     */
    pick_a2_subimage (dpy, window, image, buf32, w, h);
@@ -22,7 +22,15 @@
  
    /* Then dither the 32bpp image to a 6-color Apple][ colormap.
     */
-@@ -905,6 +909,9 @@ launch_text_generator (struct terminal_c
+@@ -784,6 +788,7 @@
+     free(mine->render_img);
+     free(mine->img_filename);
+     free(mine);
++    mine = 0;
+     return;
+ 
+   }
+@@ -905,6 +910,9 @@
        sprintf (buf, "%.100s: %.100s", progname, program);
        perror(buf);
      }
@@ -32,9 +40,25 @@
  }
  
  static void
+@@ -1526,6 +1534,7 @@
+   case A2CONTROLLER_FREE:
+     terminal_closegen(mine);
+     free(mine);
++    mine = 0;
+     return;
+   }
+ }
+@@ -1888,6 +1897,7 @@
+ 
+   case A2CONTROLLER_FREE:
+     free(mine);
++    mine = 0;
+     break;
+   }
+ 
 --- xscreensaver-5.10/hacks/apple2.c.meml	2006-03-27 14:45:53.000000000 +0900
 +++ xscreensaver-5.10/hacks/apple2.c	2010-02-05 05:47:34.000000000 +0900
-@@ -702,7 +702,18 @@ apple2_one_frame (apple2_sim_t *sim)
+@@ -702,7 +702,18 @@
  
            XClearWindow(sim->dpy, sim->window);
  
@@ -54,9 +78,45 @@
            return 0;
          }
  
+--- xscreensaver-5.10/hacks/bsod.c.meml	2008-06-28 05:12:55.000000000 +0900
++++ xscreensaver-5.10/hacks/bsod.c	2010-02-06 00:34:12.000000000 +0900
+@@ -3476,6 +3476,7 @@
+ 
+   case A2CONTROLLER_FREE:
+     free(mine);
++    mine = 0;
+     break;
+   }
+ }
+--- xscreensaver-5.10/hacks/screenhack.c.meml	2008-08-01 06:29:19.000000000 +0900
++++ xscreensaver-5.10/hacks/screenhack.c	2010-02-05 18:42:27.000000000 +0900
+@@ -221,6 +221,11 @@
+ 	  strcat (newr, oldr);
+ 	  *s = newr;
+ 	}
++      else
++	{
++	  char *newr = strdup(*s);
++	  *s = newr;
++	}
+   }
+ }
+ 
+@@ -807,6 +812,11 @@
+     }
+ 
+   free (merged_options);
++  {
++    char **s;
++    for (s = merged_defaults; *s; s++)
++      free(*s);
++  }
+   free (merged_defaults);
+   merged_options = 0;
+   merged_defaults = 0;
 --- xscreensaver-5.10/utils/grabclient.c.meml	2008-02-10 10:57:56.000000000 +0900
 +++ xscreensaver-5.10/utils/grabclient.c	2010-02-05 14:19:03.000000000 +0900
-@@ -238,6 +238,7 @@ hack_subproc_environment (Display *dpy)
+@@ -238,6 +238,7 @@
     */
    const char *odpy = DisplayString (dpy);
    char *ndpy = (char *) malloc(strlen(odpy) + 20);
@@ -64,7 +124,7 @@
    strcpy (ndpy, "DISPLAY=");
    strcat (ndpy, odpy);
  
-@@ -246,6 +247,9 @@ hack_subproc_environment (Display *dpy)
+@@ -246,6 +247,9 @@
  #ifdef HAVE_PUTENV
    if (putenv (ndpy))
      abort ();


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- xscreensaver.spec	5 Feb 2010 06:18:41 -0000	1.104
+++ xscreensaver.spec	5 Feb 2010 16:51:24 -0000	1.105
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    6
+%define fedora_rel    6.1
 
 %define extrarel      %{nil}
 
@@ -681,6 +681,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Feb  5 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-6.1
+- A bit more memleak fix
+
 * Fri Feb  5 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-6
 - Fix memleak on analogtv based hacks, especially on apple2