diff --git a/ChangeLog b/ChangeLog
index e85f51c1c..e682da85b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-12  Havoc Pennington  <hp@pobox.com>
+
+	* src/theme.c (draw_op_as_pixbuf): don't read from op->data.image 
+	when the op is an icon
+
 2002-11-12  Havoc Pennington  <hp@redhat.com>
 
 	* src/stack.c (meta_stack_get_default_focus_window): never use a
diff --git a/src/Makefile.am b/src/Makefile.am
index ce90d1de3..90b1b1212 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -112,7 +112,8 @@ metacity_dialog_SOURCES= 	\
 bin_PROGRAMS=metacity metacity-theme-viewer
 libexec_PROGRAMS=metacity-dialog
 
-metacity_LDADD= @METACITY_LIBS@
+EFENCE=
+metacity_LDADD= $(EFENCE) @METACITY_LIBS@ $(EFENCE)
 metacity_theme_viewer_LDADD= @METACITY_LIBS@ libmetacity-private.la
 metacity_dialog_LDADD=@METACITY_LIBS@
 
diff --git a/src/run-metacity.sh b/src/run-metacity.sh
index a131033ac..98ccbf74b 100755
--- a/src/run-metacity.sh
+++ b/src/run-metacity.sh
@@ -48,6 +48,8 @@ if test -n "$XINERAMA"; then
   XINERAMA_FLAGS='+xinerama'
 fi
 
+export EF_ALLOW_MALLOC_0=1
+
 if test -z "$ONLY_WM"; then
   echo "Launching Xnest"
   Xnest -ac $XNEST_DISPLAY -scrns $SCREENS -geometry 640x480 -bw 15 $XINERAMA_FLAGS &
diff --git a/src/theme.c b/src/theme.c
index 76e9ee605..f1b6f41a0 100644
--- a/src/theme.c
+++ b/src/theme.c
@@ -3140,15 +3140,13 @@ draw_op_as_pixbuf (const MetaDrawOp    *op,
                                          op->data.icon.alpha_spec,
                                          op->data.icon.fill_type,
                                          width, height,
-                                         op->data.image.vertical_stripes,
-                                         op->data.image.horizontal_stripes);
+                                         FALSE, FALSE);
       else if (info->icon)
         pixbuf = scale_and_alpha_pixbuf (info->icon,
                                          op->data.icon.alpha_spec,
                                          op->data.icon.fill_type,
                                          width, height,
-                                         op->data.image.vertical_stripes,
-                                         op->data.image.horizontal_stripes);
+                                         FALSE, FALSE);
       break;
 
     case META_DRAW_TITLE: