sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libc/time: Update g_lcl_tzname only after the success

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Change-Id: I0117c5b43bee3affb36d118e0b97f6dd7137080b
This commit is contained in:
Xiang Xiao 2021-06-21 02:45:30 +08:00 committed by David Sidrane
parent 26908f472e
commit dcad420127
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libs/libc/time/lib_localtime.c
View File

@ -2532,19 +2532,12 @@ void tzset(void)
goto out;
}
g_lcl_isset = strlen(name) < sizeof g_lcl_tzname;
if (g_lcl_isset)
{
strcpy(g_lcl_tzname, name);
}
if (lclptr == NULL)
{
lclptr = lib_malloc(sizeof *lclptr);
if (lclptr == NULL)
{
settzname(); /* all we can do */
goto out;
goto tzname;
}
}
@ -2565,11 +2558,18 @@ void tzset(void)
if (name[0] == ':' || tzparse(name, lclptr, FALSE) != 0)
{
gmtload(lclptr);
goto tzname;
}
}
settzname();
g_lcl_isset = strlen(name) < sizeof g_lcl_tzname;
if (g_lcl_isset)
{
strcpy(g_lcl_tzname, name);
}
tzname:
settzname();
out:
tz_semgive(&g_lcl_sem);
}