Re: [Qemu-devel] [PATCH] qemu_timedate_diff() shouldn't modify its argument.

[Anthony Liguori <anthony@codemonkey.ws>]

On 11/06/2011 10:00 AM, Gleb Natapov wrote:
> The caller of qemu_timedate_diff() does not expect that tm it passes to
> the function will be modified, but mktime() is destructive and modifies
> its argument. Pass a copy of tm to it and set tm_isdst so that mktime()
> will not rely on it since its value may be outdated.
>
> Signed-off-by: Gleb Natapov<gleb@redhat.com>

Applied.  Thanks.

Regards,

Anthony Liguori

> diff --git a/vl.c b/vl.c
> index 624da0f..641629b 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -460,8 +460,11 @@ int qemu_timedate_diff(struct tm *tm)
>       if (rtc_date_offset == -1)
>           if (rtc_utc)
>               seconds = mktimegm(tm);
> -        else
> -            seconds = mktime(tm);
> +        else {
> +            struct tm tmp = *tm;
> +            tmp.tm_isdst = -1; /* use timezone to figure it out */
> +            seconds = mktime(&tmp);
> +	}
>       else
>           seconds = mktimegm(tm) + rtc_date_offset;
>
> --
> 			Gleb.
>
>