1 files changed, 8 insertions, 0 deletions

diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 0d84ecd2..24de2d45 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;