Re: [Qemu-devel] [PATCH 3/7] Add more error handling to strtosz()

[Stefan Weil <weil@mail.berlios.de>]

Am 08.10.2010 11:15, schrieb Jes.Sorensen@redhat.com:
> From: Jes Sorensen<Jes.Sorensen@redhat.com>
>
> Signed-off-by: Jes Sorensen<Jes.Sorensen@redhat.com>
> ---
>   cutils.c |   10 +++++++---
>   1 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/cutils.c b/cutils.c
> index 0782032..e5a135e 100644
> --- a/cutils.c
> +++ b/cutils.c
> @@ -292,6 +292,7 @@ int fcntl_setfl(int fd, int flag)
>   ssize_t strtosz(const char *nptr, char **end)
>   {
>       ssize_t retval = -1;
> +    int64_t tmpval;
>       char *endptr;
>       int mul_required = 0;
>       double val, mul = 1;
> @@ -301,9 +302,9 @@ ssize_t strtosz(const char *nptr, char **end)
>           mul_required = 1;
>       }
>
> +    errno = 0;
>       val = strtod(nptr,&endptr);
> -
> -    if (val<  0)
> +    if (endptr == nptr || errno != 0 || val<  0)
>           goto fail;
>    
See CODING_STYLE.
>
>       switch (*endptr++) {
> @@ -332,7 +333,10 @@ ssize_t strtosz(const char *nptr, char **end)
>           goto fail;
>       }
>
> -    retval = (ssize_t)(val * mul);
> +    tmpval = (val * mul);
> +    if (tmpval>= ~(size_t)0)
> +        goto fail;
>    
See CODING_STYLE.
> +    retval = tmpval;
>
>       if (end)
>           *end = endptr;
>