From ed414f63d814daa39e9cf7c1df7070343b1e0aff Mon Sep 17 00:00:00 2001
From: Peter Schiffer <pschiffe@redhat.com>
Date: Wed, 10 Oct 2012 14:04:01 +0200
Subject: [PATCH] - resolves: #812225   fixed sigsegv

---
 gnuplot-4.6.1-plot-sigsegv.patch | 21 +++++++++++++++++++++
 gnuplot.spec                     |  6 ++++++
 2 files changed, 27 insertions(+)
 create mode 100644 gnuplot-4.6.1-plot-sigsegv.patch

diff --git a/gnuplot-4.6.1-plot-sigsegv.patch b/gnuplot-4.6.1-plot-sigsegv.patch
new file mode 100644
index 0000000..6ce2451
--- /dev/null
+++ b/gnuplot-4.6.1-plot-sigsegv.patch
@@ -0,0 +1,21 @@
+diff -upr gnuplot-4.6.0.orig/src/gplt_x11.c gnuplot-4.6.0/src/gplt_x11.c
+--- gnuplot-4.6.0.orig/src/gplt_x11.c	2012-07-18 18:55:31.000000000 +0200
++++ gnuplot-4.6.0/src/gplt_x11.c	2012-07-19 12:08:21.177967583 +0200
+@@ -4338,7 +4338,7 @@ process_event(XEvent *event)
+ #endif	/* DISABLE_SPACE_RAISES_CONSOLE */
+ 
+ 	    case 'm': /* Toggle mouse display, but only if we control the window here */
+-		if (((plot != current_plot) && (!modifier_mask))
++		if ((plot && (plot != current_plot) && (!modifier_mask))
+ #ifdef PIPE_IPC
+ 		    || pipe_died
+ #endif
+@@ -4374,7 +4374,7 @@ process_event(XEvent *event)
+ 	    gp_exec_event(GE_keypress,                               \
+ 		(int)RevX(event->xkey.x), (int)RevY(event->xkey.y),  \
+ 		gp_keysym, 0, plot->plot_number);                    \
+-	} else {                                                     \
++	} else if (plot) {                                                     \
+ 	    gp_exec_event(GE_keypress_old,                              \
+ 		(int)RevX(event->xkey.x), (int)RevY(event->xkey.y),  \
+ 		gp_keysym, 0, plot->plot_number);                    \
diff --git a/gnuplot.spec b/gnuplot.spec
index 39055ef..ef2a64c 100644
--- a/gnuplot.spec
+++ b/gnuplot.spec
@@ -20,6 +20,9 @@ Patch1: gnuplot-4.2.0-fonts.patch
 # resolves: #759964
 # submitted upstream: http://sourceforge.net/tracker/?func=detail&aid=3558970&group_id=2055&atid=302055
 Patch2: gnuplot-4.6.1-xcopygc-sigsegv.patch
+# resolves: #812225
+# submitted upstream: http://sourceforge.net/tracker/?func=detail&aid=3558973&group_id=2055&atid=302055
+Patch3: gnuplot-4.6.1-plot-sigsegv.patch
 
 Requires: %{name}-common = %{version}-%{release}
 Requires: dejavu-sans-fonts
@@ -124,6 +127,7 @@ plotting tool.
 %patch0 -p1 -b .refto
 %patch1 -p1 -b .font
 %patch2 -p1 -b .xcopygc
+%patch3 -p1 -b .plot-sigsegv
 sed -i -e 's:"/usr/lib/X11/app-defaults":"%{x11_app_defaults_dir}":' src/gplt_x11.c
 iconv -f windows-1252 -t utf-8 ChangeLog > ChangeLog.aux
 mv ChangeLog.aux ChangeLog
@@ -268,6 +272,8 @@ fi
 - cleaned .spec file
 - resolves: #759964
   fixed sigsegv
+- resolves: #812225
+  fixed sigsegv
 
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild