Mercurial > pidgin.yaz
changeset 23905:b789b54c5bb2
purple_str_to_time() didn't necessarily set "rest" under all circumstances.
I'm pretty sure this fixes #4525.
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Tue, 26 Aug 2008 22:37:23 +0000 |
parents | 7071b52a0bf4 |
children | dd4df1a209b7 |
files | libpurple/log.c libpurple/util.c |
diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/log.c Tue Aug 26 22:08:21 2008 +0000 +++ b/libpurple/log.c Tue Aug 26 22:37:23 2008 +0000 @@ -887,9 +887,8 @@ struct tm tm; #if defined (HAVE_TM_GMTOFF) && defined (HAVE_STRUCT_TM_TM_ZONE) long tz_off; - const char *rest; + const char *rest, *end; time_t stamp = purple_str_to_time(purple_unescape_filename(filename), FALSE, &tm, &tz_off, &rest); - char *end; /* As zero is a valid offset, PURPLE_NO_TZ_OFF means no offset was * provided. See util.h. Yes, it's kinda ugly. */