[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/6] qemu-img: Tighten parsing of size arguments
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 5/6] qemu-img: Tighten parsing of size arguments |
Date: |
Tue, 22 Nov 2011 09:46:05 +0100 |
strtosz_suffix() fails unless the size is followed by 0, whitespace or
','. Useless here, because we need to fail for any junk following the
size, even if it starts with whitespace or ','. Check manually.
Things like "qemu-img create xxx 1024," and "qemu-img convert -S '1024
junk'" are now caught.
Signed-off-by: Markus Armbruster <address@hidden>
---
qemu-img.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 86127f0..8bdae66 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -332,8 +332,9 @@ static int img_create(int argc, char **argv)
/* Get image size, if specified */
if (optind < argc) {
int64_t sval;
- sval = strtosz_suffix(argv[optind++], NULL, STRTOSZ_DEFSUFFIX_B);
- if (sval < 0) {
+ char *end;
+ sval = strtosz_suffix(argv[optind++], &end, STRTOSZ_DEFSUFFIX_B);
+ if (sval < 0 || *end) {
error_report("Invalid image size specified! You may use k, M, G or
"
"T suffixes for ");
error_report("kilobytes, megabytes, gigabytes and terabytes.");
@@ -710,8 +711,9 @@ static int img_convert(int argc, char **argv)
case 'S':
{
int64_t sval;
- sval = strtosz_suffix(optarg, NULL, STRTOSZ_DEFSUFFIX_B);
- if (sval < 0) {
+ char *end;
+ sval = strtosz_suffix(optarg, &end, STRTOSZ_DEFSUFFIX_B);
+ if (sval < 0 || *end) {
error_report("Invalid minimum zero buffer size for sparse
output specified");
return 1;
}
--
1.7.6.4
- [Qemu-devel] [PATCH 0/6] Fix strtosz users, clean up its implementation, Markus Armbruster, 2011/11/22
- [Qemu-devel] [PATCH 5/6] qemu-img: Tighten parsing of size arguments,
Markus Armbruster <=
- [Qemu-devel] [PATCH 2/6] vl: Tighten parsing of -numa's parameter mem, Markus Armbruster, 2011/11/22
- [Qemu-devel] [PATCH 1/6] cutils: Drop broken support for zero strtosz default_suffix, Markus Armbruster, 2011/11/22
- [Qemu-devel] [PATCH 6/6] cutils: Make strtosz & friends leave follow set to callers, Markus Armbruster, 2011/11/22
- [Qemu-devel] [PATCH 3/6] vl: Tighten parsing of -m argument, Markus Armbruster, 2011/11/22
- [Qemu-devel] [PATCH 4/6] x86/cpuid: Tighten parsing of tsc_freq=FREQ, Markus Armbruster, 2011/11/22
- Re: [Qemu-devel] [PATCH 0/6] Fix strtosz users, clean up its implementation, Anthony Liguori, 2011/11/28