luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-27 07:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

glib/gtimezone.c: Check the size of tzi.DaylightName

Browse Source 
We need to re-get the size of tzi.DaylightName before we call
RegQueryValue() because the buffer might not have enough room to hold the
value for tzi.DaylightName that would be acquired by RegQueryValueExA(),
even though the size of tzi.DaylightName and tzi.StandardName is the same.

This is a pitfall of RegQueryValue()[1] as not doing this can result in an
ERROR_MORE_DATA (234) failure, causing the acquisition of tzi.DaylightName
to fail.

This will fix the gdatetime/equal test, amongst some other tests in
gdatetime, at least on certain non-English version of Windows.

[1]: http://social.msdn.microsoft.com/Forums/vstudio/en-US/84f90854-e90c-4b63-8fc1-655a0b4645fd/regqueryvalueex-returns-errormoredata

https://bugzilla.gnome.org/show_bug.cgi?id=719344
This commit is contained in:
Chun-wei Fan 2014-01-07 13:34:09 +08:00 committed by Matthias Clasen
parent 2330f7e65e
commit 2cb9b8f994
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glib/gtimezone.c
View File

@ -664,6 +664,9 @@ rules_from_windows_time_zone (const gchar *identifier, TimeZoneRule **rules)
if (RegQueryValueExA (key, "Std", NULL, NULL, if (RegQueryValueExA (key, "Std", NULL, NULL,
(LPBYTE)&(tzi.StandardName), &size) != ERROR_SUCCESS) (LPBYTE)&(tzi.StandardName), &size) != ERROR_SUCCESS)
goto failed; goto failed;
size = sizeof tzi.DaylightName;
if (RegQueryValueExA (key, "Dlt", NULL, NULL, if (RegQueryValueExA (key, "Dlt", NULL, NULL,
(LPBYTE)&(tzi.DaylightName), &size) != ERROR_SUCCESS) (LPBYTE)&(tzi.DaylightName), &size) != ERROR_SUCCESS)
goto failed; goto failed;