till pushed to vbindiff (master). "Fix crash when comparing files (#1093968) (..more)"

[notifications at fedoraproject.org]

From 99ecea9b1526924614816ac318c2872d5590749f Mon Sep 17 00:00:00 2001
From: Till Maas <opensource at till.name>
Date: Sat, 30 May 2015 15:08:28 +0200
Subject: Fix crash when comparing files (#1093968)

- Use %license

diff --git a/crash-patch.diff b/crash-patch.diff
new file mode 100644
index 0000000..fd0bf24
--- /dev/null
+++ b/crash-patch.diff
@@ -0,0 +1,11 @@
+diff -up vbindiff-3.0_beta4/vbindiff.cpp.crash_patch vbindiff-3.0_beta4/vbindiff.cpp
+--- vbindiff-3.0_beta4/vbindiff.cpp.crash_patch	2008-07-27 02:52:17.000000000 +0200
++++ vbindiff-3.0_beta4/vbindiff.cpp	2013-12-27 11:55:15.488238681 +0100
+@@ -487,6 +487,7 @@ void FileDisplay::display()
+ 
+       buf[index++] = displayTable[data->line[i][j]];
+     }
++    if (index < 0) index = 0; // in case nothing was printed in this line
+     memset(buf + index, ' ', sizeof(buf) - index - 1);
+     memset(str, ' ', screenWidth - (str - buf2));
+ 
diff --git a/vbindiff.spec b/vbindiff.spec
index d49ac33..f38c5a4 100644
--- a/vbindiff.spec
+++ b/vbindiff.spec
@@ -1,13 +1,15 @@
 %define beta_version 4
 Name:           vbindiff
 Version:        3.0 
-Release:        0.12.beta%{beta_version}%{?dist}
+Release:        0.13.beta%{beta_version}%{?dist}
 Summary:        Visual binary diff
 
 Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://www.cjmweb.net/%{name}/
 Source0:        http://www.cjmweb.net/%{name}/%{name}-%{version}_beta%{beta_version}.tar.gz
+# 2013-10-25: Submitted upstream: https://github.com/madsen/vbindiff/pull/3
+Patch1:         crash-patch.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel
@@ -27,6 +29,7 @@ it has no equivalent to LIST's hex display.
 
 %prep
 %setup -q -n %{name}-%{version}_beta%{beta_version}
+%patch1 -p1 -b .crash_patch
 
 
 %build
@@ -45,12 +48,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS NEWS README README.PuTTY COPYING putty.src
+%doc AUTHORS NEWS README README.PuTTY putty.src
+%license COPYING
 %{_bindir}/%{name}
 %{_datadir}/man/man?/%{name}*
 
 
 %changelog
+* Sat May 30 2015 Till Maas <opensource at till.name> - 3.0-0.13.beta4
+- Fix crash when comparing files (#1093968)
+- Use %%license
+
 * Sat May 02 2015 Kalev Lember <kalevlember at gmail.com> - 3.0-0.12.beta4
 - Rebuilt for GCC 5 C++11 ABI change
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/vbindiff.git/commit/?h=master&id=99ecea9b1526924614816ac318c2872d5590749f