[gnuplot/f16] - resolves: #812225 fixed sigsegv in process_event() function

[pschiffe]

commit 020be1db0bd9c893268f0081d5f69df002ee25af
Author: Peter Schiffer <pschiffe at redhat.com>
Date:   Tue Nov 6 17:58:51 2012 +0100

    - resolves: #812225
      fixed sigsegv in process_event() function

 gnuplot-4.6.1-plot-sigsegv.patch |   21 +++++++++++++++++++++
 gnuplot.spec                     |    6 ++++++
 2 files changed, 27 insertions(+), 0 deletions(-)
---
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 27c4285..df7ad04 100644
--- a/gnuplot.spec
+++ b/gnuplot.spec
@@ -21,6 +21,9 @@ Patch3: gnuplot-4.4.1-mp.patch
 # resolves: #759964
 # submitted upstream: http://sourceforge.net/tracker/?func=detail&aid=3558970&group_id=2055&atid=302055
 Patch4: gnuplot-4.6.1-xcopygc-sigsegv.patch
+# resolves: #812225
+# submitted upstream: http://sourceforge.net/tracker/?func=detail&aid=3558973&group_id=2055&atid=302055
+Patch5: gnuplot-4.6.1-plot-sigsegv.patch
 BuildRequires: libpng-devel, tex(latex), zlib-devel, libX11-devel, emacs
 BuildRequires: texinfo, readline-devel, libXt-devel, gd-devel, wxGTK-devel
 BuildRequires: latex2html, librsvg2, giflib-devel, libotf, m17n-lib-flt, lua-devel
@@ -123,6 +126,7 @@ plotting tool.
 %patch2 -p1 -b .font
 %patch3 -p1 -b .mp
 %patch4 -p1 -b .xcopygc
+%patch5 -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
@@ -264,6 +268,8 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Nov  6 2011 Peter Schiffer <pschiffe at redhat.com> 4.4.3-4
 - resolves: #759964
   fixed sigsegv in exec_cmd() function
+- resolves: #812225
+  fixed sigsegv in process_event() function
 
 * Fri Nov 04 2011 Peter Schiffer <pschiffe at redhat.com> 4.4.3-3
 - resolves: #728813