aboutsummaryrefslogtreecommitdiffstats
path: root/main/librsync/0001-Handle-searched-checksum-is-bigger-than-any-existing.patch
diff options
context:
space:
mode:
authorHenrik Riomar <henrik.riomar@gmail.com>2017-05-15 21:31:32 +0200
committerJakub Jirutka <jakub@jirutka.cz>2017-05-16 02:47:20 +0200
commitb4160ee227b2bcf4bc2ec726e6bfe8ba51f76626 (patch)
treed75476e20c98ecdab6c0aaf4e66a618ac06e521b /main/librsync/0001-Handle-searched-checksum-is-bigger-than-any-existing.patch
parente5173496aee5e0114383d201385feec0acfed3dc (diff)
downloadaports-b4160ee227b2bcf4bc2ec726e6bfe8ba51f76626.tar.bz2
aports-b4160ee227b2bcf4bc2ec726e6bfe8ba51f76626.tar.xz
main/librsync: backport fix for segfault
When running rdiff-backup we get a segfault in librsync.so.2.0.0, backport upstream fix.
Diffstat (limited to 'main/librsync/0001-Handle-searched-checksum-is-bigger-than-any-existing.patch')
-rw-r--r--main/librsync/0001-Handle-searched-checksum-is-bigger-than-any-existing.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/main/librsync/0001-Handle-searched-checksum-is-bigger-than-any-existing.patch b/main/librsync/0001-Handle-searched-checksum-is-bigger-than-any-existing.patch
new file mode 100644
index 0000000000..46be723351
--- /dev/null
+++ b/main/librsync/0001-Handle-searched-checksum-is-bigger-than-any-existing.patch
@@ -0,0 +1,26 @@
+From e4f891a2bf923ce1a6b0867670db1dfc8e552981 Mon Sep 17 00:00:00 2001
+From: Victor Denisov <vdenisov@mirantis.com>
+Date: Mon, 18 Jan 2016 23:00:58 -0800
+Subject: [PATCH] Handle searched checksum is bigger than any existing
+
+Fix for issue #50
+---
+ src/search.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/search.c b/src/search.c
+index 75433b4..fce3831 100644
+--- a/src/search.c
++++ b/src/search.c
+@@ -218,7 +218,7 @@ rs_search_for_block(rs_weak_sum_t weak_sum,
+ 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)
+--
+2.13.0
+