[arch-commits] Commit in vbindiff/trunk (2 files)

[Sergej Pupykin]

    Date: Friday, February 13, 2015 @ 16:46:50
  Author: spupykin
Revision: 127666

upgpkg: vbindiff 3.0_beta4-5

upd

Added:
  vbindiff/trunk/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch
Modified:
  vbindiff/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch |   26 ++++++++++
 PKGBUILD                                                        |   13 +++--
 2 files changed, 36 insertions(+), 3 deletions(-)

Added: 0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch
===================================================================
--- 0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch	                        (rev 0)
+++ 0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch	2015-02-13 15:46:50 UTC (rev 127666)
@@ -0,0 +1,26 @@
+From 879a63ac5f0ffdbe7350ccc7438692a6669d26f2 Mon Sep 17 00:00:00 2001
+From: Peter Ross <pross at xvid.org>
+Date: Sat, 22 Feb 2014 22:50:54 +1100
+Subject: [PATCH] vbindiff: prevent segfault when comparing files of different
+ length
+
+---
+ vbindiff.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/vbindiff.cpp b/vbindiff.cpp
+index 116a037..a032bc6 100644
+--- a/vbindiff.cpp
++++ b/vbindiff.cpp
+@@ -487,6 +487,8 @@ void FileDisplay::display()
+ 
+       buf[index++] = displayTable[data->line[i][j]];
+     }
++    if (index < 0)
++        index = 0;
+     memset(buf + index, ' ', sizeof(buf) - index - 1);
+     memset(str, ' ', screenWidth - (str - buf2));
+ 
+-- 
+1.8.3.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-13 13:09:12 UTC (rev 127665)
+++ PKGBUILD	2015-02-13 15:46:50 UTC (rev 127666)
@@ -4,15 +4,22 @@
 
 pkgname=vbindiff
 pkgver=3.0_beta4
-pkgrel=4
+pkgrel=5
 pkgdesc="displays files in hexadecimal and ASCII (or EBCDIC) and highlight the differences between them"
 arch=('i686' 'x86_64')
 url="http://www.cjmweb.net/vbindiff/"
 license=('GPL')
 depends=('gcc-libs' 'ncurses')
-source=($url/$pkgname-$pkgver.tar.gz)
-md5sums=('dbda80ef580e1a0975ef50b9aaa5210e')
+source=($url/$pkgname-$pkgver.tar.gz
+	0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch)
+md5sums=('dbda80ef580e1a0975ef50b9aaa5210e'
+         'aefbf59d36932019eda1efdbd8b50ea4')
 
+prepare() {
+  cd $srcdir/$pkgname-$pkgver
+  patch -p1 <$srcdir/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch
+}
+
 build() {
   cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=$pkgdir/usr