From: Goffredo Baroncelli <kreij...@inwind.it>
Check that the suffix for the parse_size() input is of only
one character.
---
utils.c | 25 +++++++++++++++++++------
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/utils.c b/utils.c
index 732c782..e61cdea 100644
--- a/utils.c
+++ b/utils.c
@@ -31,6 +31,7 @@
#include <fcntl.h>
#include <unistd.h>
#include <mntent.h>
+#include <ctype.h>
#include <linux/loop.h>
#include <linux/major.h>
#include <linux/kdev_t.h>
@@ -1222,12 +1223,18 @@ scan_again:
u64 parse_size(char *s)
{
- int len = strlen(s);
+ int i;
char c;
u64 mult = 1;
- if (!isdigit(s[len - 1])) {
- c = tolower(s[len - 1]);
+ for( i=0 ; s[i] && isdigit(s[i]) ; i++ ) ;
+ if( !i ){
+ fprintf(stderr, "ERROR: size value is empty\n");
+ exit(50);
+ }
+
+ if ( s[i] ) {
+ c = tolower(s[i]);
switch (c) {
case 'g':
mult *= 1024;
@@ -1238,11 +1245,17 @@ u64 parse_size(char *s)
case 'b':
break;
default:
- fprintf(stderr, "Unknown size descriptor %c\n", c);
+ fprintf(stderr, "ERROR: Unknown size descriptor "
+ "'%c'\n", c);
exit(1);
}
- s[len - 1] = '\0';
}
- return strtoull(s, NULL, 0) * mult;
+ if( s[i] && s[i+1]) {
+ fprintf(stderr, "ERROR: Illegal suffix contains "
+ "character '%c' in wrong position\n",
+ s[i+1]);
+ exit(51);
+ }
+ return strtoull(s, NULL, 10) * mult;
}
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
