<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[152805] trunk/dports/x11/mkfontscale</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/152805">152805</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2016-09-18 16:31:38 -0700 (Sun, 18 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>mkfontscale: Fix a buffer underrun</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11mkfontscalePortfile">trunk/dports/x11/mkfontscale/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/x11/mkfontscale/files/</li>
<li><a href="#trunkdportsx11mkfontscalefiles0001fixhandlingofType1fontswithoutFamilyNameandopatch">trunk/dports/x11/mkfontscale/files/0001-fix-handling-of-Type1-fonts-without-FamilyName-and-o.patch</a></li>
<li><a href="#trunkdportsx11mkfontscalefiles0002mkfontscaleAvoidabufferunderrunpatch">trunk/dports/x11/mkfontscale/files/0002-mkfontscale-Avoid-a-buffer-underrun.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsx11mkfontscalePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/mkfontscale/Portfile (152804 => 152805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/mkfontscale/Portfile 2016-09-18 23:09:12 UTC (rev 152804)
+++ trunk/dports/x11/mkfontscale/Portfile 2016-09-18 23:31:38 UTC (rev 152805)
</span><span class="lines">@@ -4,6 +4,7 @@
</span><span class="cx">
</span><span class="cx"> name mkfontscale
</span><span class="cx"> version 1.1.2
</span><ins>+revision 1
</ins><span class="cx"> categories x11
</span><span class="cx"> license X11
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -32,6 +33,11 @@
</span><span class="cx"> port:bzip2 \
</span><span class="cx"> port:zlib
</span><span class="cx">
</span><ins>+patch.pre_args -p1
+patchfiles-append \
+ 0001-fix-handling-of-Type1-fonts-without-FamilyName-and-o.patch \
+ 0002-mkfontscale-Avoid-a-buffer-underrun.patch
+
</ins><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url http://xorg.freedesktop.org/archive/individual/app/?C=M&O=D
</span><span class="cx"> livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)
</span></span></pre></div>
<a id="trunkdportsx11mkfontscalefiles0001fixhandlingofType1fontswithoutFamilyNameandopatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/mkfontscale/files/0001-fix-handling-of-Type1-fonts-without-FamilyName-and-o.patch (0 => 152805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/mkfontscale/files/0001-fix-handling-of-Type1-fonts-without-FamilyName-and-o.patch (rev 0)
+++ trunk/dports/x11/mkfontscale/files/0001-fix-handling-of-Type1-fonts-without-FamilyName-and-o.patch 2016-09-18 23:31:38 UTC (rev 152805)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+From ecb248d8865df376a97a795c2e4f58a3bf64c3f1 Mon Sep 17 00:00:00 2001
+From: Stefan Dirsch <sndirsch@suse.de>
+Date: Thu, 21 Apr 2016 16:52:15 +0200
+Subject: [PATCH 1/2] fix handling of Type1 fonts without /FamilyName and/or
+ /FullName
+
+https://bugzilla.opensuse.org/show_bug.cgi?id=918466
+
+Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
+Reviewed-by: Adam Jackson <ajax@redhat.com>
+---
+ mkfontscale.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/mkfontscale.c b/mkfontscale.c
+index da93e0c..e9b9488 100644
+--- a/mkfontscale.c
++++ b/mkfontscale.c
+@@ -579,11 +579,14 @@ makeXLFD(char *filename, FT_Face face, int isBitmap)
+ }
+
+ if(t1info) {
+- if(!family)
++ if(!family && t1info->family_name)
+ family = strdup(t1info->family_name);
+- if(!family)
++ if(!family && t1info->full_name)
+ family = strdup(t1info->full_name);
+- if(!full_name)
++ /* Hershey fonts miss /FamilyName */
++ if(!family && face->family_name)
++ family = strdup(face->family_name);
++ if(!full_name && t1info->full_name)
+ full_name = strdup(t1info->full_name);
+ if(!foundry)
+ foundry = notice_foundry(t1info->notice);
+--
+2.10.0 (Apple Git-77)
+
</ins></span></pre></div>
<a id="trunkdportsx11mkfontscalefiles0002mkfontscaleAvoidabufferunderrunpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/mkfontscale/files/0002-mkfontscale-Avoid-a-buffer-underrun.patch (0 => 152805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/mkfontscale/files/0002-mkfontscale-Avoid-a-buffer-underrun.patch (rev 0)
+++ trunk/dports/x11/mkfontscale/files/0002-mkfontscale-Avoid-a-buffer-underrun.patch 2016-09-18 23:31:38 UTC (rev 152805)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+From 07b761b0862bcea65b83052b9d960c4459af0466 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sun, 18 Sep 2016 16:25:22 -0700
+Subject: [PATCH 2/2] mkfontscale: Avoid a buffer underrun
+
+https://bugs.freedesktop.org/show_bug.cgi?id=96905
+
+=================================================================
+==3068==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x60300000de6f at pc 0x000109df79d1 bp 0x7fff55e37d90 sp 0x7fff55e37550
+READ of size 1 at 0x60300000de6f thread T0
+ #0 0x109df79d0 in wrap_strcmp (libclang_rt.asan_osx_dynamic.dylib+0xe9d0)
+ #1 0x109dc8ef7 in fontFileOpen (mkfontscale+0x100001ef7)
+ #2 0x109dc8e0b in bitmapIdentify (mkfontscale+0x100001e0b)
+ #3 0x109dcc874 in doDirectory (mkfontscale+0x100005874)
+ #4 0x109dcbc78 in main (mkfontscale+0x100004c78)
+ #5 0x7fff9083f5ac in start (libdyld.dylib+0x35ac)
+ #6 0x3 (<unknown module>)
+
+0x60300000de6f is located 1 bytes to the left of 20-byte region [0x60300000de70,0x60300000de84)
+allocated by thread T0 here:
+ #0 0x109e34570 in wrap_malloc (libclang_rt.asan_osx_dynamic.dylib+0x4b570)
+ #1 0x109dca92a in dsprintf (mkfontscale+0x10000392a)
+ #2 0x109dcc788 in doDirectory (mkfontscale+0x100005788)
+ #3 0x109dcbc78 in main (mkfontscale+0x100004c78)
+ #4 0x7fff9083f5ac in start (libdyld.dylib+0x35ac)
+ #5 0x3 (<unknown module>)
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+---
+ ident.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ident.c b/ident.c
+index 22d3648..f7fe9e1 100644
+--- a/ident.c
++++ b/ident.c
+@@ -83,7 +83,7 @@ static inline void *
+ fontFileOpen(fontFile *ff, const char *filename) {
+ int n = strlen(filename);
+
+- if (strcmp(filename + n - 4, ".bz2") == 0) {
++ if (n > 4 && strcmp(filename + n - 4, ".bz2") == 0) {
+ ff->type = bz2FontFile;
+ ff->f.bz2 = BZ2_bzopen(filename, "rb");
+ ff->pos = 0;
+--
+2.10.0 (Apple Git-77)
+
</ins></span></pre>
</div>
</div>
</body>
</html>