From b85183e204dd5137074014612bf2ac0e94188558 Mon Sep 17 00:00:00 2001 From: Francesco Fusco Date: Thu, 19 Dec 2013 18:16:24 +0100 Subject: [PATCH] sFlow: clear the padding putString pads the string to the 4-byte boundary without clearing the "padded" memory. This patch simply set the padding to zero. Signed-off-by: Francesco Fusco Signed-off-by: Ben Pfaff --- lib/sflow_receiver.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/sflow_receiver.c b/lib/sflow_receiver.c index 3e5a67a06..e6fc9a7f9 100644 --- a/lib/sflow_receiver.c +++ b/lib/sflow_receiver.c @@ -198,6 +198,10 @@ inline static void putString(SFLReceiver *receiver, SFLString *s) putNet32(receiver, s->len); memcpy(receiver->sampleCollector.datap, s->str, s->len); receiver->sampleCollector.datap += (s->len + 3) / 4; /* pad to 4-byte boundary */ + if ((s->len % 4) != 0){ + u_int8_t padding = 4 - (s->len % 4); + memset(((u_int8_t*)receiver->sampleCollector.datap)-padding, 0, padding); + } } inline static u_int32_t stringEncodingLength(SFLString *s) { -- 2.20.1