korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-12-02 00:24:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

obexd: phonebook-tracker: Fix iso8601_utc_to_localtime

Browse Source 
Timestamp returned from Tracker can optionally contain fractional
seconds. Original code treated any character after seconds as flag for
UTC timestamp. This patch changes it so now only the beginning of string
is scanned and the end of string is checked for UTC flag ('Z') presence.
This commit is contained in:
Slawomir Bochenski 2011-12-08 10:41:21 +01:00 committed by Marcel Holtmann
parent 320dc79f0f
commit afeb4ea4fd
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
obexd/plugins/phonebook-tracker.c
View File

@ -728,15 +728,13 @@ static char *iso8601_utc_to_localtime(const char *datetime)
time_t time;
struct tm tm, *local;
char localdate[32];
char tz;
int nr;
memset(&tm, 0, sizeof(tm));
nr = sscanf(datetime, "%04u-%02u-%02uT%02u:%02u:%02u%c",
nr = sscanf(datetime, "%04u-%02u-%02uT%02u:%02u:%02u",
&tm.tm_year, &tm.tm_mon, &tm.tm_mday,
&tm.tm_hour, &tm.tm_min, &tm.tm_sec,
&tz);
&tm.tm_hour, &tm.tm_min, &tm.tm_sec);
if (nr < 6) {
/* Invalid time format */
error("sscanf(): %s (%d)", strerror(errno), errno);
@ -744,7 +742,7 @@ static char *iso8601_utc_to_localtime(const char *datetime)
}
/* Time already in localtime */
if (nr == 6) {
if (!g_str_has_suffix(datetime, "Z")) {
strftime(localdate, sizeof(localdate), "%Y%m%dT%H%M%S", &tm);
return g_strdup(localdate);
}