From: Florian Forster <octo@collectd.org>
Date: Thu, 21 Jul 2016 05:49:50 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~200
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=290741f2e6de9e9b467463c1f0c6f031c4036428;hp=e0a35d57e56ec31e42b1aa984cb2038f570925e6

Merge branch 'collectd-5.5'
---

diff --git a/src/network.c b/src/network.c
index 219f163e..ac076ccc 100644
--- a/src/network.c
+++ b/src/network.c
@@ -1439,6 +1439,7 @@ static int parse_packet (sockent_t *se, /* {{{ */
 				printed_ignore_warning = 1;
 			}
 			buffer = ((char *) buffer) + pkg_length;
+			buffer_size -= (size_t) pkg_length;
 			continue;
 		}
 #endif /* HAVE_LIBGCRYPT */
@@ -1466,6 +1467,7 @@ static int parse_packet (sockent_t *se, /* {{{ */
 				printed_ignore_warning = 1;
 			}
 			buffer = ((char *) buffer) + pkg_length;
+			buffer_size -= (size_t) pkg_length;
 			continue;
 		}
 #endif /* HAVE_LIBGCRYPT */
@@ -1607,6 +1609,7 @@ static int parse_packet (sockent_t *se, /* {{{ */
 			DEBUG ("network plugin: parse_packet: Unknown part"
 					" type: 0x%04hx", pkg_type);
 			buffer = ((char *) buffer) + pkg_length;
+			buffer_size -= (size_t) pkg_length;
 		}
 	} /* while (buffer_size > sizeof (part_header_t)) */