4 files changed, 45 insertions, 3 deletions

diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 0d84ecd..24de2d4 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -550,6 +550,10 @@ process_arguments (int argc, char **argv)
 
     /* See comments for 'c' */
     case 'w':                 /* warning threshold */
+                        if (!is_percentage_expression(optarg) && !is_numeric(optarg)) {
+                                        die(STATE_UNKNOWN, "Argument for --warning invalid or missing: %s\n", optarg);
+                        }
+
       if (strstr(optarg, "%")) {
         if (*optarg == '@') {
           warn_freespace_percent = optarg;
@@ -571,6 +575,10 @@ process_arguments (int argc, char **argv)
        force @ at the beginning of the range, so that it is backwards compatible
     */
     case 'c':                 /* critical threshold */
+                        if (!is_percentage_expression(optarg) && !is_numeric(optarg)) {
+                                        die(STATE_UNKNOWN, "Argument for --critical invalid or missing: %s\n", optarg);
+                        }
+
       if (strstr(optarg, "%")) {
         if (*optarg == '@') {
           crit_freespace_percent = optarg;
diff --git a/plugins/t/check_disk.t b/plugins/t/check_disk.t
index e0dd70e..9eb77ce 100644
--- a/plugins/t/check_disk.t
+++ b/plugins/t/check_disk.t
@@ -119,8 +119,12 @@ like  ( $result->only_output, qr/$more_free/, "Have disk name in text");
 
 $result = NPTest->testCmd( "./check_disk -w 1 -c 1 -p $more_free -p $less_free" );
 cmp_ok( $result->return_code, '==', 0, "At least 1 MB available on $more_free and $less_free");
+
 $_ = $result->output;
+
 my ($free_mb_on_mp1, $free_mb_on_mp2) = (m/(\d+)MiB .* (\d+)MiB /g);
+die "Cannot parse output: $_" unless ($free_mb_on_mp1 && $free_mb_on_mp2);
+
 my $free_mb_on_all = $free_mb_on_mp1 + $free_mb_on_mp2;
 
 
@@ -311,8 +315,8 @@ $result = NPTest->testCmd( "./check_disk -w 0% -c 0% -C -w 0% -c 0% -p $mountpoi
 like( $result->output, '/;.*;\|/', "-C selects partitions if -p is not given");
 
 # grouping: exit crit if the sum of free megs on mp1+mp2 is less than warn/crit
-$result = NPTest->testCmd( "./check_disk -w ". ($free_mb_on_all + 1) ." -c ". ($free_mb_on_all + 1) ."-g group -p $mountpoint_valid -p $mountpoint2_valid" );
-cmp_ok( $result->return_code, '==', 2, "grouping: exit crit if the sum of free megs on mp1+mp2 is less than warn/crit");
+$result = NPTest->testCmd( "./check_disk -w ". ($free_mb_on_all + 1) ." -c ". ($free_mb_on_all + 1) ." -g group -p $mountpoint_valid -p $mountpoint2_valid" );
+cmp_ok( $result->return_code, '==', 2, "grouping: exit crit if the sum of free megs on mp1+mp2 is less than warn/crit\nInstead received: " . $result->output);
 
 # grouping: exit warning if the sum of free megs on mp1+mp2 is between -w and -c
 $result = NPTest->testCmd( "./check_disk -w ". ($free_mb_on_all + 1) ." -c ". ($free_mb_on_all - 1) ." -g group -p $mountpoint_valid -p $mountpoint2_valid" );
diff --git a/plugins/utils.c b/plugins/utils.c
index aff1790..77d6a6f 100644
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -23,13 +23,15 @@
 *****************************************************************************/
 
 #include "common.h"
-#include "utils.h"
+#include "./utils.h"
 #include "utils_base.h"
 #include <stdarg.h>
 #include <limits.h>
 #include <string.h>
 #include <errno.h>
 
+#include <stdbool.h>
+
 #include <arpa/inet.h>
 
 extern void print_usage (void);
@@ -188,6 +190,33 @@ bool is_percentage (char *number) {
                 return false;
 }
 
+bool is_percentage_expression (const char str[]) {
+        if (!str) {
+                return false;
+        }
+
+        size_t len = strlen(str);
+
+        if (str[len-1] != '%') {
+                return false;
+        }
+
+        char *foo = calloc(sizeof(char), len + 1);
+
+        if (!foo) {
+                die (STATE_UNKNOWN, _("calloc failed \n"));
+        }
+
+        strcpy(foo, str);
+        foo[len-1] = '\0';
+
+        bool result = is_numeric(foo);
+
+        free(foo);
+
+        return result;
+}
+
 bool is_integer (char *number) {
         long int n;
 
diff --git a/plugins/utils.h b/plugins/utils.h
index 62e489b..f939e33 100644
--- a/plugins/utils.h
+++ b/plugins/utils.h
@@ -49,6 +49,7 @@ bool is_positive (char *);
 bool is_negative (char *);
 bool is_nonnegative (char *);
 bool is_percentage (char *);
+bool is_percentage_expression (const char[]);
 
 bool is_option (char *);