From: Andre Noll <maan@tuebingen.mpg.de>
Date: Fri, 28 Jul 2017 08:03:34 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v0.6.1~49
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=b59e841036a107b52a0221e48d7e05f86da92979;hp=10a62b85c43319d9cdefd7d04823aaed47b3817e

Merge branch 'maint'

A fix for an old bug which should be propagated to master and next.

* maint:
  vss: Avoid use after free in vss_send().
---

diff --git a/vss.c b/vss.c
index 3632cf54..4a1db40d 100644
--- a/vss.c
+++ b/vss.c
@@ -1046,9 +1046,9 @@ static void vss_send(struct vss_task *vsst)
 			continue;
 		PARA_DEBUG_LOG("sending %u:%u (%u bytes)\n", fc->group.num,
 			fc->current_slice_num, fc->group.slice_bytes);
+		fc->current_slice_num++;
 		fc->fcp->send_fec(fc->sc, (char *)fc->enc_buf,
 			fc->group.slice_bytes + FEC_HEADER_SIZE);
-		fc->current_slice_num++;
 		fec_active = 1;
 	}
 	if (mmd->current_chunk >= mmd->afd.afhi.chunks_total) { /* eof */