don't return the address of a local variable.

4 files changed, 79 insertions, 3 deletions

diff --git a/x11/xview-lib/Makefile b/x11/xview-lib/Makefile
index 0170fcd417a..e9312357c9a 100644
--- a/x11/xview-lib/Makefile
+++ b/x11/xview-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/05/02 21:46:09 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.16 2001/05/11 20:41:31 dmcmahill Exp $
 # $FreeBSD Id: Makefile,v 1.13 1997/07/17 15:13:03 max Exp
 #
 
@@ -13,7 +13,8 @@ COMMENT=		OpenLook Toolkit libs, includes, and man pages
 DEPENDS=		xview-config>=3.2.1nb2:../../x11/xview-config
 
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
-#NOT_FOR_PLATFORM=       *-*-alpha       # broken va_arg handling.
+# builds, but binaries in../xview-clients all crash
+NOT_FOR_PLATFORM=       *-*-alpha
 
 USE_IMAKE=		# defined
 
diff --git a/x11/xview-lib/distinfo b/x11/xview-lib/distinfo
index 600b602ee63..44fe7017ae0 100644
--- a/x11/xview-lib/distinfo
+++ b/x11/xview-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/05/02 21:46:09 dmcmahill Exp $
+$NetBSD: distinfo,v 1.4 2001/05/11 20:41:32 dmcmahill Exp $
 
 SHA1 (xview3.2p1-X11R6.tar.gz) = 1cd04231b893c3e6c70b56791d527b498e21a27a
 Size (xview3.2p1-X11R6.tar.gz) = 3436814 bytes
@@ -25,3 +25,5 @@ SHA1 (patch-au) = 9650ee87880b33897441163acd15d94ae55b3f83
 SHA1 (patch-av) = 2468b7f58eefc7ba9b12987667b5c68b1159b778
 SHA1 (patch-aw) = 0cdec09fb4066373db384331f56cf95a8b31b003
 SHA1 (patch-ax) = 613f99d1034a31b4dbbdecc9866b7bb766084e22
+SHA1 (patch-ay) = f86730b138128357eecbda236d75ed05d9e1fcac
+SHA1 (patch-az) = b274804ceccd9795a45e25b26c39ab9cd004b511
diff --git a/x11/xview-lib/patches/patch-ay b/x11/xview-lib/patches/patch-ay
new file mode 100644
index 00000000000..d2ac581c9df
--- /dev/null
+++ b/x11/xview-lib/patches/patch-ay
@@ -0,0 +1,63 @@
+$NetBSD: patch-ay,v 1.1 2001/05/11 20:41:32 dmcmahill Exp $
+
+don't return the address of a local variable
+
+--- lib/libxview/canvas/cnvs_input.c.orig       Tue Jun 29 01:14:46 1993
++++ lib/libxview/canvas/cnvs_input.c    Fri May 11 15:17:51 2001
+@@ -416,7 +416,11 @@
+ {
+     Xv_Window       paint_window;
+-    Event           tmp_event;
++    Event           *tmp_event;
+     int             x, y;
+ 
++    if ( (tmp_event = (Event *) malloc(sizeof(Event))) == NULL){
++	fprintf(stderr,"canvas_window_event: malloc failed\n");
++	exit(1);
++    }
+     paint_window = xv_get(canvas_public, CANVAS_NTH_PAINT_WINDOW, 0);
+     if (paint_window == NULL) {
+@@ -424,10 +428,11 @@
+ 	return (event);
+     }
+-    tmp_event = *event;
++
++    memcpy(tmp_event,event,sizeof(Event));
+     win_translate_xy(paint_window, canvas_public,
+ 		     event_x(event), event_y(event), &x, &y);
+-    event_set_x(&tmp_event, x);
+-    event_set_y(&tmp_event, y);
+-    return (&tmp_event);
++    event_set_x(tmp_event, x);
++    event_set_y(tmp_event, y);
++    return (tmp_event);
+ }
+ 
+@@ -441,7 +446,11 @@
+ {
+     Xv_Window       paint_window;
+-    Event           tmp_event;
++    Event           *tmp_event;
+     int             x, y;
+ 
++    if ( (tmp_event = (Event *) malloc(sizeof(Event))) == NULL){
++	fprintf(stderr,"canvas_window_event: malloc failed\n");
++	exit(1);
++    }
+     paint_window = xv_get(canvas_public, CANVAS_NTH_PAINT_WINDOW, 0);
+     if (paint_window == NULL) {
+@@ -449,10 +458,10 @@
+ 	return (event);
+     }
+-    tmp_event = *event;
++    memcpy(tmp_event,event,sizeof(Event));
+     win_translate_xy(paint_window, canvas_public,
+ 		     event_x(event), event_y(event), &x, &y);
+-    event_set_x(&tmp_event, x);
+-    event_set_y(&tmp_event, y);
+-    return (&tmp_event);
++    event_set_x(tmp_event, x);
++    event_set_y(tmp_event, y);
++    return (tmp_event);
+ }
+ 
diff --git a/x11/xview-lib/patches/patch-az b/x11/xview-lib/patches/patch-az
new file mode 100644
index 00000000000..a3b8ccd06fb
--- /dev/null
+++ b/x11/xview-lib/patches/patch-az
@@ -0,0 +1,10 @@
+$NetBSD: patch-az,v 1.1 2001/05/11 20:41:32 dmcmahill Exp $
+
+--- lib/libxview/win/win_env.c.orig	Tue Jun 29 01:15:40 1993
++++ lib/libxview/win/win_env.c	Fri May 11 15:16:15 2001
+@@ -16,4 +16,5 @@
+  */
+ 
++#include <string.h>
+ #include <xview/rect.h>
+ #include <xview/win_env.h>