Fix for lp:1123153 (poor use of strtol).

[awesomized/libmemcached] / clients / memerror.cc

diff --git a/clients/memerror.cc b/clients/memerror.cc
index fd4238a51eb3dd256fa6530510d9605c12d1aceb..3cee64cce518aaf3b6ca19bb64ac0b399ad6bd55 100644 (file)
--- a/clients/memerror.cc
+++ b/clients/memerror.cc
@@ -1,4 +1,5 @@
 /* LibMemcached
+ * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
  * Copyright (C) 2006-2009 Brian Aker
  * All rights reserved.
  *
@@ -8,17 +9,19 @@
  * Summary:
  *
  */
-#include "config.h"
+#include "mem_config.h"
 
-#include <inttypes.h>
+#include <cerrno>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <climits>
+
 #include <getopt.h>
 #include <iostream>
 #include <unistd.h>
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 #include "utilities.h"
 
@@ -29,27 +32,41 @@
 /* Prototypes */
 void options_parse(int argc, char *argv[]);
 
-static int opt_verbose= 0;
-
 int main(int argc, char *argv[])
 {
   options_parse(argc, argv);
 
-  if (argc != 2)
+  if (argc < 2)
   {
     return EXIT_FAILURE;
   }
 
-  unsigned long value= strtoul(argv[1], (char **) NULL, 10);
-
-  if (value < MEMCACHED_MAXIMUM_RETURN)
+  while (optind < argc)
   {
-    std::cout << memcached_strerror(NULL, (memcached_return_t)value) << std::endl;
-  }
-  else
-  {
-    std::cerr << memcached_strerror(NULL, MEMCACHED_MAXIMUM_RETURN) << std::endl;
-    return EXIT_FAILURE;
+    errno= 0;
+    char *nptr;
+    unsigned long value= strtoul(argv[optind], &nptr, 10);
+
+    if ((errno != 0) or
+        (nptr == argv[optind] and value == 0) or
+        (value == ULONG_MAX and errno == ERANGE) or
+        (value == 0 and errno == EINVAL))
+    {
+      std::cerr << "strtoul() was unable to parse given value" << std::endl;
+      return EXIT_FAILURE;
+    }
+
+    if (value < MEMCACHED_MAXIMUM_RETURN)
+    {
+      std::cout << memcached_strerror(NULL, (memcached_return_t)value) << std::endl;
+    }
+    else
+    {
+      std::cerr << memcached_strerror(NULL, MEMCACHED_MAXIMUM_RETURN) << std::endl;
+      return EXIT_FAILURE;
+    }
+
+    optind++;
   }
 
   return EXIT_SUCCESS;
@@ -62,9 +79,6 @@ void options_parse(int argc, char *argv[])
     {
       {(OPTIONSTRING)"version", no_argument, NULL, OPT_VERSION},
       {(OPTIONSTRING)"help", no_argument, NULL, OPT_HELP},
-      {(OPTIONSTRING)"quiet", no_argument, NULL, OPT_QUIET},
-      {(OPTIONSTRING)"verbose", no_argument, &opt_verbose, OPT_VERBOSE},
-      {(OPTIONSTRING)"debug", no_argument, &opt_verbose, OPT_DEBUG},
       {0, 0, 0, 0},
     };
 
@@ -84,14 +98,6 @@ void options_parse(int argc, char *argv[])
     case 0:
       break;
 
-    case OPT_VERBOSE: /* --verbose or -v */
-      opt_verbose = OPT_VERBOSE;
-      break;
-
-    case OPT_DEBUG: /* --debug or -d */
-      opt_verbose = OPT_DEBUG;
-      break;
-
     case OPT_VERSION: /* --version or -V */
       opt_version= true;
       break;
@@ -100,16 +106,12 @@ void options_parse(int argc, char *argv[])
       opt_help= true;
       break;
 
-    case OPT_QUIET:
-      close_stdio();
-      break;
-
     case '?':
       /* getopt_long already printed an error message. */
       exit(EXIT_FAILURE);
 
     default:
-      abort();
+      exit(EXIT_FAILURE);
     }
   }