1 files changed, 36 insertions, 13 deletions

diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 2d9861b..7c5d0ec 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -144,6 +144,25 @@ double previous_value[MAX_OIDS];
 int perf_labels = 1;
 
 
+static char *fix_snmp_range(char *th)
+{
+        double left, right;
+        char *colon, *ret;
+        if (!(colon = strchr(th, ':')))
+                return th;
+        *colon = 0;
+
+        left = strtod(th, NULL);
+        right = strtod(colon + 1, NULL);
+        if (right >= left) {
+                return th;
+        }
+        ret = malloc(strlen(th) + strlen(colon + 1) + 2);
+        sprintf(ret, "@%s:%s", colon + 1, th);
+        free(th);
+        return ret;
+}
+
 int
 main (int argc, char **argv)
 {
@@ -181,8 +200,8 @@ main (int argc, char **argv)
         bindtextdomain (PACKAGE, LOCALEDIR);
         textdomain (PACKAGE);
 
-        labels = malloc (labels_size);
-        unitv = malloc (unitv_size);
+        labels = malloc (labels_size * sizeof(*labels));
+        unitv = malloc (unitv_size * sizeof(*unitv));
         for (i = 0; i < MAX_OIDS; i++)
                 eval_method[i] = CHECK_UNDEF;
 
@@ -228,6 +247,10 @@ main (int argc, char **argv)
         for (i=0; i<numoids; i++) {
                 char *w = th_warn ? strndup(th_warn, strcspn(th_warn, ",")) : NULL;
                 char *c = th_crit ? strndup(th_crit, strcspn(th_crit, ",")) : NULL;
+                /* translate "2:1" to "@1:2" for backwards compatibility */
+                w = w ? fix_snmp_range(w) : NULL;
+                c = c ? fix_snmp_range(c) : NULL;
+
                 /* Skip empty thresholds, while avoiding segfault */
                 set_thresholds(&thlds[i],
                                w ? strpbrk(w, NP_THRESHOLDS_CHARS) : NULL,
@@ -396,7 +419,7 @@ main (int argc, char **argv)
                         show = strstr (response, "Timeticks: ");
                 }
                 else
-                        show = response;
+                        show = response + 3;
 
                 iresult = STATE_DEPENDENT;
 
@@ -405,7 +428,7 @@ main (int argc, char **argv)
                 if (thlds[i]->warning || thlds[i]->critical || calculate_rate) {
                         ptr = strpbrk (show, "0123456789");
                         if (ptr == NULL)
-                                die (STATE_UNKNOWN,_("No valid data returned"));
+                                die (STATE_UNKNOWN,_("No valid data returned (%s)\n"), show);
                         response_value[i] = strtod (ptr, NULL);
 
                         if(calculate_rate) {
@@ -745,9 +768,9 @@ process_arguments (int argc, char **argv)
                         break;
                 case 'l':                                                                       /* label */
                         nlabels++;
-                        if (nlabels >= labels_size) {
+                        if (nlabels > labels_size) {
                                 labels_size += 8;
-                                labels = realloc (labels, labels_size);
+                                labels = realloc (labels, labels_size * sizeof(*labels));
                                 if (labels == NULL)
                                         die (STATE_UNKNOWN, _("Could not reallocate labels[%d]"), (int)nlabels);
                         }
@@ -757,13 +780,13 @@ process_arguments (int argc, char **argv)
                         if (ptr[0] == '\'')
                                 labels[nlabels - 1] = ptr + 1;
                         while (ptr && (ptr = nextarg (ptr))) {
-                                if (nlabels >= labels_size) {
+                                nlabels++;
+                                if (nlabels > labels_size) {
                                         labels_size += 8;
-                                        labels = realloc (labels, labels_size);
+                                        labels = realloc (labels, labels_size * sizeof(*labels));
                                         if (labels == NULL)
                                                 die (STATE_UNKNOWN, _("Could not reallocate labels\n"));
                                 }
-                                nlabels++;
                                 ptr = thisarg (ptr);
                                 if (ptr[0] == '\'')
                                         labels[nlabels - 1] = ptr + 1;
@@ -774,9 +797,9 @@ process_arguments (int argc, char **argv)
                 case 'u':                                                                       /* units */
                         units = optarg;
                         nunits++;
-                        if (nunits >= unitv_size) {
+                        if (nunits > unitv_size) {
                                 unitv_size += 8;
-                                unitv = realloc (unitv, unitv_size);
+                                unitv = realloc (unitv, unitv_size * sizeof(*unitv));
                                 if (unitv == NULL)
                                         die (STATE_UNKNOWN, _("Could not reallocate units [%d]\n"), (int)nunits);
                         }
@@ -786,9 +809,9 @@ process_arguments (int argc, char **argv)
                         if (ptr[0] == '\'')
                                 unitv[nunits - 1] = ptr + 1;
                         while (ptr && (ptr = nextarg (ptr))) {
-                                if (nunits >= unitv_size) {
+                                if (nunits > unitv_size) {
                                         unitv_size += 8;
-                                        unitv = realloc (unitv, unitv_size);
+                                        unitv = realloc (unitv, unitv_size * sizeof(*unitv));
                                         if (units == NULL)
                                                 die (STATE_UNKNOWN, _("Could not realloc() units\n"));
                                 }