| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From 9048939b76b3bd10783adb79ed0aaf6cd13895cc Mon Sep 17 00:00:00 2001 |
| 2 | From: Christopher Larson <chris_larson@mentor.com> |
| 3 | Date: Tue, 13 Dec 2016 20:39:51 -0700 |
| 4 | Subject: [PATCH 1/2] gnome-desktop-thumbnail: don't convert time_t to long |
| 5 | |
| 6 | Explicitly use strftime+strptime rather than snprintf+atol. This fixes the |
| 7 | build for X32, where long's size doesn't match that of time_t. |
| 8 | |
| 9 | Upstream-Status: Pending |
| 10 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> |
| 11 | |
| 12 | |
| 13 | Modify patch described above to eliminate replacement of |
| 14 | |
| 15 | g_snprintf (mtime_str, 21, "%" G_GINT64_FORMAT, (gint64) mtime) |
| 16 | |
| 17 | which is not necessary. Retain replacement of atol(). |
| 18 | |
| 19 | Signed-off-by: Joe Slater <joe.slater@windriver.com> |
| 20 | |
| 21 | --- |
| 22 | libgnome-desktop/gnome-desktop-thumbnail.c | 16 ++++++++++++++-- |
| 23 | 1 file changed, 14 insertions(+), 2 deletions(-) |
| 24 | |
| 25 | diff --git a/libgnome-desktop/gnome-desktop-thumbnail.c b/libgnome-desktop/gnome-desktop-thumbnail.c |
| 26 | index e56c3d7..5d96bf3 100644 |
| 27 | --- a/libgnome-desktop/gnome-desktop-thumbnail.c |
| 28 | +++ b/libgnome-desktop/gnome-desktop-thumbnail.c |
| 29 | @@ -120,6 +120,8 @@ |
| 30 | * Since: 2.2 |
| 31 | */ |
| 32 | |
| 33 | +#define _XOPEN_SOURCE |
| 34 | + |
| 35 | #include <config.h> |
| 36 | |
| 37 | #include <glib.h> |
| 38 | @@ -1319,6 +1326,7 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf, |
| 39 | { |
| 40 | const char *thumb_uri, *thumb_mtime_str; |
| 41 | time_t thumb_mtime; |
| 42 | + struct tm tmp_mtime; |
| 43 | |
| 44 | thumb_uri = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::URI"); |
| 45 | if (g_strcmp0 (uri, thumb_uri) != 0) |
| 46 | @@ -1327,7 +1335,11 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf, |
| 47 | thumb_mtime_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::MTime"); |
| 48 | if (!thumb_mtime_str) |
| 49 | return FALSE; |
| 50 | - thumb_mtime = atol (thumb_mtime_str); |
| 51 | + if (!strptime (thumb_mtime_str, "%s", &tmp_mtime)) |
| 52 | + return FALSE; |
| 53 | + thumb_mtime = mktime (&tmp_mtime); |
| 54 | + if (!thumb_mtime) |
| 55 | + return FALSE; |
| 56 | if (mtime != thumb_mtime) |
| 57 | return FALSE; |
| 58 | |
| 59 | -- |
| 60 | 2.14.1 |
| 61 | |