pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/librsync librsync has a crash in rs_search_for_blo...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d66f109ce850
branches:  trunk
changeset: 352920:d66f109ce850
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Sep 20 08:26:50 2016 +0000

description:
librsync has a crash in rs_search_for_block documented here:
https://github.com/librsync/librsync/issues/50

Forwarded by Andy Carrel in PR 51841.

Bump PKGREVISION.

diffstat:

 net/librsync/Makefile                   |   3 ++-
 net/librsync/distinfo                   |   3 ++-
 net/librsync/patches/patch-src_search.c |  16 ++++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diffs (44 lines):

diff -r 727573edfd39 -r d66f109ce850 net/librsync/Makefile
--- a/net/librsync/Makefile     Tue Sep 20 08:12:33 2016 +0000
+++ b/net/librsync/Makefile     Tue Sep 20 08:26:50 2016 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2016/09/18 22:28:34 wiedi Exp $
+# $NetBSD: Makefile,v 1.5 2016/09/20 08:26:50 wiz Exp $
 
 DISTNAME=      librsync-2.0.0
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=librsync/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
diff -r 727573edfd39 -r d66f109ce850 net/librsync/distinfo
--- a/net/librsync/distinfo     Tue Sep 20 08:12:33 2016 +0000
+++ b/net/librsync/distinfo     Tue Sep 20 08:26:50 2016 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2016/09/01 16:16:55 wiz Exp $
+$NetBSD: distinfo,v 1.5 2016/09/20 08:26:50 wiz Exp $
 
 SHA1 (librsync-2.0.0.tar.gz) = c24a623bba5f9eae48bd3b6cb99ee43d2a40b8c6
 RMD160 (librsync-2.0.0.tar.gz) = f44284c0d33b9fb6a9b8c107169549cf2d121273
 SHA512 (librsync-2.0.0.tar.gz) = 1a88dcc3aa60949e058c57eb0df3e0086823c493de40fed927246f5aada6274db57202074456a0ce5d9aa8b81b41836b0d6221ded6a75d43829572584177e8c0
 Size (librsync-2.0.0.tar.gz) = 155049 bytes
+SHA1 (patch-src_search.c) = 8da2885849e39999f36f9d7ce3824bc177033a53
diff -r 727573edfd39 -r d66f109ce850 net/librsync/patches/patch-src_search.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/librsync/patches/patch-src_search.c   Tue Sep 20 08:26:50 2016 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_search.c,v 1.1 2016/09/20 08:26:50 wiz Exp $
+
+librsync has a crash in rs_search_for_block documented here:
+https://github.com/librsync/librsync/issues/50
+
+--- src/search.c.orig  2015-11-29 20:43:12.000000000 +0000
++++ src/search.c
+@@ -218,7 +218,7 @@ rs_search_for_block(rs_weak_sum_t weak_s
+           r = m;
+     }
+ 
+-    if (l == r) {
++    if ((l == r) && (l <= bucket->r)) {
+       int i = sig->targets[l].i;
+       rs_block_sig_t *b = &(sig->block_sigs[i]);
+       if (weak_sum != b->weak_sum)



Home | Main Index | Thread Index | Old Index