Index: libcfa/src/parseargs.cfa
===================================================================
--- libcfa/src/parseargs.cfa	(revision 95bda0a3cc8748aef076e7772d81a61c9b036014)
+++ libcfa/src/parseargs.cfa	(revision 68456fa6a7423f68fd1147107ae8c7ba4f157d44)
@@ -1,9 +1,9 @@
 #include "parseargs.hfa"
 
+#include <ctype.h>
 #include <stdint.h>
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
-#include <assert.h>
 
 extern "C" {
@@ -74,6 +74,5 @@
 
 	int maxv = 'h';
-	assert( opt_count > 0 );
-	char optstring[opt_count * 3] = { '\0' };
+	char optstring[(opt_count * 3) + 2] = { '\0' };
 	{
 		int idx = 0;
@@ -272,15 +271,44 @@
 bool parse(const char * arg, int & value) {
 	char * end;
-	int r = strtoll(arg, &end, 10);
+
+	errno = 0;
+	long long int r = strtoll(arg, &end, 0);
+	if(errno) return false;
 	if(*end != '\0') return false;
-
-	value = r;
-	return true;
+	if(r > (int)MAX) return false;
+	if(r < (int)MIN) return false;
+
+	value = r;
+	return true;
+}
+
+static unsigned long long int strict_strtoull( const char * arg, int base) {
+	errno = 0;
+	{
+		const char * in = arg;
+		for() {
+			if('\0' == *in) {
+				errno = EINVAL;
+				return 0;
+			}
+			if(!isspace(*in)) break;
+			in++;
+		}
+		if(!isdigit(*in)) {
+			errno = EINVAL;
+			return 0;
+		}
+	}
+
+	*char end;
+	unsigned long long int r = strtoull(arg, &end, base);
+	if(*end != '\0') errno = EINVAL;
+	if(errno) return 0;
+	return r;
 }
 
 bool parse(const char * arg, unsigned & value) {
-	char * end;
-	unsigned long long int r = strtoull(arg, &end, 10);
-	if(*end != '\0') return false;
+	unsigned long long int r = strict_strtoull(arg, 0);
+	if(errno) return false;
 	if(r > (unsigned)MAX) return false;
 
@@ -290,7 +318,6 @@
 
 bool parse(const char * arg, unsigned long & value) {
-	char * end;
-	unsigned long long int r = strtoull(arg, &end, 10);
-	if(*end != '\0') return false;
+	unsigned long long int r = strict_strtoull(arg, 0);
+	if(errno) return false;
 	if(r > (unsigned long)MAX) return false;
 
@@ -300,11 +327,10 @@
 
 bool parse(const char * arg, unsigned long long & value) {
-        char * end;
-        unsigned long long int r = strtoull(arg, &end, 10);
-        if(*end != '\0') return false;
-        if(r > (unsigned long long)MAX) return false;
-
-        value = r;
-        return true;
+	unsigned long long int r = strict_strtoull(arg, 0);
+	if(errno) return false;
+	if(r > (unsigned long long)MAX) return false;
+
+	value = r;
+	return true;
 }