mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #609 from t-richards/bugfix/show-invalid-date 

transmission-show: Prevent crash with invalid creation date
This commit is contained in:
Mike Gelfand 2018-10-06 22:43:12 +01:00 committed by GitHub
parent 1b36e34d9b 56d5f117a8
commit 24473c9487
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
utils/show.c
View File

@ -93,6 +93,33 @@ static int compare_files_by_name(void const* va, void const* vb)
return strcmp(a->name, b->name);
}
static char const* unix_timestamp_to_str(time_t timestamp)
{
if (timestamp == 0)
{
return "Unknown";
}
struct tm const* const local_time = localtime(&timestamp);
if (local_time == NULL)
{
return "Invalid";
}
static char buffer[32];
tr_strlcpy(buffer, asctime(local_time), TR_N_ELEMENTS(buffer));
char* const newline_pos = strchr(buffer, '\n');
if (newline_pos != NULL)
{
*newline_pos = '\0';
}
return buffer;
}
static void showInfo(tr_info const* inf)
{
char buf[128];
@ -107,16 +134,7 @@ static void showInfo(tr_info const* inf)
printf(" Name: %s\n", inf->name);
printf(" Hash: %s\n", inf->hashString);
printf(" Created by: %s\n", inf->creator ? inf->creator : "Unknown");
if (inf->dateCreated == 0)
{
printf(" Created on: Unknown\n");
}
else
{
struct tm tm = *localtime(&inf->dateCreated);
printf(" Created on: %s", asctime(&tm));
}
printf(" Created on: %s\n", unix_timestamp_to_str(inf->dateCreated));
if (inf->comment != NULL && *inf->comment != '\0')
{