generic-library/libupnp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SF Bug Tracker id 3507819 - Use of thread-unsafe gmtime() in httpreadwrite.c

Browse Source 
Define http_gmtime_r and web_server_asctime_r and use it.
Those prefix are added since pthread for Win32 already
has macro gmtime_r and asctime_r.
This commit is contained in:
Yoichi NAKAYAMA
2012-04-06 02:20:36 +09:00
parent e10bc2ec0c
commit 34a77cc095
4 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
upnp/src/genlib/net/http/httpreadwrite.c
View File

@@ -164,6 +164,18 @@ static int private_connect(
#endif /* UPNP_ENABLE_BLOCKING_TCP_CONNECTIONS */
}
#ifdef WIN32
struct tm *http_gmtime_r(const time_t *clock, struct tm *result)
{
if (clock == NULL || *clock < 0 || result == NULL)
return NULL;
/* gmtime in VC runtime is thread safe. */
*result = *gmtime(clock);
return result;
}
#endif
int http_FixUrl(IN uri_type *url, OUT uri_type *fixed_url)
{
const char *temp_path = "/";
@@ -1624,6 +1636,7 @@ int http_MakeMessage(membuffer *buf, int http_major_version,
size_t length;
time_t *loc_time;
time_t curr_time;
struct tm date_storage;
struct tm *date;
const char *start_str;
const char *end_str;
@@ -1711,7 +1724,7 @@ int http_MakeMessage(membuffer *buf, int http_major_version,
loc_time = (time_t *)va_arg(argp, time_t *);
}
assert(loc_time);
date = gmtime(loc_time);
date = http_gmtime_r(loc_time, &date_storage);
if (date == NULL)
goto error_handler;
rc = snprintf(tempbuf, sizeof(tempbuf),