From: collectd bot <32910397+collectd-bot@users.noreply.github.com>
Date: Fri, 17 Nov 2017 15:08:50 +0000 (+0100)
Subject: Auto-Merge pull request #2547 from octo/cid/81390
X-Git-Tag: collectd-5.8.0~1^2~1
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=f123d3873170fb2bc06a1ea03396e57128d2ab63;hp=4962291342f14fecbc6bb0240bd8ec7c76e2fc64

Auto-Merge pull request #2547 from octo/cid/81390

Automatically merged due to "Automerge" label
---

diff --git a/src/snmp.c b/src/snmp.c
index 74068ec3..ffeface9 100644
--- a/src/snmp.c
+++ b/src/snmp.c
@@ -1403,8 +1403,12 @@ static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
     for (vb = res->variables, i = 0; (vb != NULL);
          vb = vb->next_variable, i++) {
       /* Calculate value index from todo list */
-      while ((i < oid_list_len) && !oid_list_todo[i])
+      while ((i < oid_list_len) && !oid_list_todo[i]) {
         i++;
+      }
+      if (i >= oid_list_len) {
+        break;
+      }
 
       /* An instance is configured and the res variable we process is the
        * instance value (last index) */
@@ -1495,7 +1499,6 @@ static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
     snmp_free_pdu(res);
   res = NULL;
 
-
   if (status == 0)
     csnmp_dispatch_table(host, data, instance_list_head, value_list_head);