summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorliguang <lig.fnst@cn.fujitsu.com>2012-12-17 09:49:22 +0800
committerStefan Hajnoczi <stefanha@redhat.com>2013-01-02 16:08:54 +0100
commit37edbf7ea8067262a5c3d8bbe4786139348c8311 (patch)
treef89f902195df28d1c86127a3bbcdbccffee9c18c
parent9e72c45033770b81b536ac6091e91807247cc25a (diff)
downloadqemu-37edbf7ea8067262a5c3d8bbe4786139348c8311.zip
cutils: change strtosz_suffix_unit function
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 <lig.fnst@cn.fujitsu.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r--cutils.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/cutils.c b/cutils.c
index d06590b330..80bb1dcbf7 100644
--- a/cutils.c
+++ b/cutils.c
@@ -214,12 +214,13 @@ static int64_t suffix_mul(char suffix, int64_t unit)
/*
* Convert string to bytes, allowing either B/b for bytes, K/k for KB,
* M/m for MB, G/g for GB or T/t for TB. End pointer will be returned
- * in *end, if not NULL. Return -1 on error.
+ * in *end, if not NULL. Return -ERANGE on overflow, Return -EINVAL on
+ * other error.
*/
int64_t strtosz_suffix_unit(const char *nptr, char **end,
const char default_suffix, int64_t unit)
{
- int64_t retval = -1;
+ int64_t retval = -EINVAL;
char *endptr;
unsigned char c;
int mul_required = 0;
@@ -246,6 +247,7 @@ int64_t strtosz_suffix_unit(const char *nptr, char **end,
goto fail;
}
if ((val * mul >= INT64_MAX) || val < 0) {
+ retval = -ERANGE;
goto fail;
}
retval = val * mul;