song_print: check gmtime_r()'s return value

When song->mtime was not initialized properly, it was revealed that strftime() might crash when gmtime_r() returns NULL due to an invalid time_t input value.

song_print: check gmtime_r()'s return value
17e30543 · Max Kellermann · 09aadffe · 17e30543
Commit 17e30543 authored Jul 06, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 7 deletions

song_print.c src/song_print.c +11 -7

No files found.
--- a/src/song_print.c
+++ b/src/song_print.c
@@ -51,20 +51,24 @@ song_print_info(struct client *client, struct song *song)
 	song_print_url(client, song);

 	if (song->mtime > 0) {
-		time_t t = song->mtime;
 #ifndef G_OS_WIN32
 		struct tm tm;
 #endif
-		char timestamp[32];
+		const struct tm *tm2;

-		strftime(timestamp, sizeof(timestamp), "%FT%TZ",
 #ifdef G_OS_WIN32
-			 gmtime(&t)
+		tm2 = gmtime(&song->mtime);
 #else
-			 gmtime_r(&t, &tm)
+		tm2 = gmtime_r(&song->mtime, &tm);
 #endif
-			 );
-		client_printf(client, "Last-Modified: %s\n", timestamp);
+
+		if (tm2 != NULL) {
+			char timestamp[32];
+
+			strftime(timestamp, sizeof(timestamp), "%FT%TZ", tm2);
+			client_printf(client, "Last-Modified: %s\n",
+				      timestamp);
+		}
 	}

 	if (song->tag)