[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [ [PATCH 1/2] cutils:change strtosz_suffix_unit function
From: |
liguang |
Subject: |
[Qemu-devel] [ [PATCH 1/2] cutils:change strtosz_suffix_unit function |
Date: |
Fri, 7 Dec 2012 11:49:49 +0800 |
if value to be translated is larger than INT64_MAX,
this function will not be convenient for caller to
be aware of it, so change a little for this.
Signed-off-by: liguang <address@hidden>
---
cutils.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cutils.c b/cutils.c
index 4f0692f..8905b5e 100644
--- a/cutils.c
+++ b/cutils.c
@@ -219,11 +219,11 @@ static int64_t suffix_mul(char suffix, int64_t unit)
int64_t strtosz_suffix_unit(const char *nptr, char **end,
const char default_suffix, int64_t unit)
{
- int64_t retval = -1;
+ int64_t retval = -1, mul;
char *endptr;
unsigned char c;
int mul_required = 0;
- double val, mul, integral, fraction;
+ double val, integral, fraction;
errno = 0;
val = strtod(nptr, &endptr);
@@ -246,6 +246,7 @@ int64_t strtosz_suffix_unit(const char *nptr, char **end,
goto fail;
}
if ((val * mul >= INT64_MAX) || val < 0) {
+ retval = 0;
goto fail;
}
retval = val * mul;
--
1.7.2.5
- [Qemu-devel] [ [PATCH 1/2] cutils:change strtosz_suffix_unit function,
liguang <=