[graphviz/f18] Fixed dot crash (by dot-crash-fix patch)

[Jaroslav Škarvada]

commit e93a45857ff3fabff3af7f52ab29b19d4d33cad9
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Mon Sep 2 14:35:25 2013 +0200

    Fixed dot crash (by dot-crash-fix patch)
    
      Resolves: rhbz#919308

 graphviz-2.28.0-dot-crash-fix.patch |   29 +++++++++++++++++++++++++++++
 graphviz.spec                       |   11 +++++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)
---
diff --git a/graphviz-2.28.0-dot-crash-fix.patch b/graphviz-2.28.0-dot-crash-fix.patch
new file mode 100644
index 0000000..e0f2f98
--- /dev/null
+++ b/graphviz-2.28.0-dot-crash-fix.patch
@@ -0,0 +1,29 @@
+diff -up graphviz-2.28.0/lib/dotgen/dotsplines.c.dot-crash-fix graphviz-2.28.0/lib/dotgen/dotsplines.c
+--- graphviz-2.28.0/lib/dotgen/dotsplines.c.dot-crash-fix	2011-02-05 19:19:45.000000000 -0500
++++ graphviz-2.28.0/lib/dotgen/dotsplines.c	2013-09-02 07:48:27.160523116 -0400
+@@ -897,6 +897,7 @@ makeSimpleFlatLabels (node_t* tn, node_t
+     ctrx = (leftend + rightend)/2.0;
+     
+     /* do first edge */
++    e = earray[0];
+     pointn = 0;
+     points[pointn++] = tp;
+     points[pointn++] = tp;
+@@ -917,7 +918,7 @@ makeSimpleFlatLabels (node_t* tn, node_t
+     umaxx = ctrx + (ED_label(e)->dimen.x)/2.0;
+ 
+     for (i = 1; i < n_lbls; i++) {
+-	e = edges[ind + i];
++	e = earray[i];
+ 	if (i%2) {  /* down */
+ 	    if (i == 1) {
+ 		lminx = ctrx - (ED_label(e)->dimen.x)/2.0;
+@@ -975,7 +976,7 @@ makeSimpleFlatLabels (node_t* tn, node_t
+ 
+     /* edges with no labels */
+     for (; i < cnt; i++) {
+-	e = edges[ind + i];
++	e = earray[i];
+ 	if (i%2) {  /* down */
+ 	    if (i == 1) {
+ 		lminx = (2*leftend + rightend)/3.0;
diff --git a/graphviz.spec b/graphviz.spec
index efdc258..f8a8729 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -48,7 +48,7 @@
 Name:			graphviz
 Summary:		Graph Visualization Tools
 Version:		2.28.0
-Release:		26%{?dist}
+Release:		27%{?dist}
 Group:			Applications/Multimedia
 License:		EPL
 URL:			http://www.graphviz.org/
@@ -60,7 +60,9 @@ Patch3:			graphviz-2.26.0-testsuite-sigsegv-fix.patch
 # Testsuite now do diff check also in case of err output (#645703).
 Patch4:			graphviz-2.26.0-rtest-errout-fix.patch
 # Actually SWIG is broken, but patch the output to work around it.
-Patch5:                 graphviz-ocaml-4.patch
+Patch5:			graphviz-ocaml-4.patch
+# Fix crash in dot (#919308).
+Patch5:			graphviz-2.28.0-dot-crash-fix.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:		zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2
 BuildRequires:		/bin/ksh, bison, m4, flex, tk-devel, tcl-devel >= 8.3, swig
@@ -260,6 +262,7 @@ Various tcl packages (extensions) for the graphviz tools.
 %patch3 -p1 -b .testsuite-sigsegv-fix
 %patch4 -p1 -b .rtest-errout-fix
 %patch5 -p1 -b .ocaml4
+%patch6 -p1 -b .dot-crash-fix
 
 # Attempt to fix rpmlint warnings about executable sources
 find -type f -regex '.*\.\(c\|h\)$' -exec chmod a-x {} ';'
@@ -534,6 +537,10 @@ fi
 
 
 %changelog
+* Mon Sep  2 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 2.28.0-27
+- Fixed dot crash (by dot-crash-fix patch)
+  Resolves: rhbz#919308
+
 * Wed Jan  9 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 2.28.0-26
 - Rebuilt with -fno-strict-overflow to workaround the overflow problem
   (upstream ticket: http://www.graphviz.org/mantisbt/view.php?id=2244)