From cc34765177ba5ee948490693e6394797785f41fd Mon Sep 17 00:00:00 2001
From: dogcow <dogcow@pkgsrc.org>
Date: Thu, 22 Apr 2010 02:42:54 +0000
Subject: Zero out some memory that was being accessed before being used. bump
 PKGREVISION.

---
 wm/ctwm/Makefile         |  4 ++--
 wm/ctwm/distinfo         |  3 ++-
 wm/ctwm/patches/patch-ae | 21 +++++++++++++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 wm/ctwm/patches/patch-ae

diff --git a/wm/ctwm/Makefile b/wm/ctwm/Makefile
index a3084a084de..11820a7258e 100644
--- a/wm/ctwm/Makefile
+++ b/wm/ctwm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:29 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/04/22 02:42:54 dogcow Exp $
 #
 
 DISTNAME=	ctwm-3.8a
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11 wm
 MASTER_SITES=	http://ctwm.free.lp.se/dist/
 
diff --git a/wm/ctwm/distinfo b/wm/ctwm/distinfo
index e77a5a76c38..0dc4931357a 100644
--- a/wm/ctwm/distinfo
+++ b/wm/ctwm/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.13 2007/02/17 08:27:11 obache Exp $
+$NetBSD: distinfo,v 1.14 2010/04/22 02:42:54 dogcow Exp $
 
 SHA1 (ctwm-3.8a.tar.gz) = c3a31d669bef7dd5ec78d89950c0e575d6c51c77
 RMD160 (ctwm-3.8a.tar.gz) = cc1c3c862c3cfb1d66593d9a95d28ec0bbbbaf3c
 Size (ctwm-3.8a.tar.gz) = 738226 bytes
 SHA1 (patch-ac) = bb4cbcb8e4a68d1f2844aa16e85918aa5368a869
+SHA1 (patch-ae) = e70d268318b20ff0287dbedb67c402ac645adabe
diff --git a/wm/ctwm/patches/patch-ae b/wm/ctwm/patches/patch-ae
new file mode 100644
index 00000000000..f0302ffe0e7
--- /dev/null
+++ b/wm/ctwm/patches/patch-ae
@@ -0,0 +1,21 @@
+$NetBSD: patch-ae,v 1.1 2010/04/22 02:42:54 dogcow Exp $
+
+Fix some instances of using uninitialized memory.
+--- workmgr.c.orig	2007-02-16 01:24:28.000000000 -0800
++++ workmgr.c	2010-04-21 19:32:27.000000000 -0700
+@@ -138,6 +138,7 @@ void InitWorkSpaceManager (void)
+     Scr->workSpaceMgr.windowcpgiven = False;
+ 
+     Scr->workSpaceMgr.occupyWindow = (OccupyWindow*) malloc (sizeof (OccupyWindow));
++    memset(Scr->workSpaceMgr.occupyWindow, 0, sizeof (OccupyWindow));
+     Scr->workSpaceMgr.occupyWindow->name      = "Occupy Window";
+     Scr->workSpaceMgr.occupyWindow->icon_name = "Occupy Window Icon";
+     Scr->workSpaceMgr.occupyWindow->geometry  = NULL;
+@@ -169,6 +170,7 @@ void ConfigureWorkSpaceManager (void) {
+ 
+     for (vs = Scr->vScreenList; vs != NULL; vs = vs->next) {
+ 	WorkSpaceWindow *wsw = (WorkSpaceWindow*) malloc (sizeof (WorkSpaceWindow));
++        memset(wsw, 0, sizeof(WorkSpaceWindow));
+ 	wsw->twm_win	     = (TwmWindow*) 0;
+ 	wsw->state = Scr->workSpaceMgr.initialstate; /* BUTTONSSTATE */
+ 	vs->wsw = wsw;
-- 
cgit v1.2.3