<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="Generator" content="Microsoft Word 14 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:Tahoma;
panose-1:2 11 6 4 3 5 4 4 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman","serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
span.hoenzb
{mso-style-name:hoenzb;}
span.EmailStyle18
{mso-style-type:personal-reply;
font-family:"Calibri","sans-serif";
color:#1F497D;}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri","sans-serif";}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 1.0in 1.0in 1.0in;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-US" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">I think you are correct. I took out the patch and built sato for qemux86. Epiphany does not abort after loading a url, which was the problem my patch alterations
fixed. I’ll try x86-64 with no patch now.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">Joe<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">From:</span></b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif""> Burton, Ross [mailto:ross.burton@intel.com]
<br>
<b>Sent:</b> Thursday, March 08, 2018 2:10 AM<br>
<b>To:</b> Slater, Joseph<br>
<b>Cc:</b> OE-core<br>
<b>Subject:</b> Re: [OE-core] [oe-core][PATCH 1/1] gnome-desktop: do not free() a static buffer<o:p></o:p></span></p>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<p class="MsoNormal">I'm not sure we need this patch anymore, it's been rebased on top of upstream changes but one of those changes were to fix x32 builds:<o:p></o:p></p>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal"><a href="https://git.gnome.org/browse/gnome-desktop/commit/libgnome-desktop/gnome-desktop-thumbnail.c?id=012cad653253ae5f5248988cda89159f22c1fb1d">https://git.gnome.org/browse/gnome-desktop/commit/libgnome-desktop/gnome-desktop-thumbnail.c?id=012cad653253ae5f5248988cda89159f22c1fb1d</a><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">I believe we can drop this patch to gnome-desktop.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">Ross<o:p></o:p></p>
</div>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<p class="MsoNormal">On 8 March 2018 at 01:35, Joe Slater <<a href="mailto:joe.slater@windriver.com" target="_blank">joe.slater@windriver.com</a>> wrote:<o:p></o:p></p>
<p class="MsoNormal">Do not free() the buffer returned by localtime(). Also,<br>
switch to calling localtime_r() which is re-entrant.<br>
<br>
Signed-off-by: Joe Slater <<a href="mailto:joe.slater@windriver.com">joe.slater@windriver.com</a>><br>
---<br>
...op-thumbnail-don-t-convert-time_t-to-long.patch | 27 +++++++++-------------<br>
1 file changed, 11 insertions(+), 16 deletions(-)<br>
<br>
diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch b/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch<br>
index c1a7d4f..be657a8 100644<br>
--- a/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch<br>
+++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch<br>
@@ -9,12 +9,11 @@ build for X32, where long's size doesn't match that of time_t.<br>
Upstream-Status: Pending<br>
Signed-off-by: Christopher Larson <<a href="mailto:chris_larson@mentor.com">chris_larson@mentor.com</a>><br>
<br>
----<br>
- libgnome-desktop/gnome-desktop-thumbnail.c | 16 ++++++++++++++--<br>
- 1 file changed, 14 insertions(+), 2 deletions(-)<br>
+Modified to use localtime_r() and not free() a static structure.<br>
+<br>
+Signed-off-by: Joe Slater <<a href="mailto:jslater@windriver.com">jslater@windriver.com</a>><br>
+<br>
<br>
-diff --git a/libgnome-desktop/gnome-desktop-thumbnail.c b/libgnome-desktop/gnome-desktop-thumbnail.c<br>
-index e56c3d7..5d96bf3 100644<br>
--- a/libgnome-desktop/gnome-desktop-thumbnail.c<br>
+++ b/libgnome-desktop/gnome-desktop-thumbnail.c<br>
@@ -120,6 +120,8 @@<br>
@@ -30,24 +29,23 @@ index e56c3d7..5d96bf3 100644<br>
char *tmp_path = NULL;<br>
int tmp_fd;<br>
char mtime_str[21];<br>
-+ struct tm *tmp_mtime = NULL;<br>
++ struct tm tmp_mtime;<br>
gboolean ret = FALSE;<br>
GError *error = NULL;<br>
const char *width, *height;<br>
-@@ -1124,7 +1127,11 @@ save_thumbnail (GdkPixbuf *pixbuf,<br>
+@@ -1124,7 +1127,10 @@ save_thumbnail (GdkPixbuf *pixbuf,<br>
goto out;<br>
close (tmp_fd);<br>
<br>
- g_snprintf (mtime_str, 21, "%" G_GINT64_FORMAT, (gint64) mtime);<br>
-+ tmp_mtime = localtime (&mtime);<br>
-+ if (!tmp_mtime)<br>
++ if (!localtime_r (&mtime,&tmp_mtime))<br>
+ goto out;<br>
-+ strftime (mtime_str, 21, "%s", tmp_mtime);<br>
-+ free (tmp_mtime);<br>
++<br>
++ strftime (mtime_str, 21, "%s", &tmp_mtime);<br>
width = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Width");<br>
height = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Height");<br>
<br>
-@@ -1319,6 +1326,7 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf,<br>
+@@ -1319,6 +1325,7 @@ gnome_desktop_thumbnail_is_valid (GdkPix<br>
{<br>
const char *thumb_uri, *thumb_mtime_str;<br>
time_t thumb_mtime;<br>
@@ -55,7 +53,7 @@ index e56c3d7..5d96bf3 100644<br>
<br>
thumb_uri = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::URI");<br>
if (g_strcmp0 (uri, thumb_uri) != 0)<br>
-@@ -1327,7 +1335,11 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf,<br>
+@@ -1327,7 +1334,11 @@ gnome_desktop_thumbnail_is_valid (GdkPix<br>
thumb_mtime_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::MTime");<br>
if (!thumb_mtime_str)<br>
return FALSE;<br>
@@ -68,6 +66,3 @@ index e56c3d7..5d96bf3 100644<br>
if (mtime != thumb_mtime)<br>
return FALSE;<br>
<br>
---<br>
-2.14.1<br>
-<br>
<span class="hoenzb"><span style="color:#888888">--</span></span><span style="color:#888888"><br>
<span class="hoenzb">2.7.4</span><br>
<br>
<span class="hoenzb">--</span><br>
<span class="hoenzb">_______________________________________________</span><br>
<span class="hoenzb">Openembedded-core mailing list</span><br>
<span class="hoenzb"><a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a></span><br>
<span class="hoenzb"><a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a></span></span><o:p></o:p></p>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
</div>
</body>
</html>