openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu_timedate_diff() shouldn't modify its argument. 

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>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Gleb Natapov 2011-11-06 18:00:22 +02:00 committed by Anthony Liguori
parent 47113ab6b8
commit f54c556c08
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vl.c
View File

@ -460,8 +460,11 @@ int qemu_timedate_diff(struct tm *tm)
if (rtc_date_offset == -1) if (rtc_date_offset == -1)
if (rtc_utc) if (rtc_utc)
seconds = mktimegm(tm); seconds = mktimegm(tm);
else else {
seconds = mktime(tm); struct tm tmp = *tm;
tmp.tm_isdst = -1; /* use timezone to figure it out */
seconds = mktime(&tmp);
}
else else
seconds = mktimegm(tm) + rtc_date_offset; seconds = mktimegm(tm) + rtc_date_offset;