<!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>[143324] trunk/dports/textproc/barcode</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/143324">143324</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2015-12-10 14:58:17 -0800 (Thu, 10 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>barcode: Fix segfault if libpaper is unconfigured</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportstextprocbarcodePortfile">trunk/dports/textproc/barcode/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportstextprocbarcodefilespatchmaincavoidsegfaultonunconfiguredlibpaperdiff">trunk/dports/textproc/barcode/files/patch-main.c-avoid-segfault-on-unconfigured-libpaper.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportstextprocbarcodePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/barcode/Portfile (143323 => 143324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/barcode/Portfile 2015-12-10 22:41:25 UTC (rev 143323)
+++ trunk/dports/textproc/barcode/Portfile 2015-12-10 22:58:17 UTC (rev 143324)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx">
</span><span class="cx"> name barcode
</span><span class="cx"> version 0.99
</span><ins>+revision 1
</ins><span class="cx"> checksums rmd160 44c1574c0a48efae2fc267aab914c03577a4ec4a \
</span><span class="cx"> sha256 7c031cf3eb811242f53664379aebbdd9fae0b7b26b5e5d584c31a9f338154b64
</span><span class="cx">
</span><span class="lines">@@ -28,7 +29,8 @@
</span><span class="cx">
</span><span class="cx"> patchfiles patch-Makefile.am-sample-may-need-replacement-calloc-from-libgnu.diff \
</span><span class="cx"> patch-barcode.h-library.h-avoid-global-declaration-in-header.diff \
</span><del>- patch-codeabar.c-correct-output.diff
</del><ins>+ patch-codeabar.c-correct-output.diff \
+ patch-main.c-avoid-segfault-on-unconfigured-libpaper.diff
</ins><span class="cx">
</span><span class="cx"> use_autoreconf yes
</span><span class="cx"> autoreconf.args -fvi
</span></span></pre></div>
<a id="trunkdportstextprocbarcodefilespatchmaincavoidsegfaultonunconfiguredlibpaperdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/textproc/barcode/files/patch-main.c-avoid-segfault-on-unconfigured-libpaper.diff (0 => 143324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/barcode/files/patch-main.c-avoid-segfault-on-unconfigured-libpaper.diff (rev 0)
+++ trunk/dports/textproc/barcode/files/patch-main.c-avoid-segfault-on-unconfigured-libpaper.diff 2015-12-10 22:58:17 UTC (rev 143324)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+Fix segmentation fault when libpaper is unconfigured
+
+When barcode is compiled with support for libpaper, but libpaper is not
+configured and papersize environment variables are not set, systempapername()
+returns NULL. This causes get_page_geometry() to crash subsequently.
+
+Source code for libpaper suggests that users are expected to call
+defaultpapername() and use its return value instead if that happens.
+Additionally, add a check that will only call get_page_geometry() with non-NULL
+values.
+
+Signed-off-by: Clemens Lang <cal@macports.org>
+Upstream-Status: Pending
+--- main.c.orig 2015-12-10 23:47:45.000000000 +0100
++++ main.c 2015-12-10 23:51:03.000000000 +0100
+@@ -475,10 +475,18 @@
+
+ /* If no paper size has been specified, use the default, if any */
+ if (!page_name) {
++#ifndef NO_LIBPAPER
++ const char *papername = systempapername(); /* or the system default */
++ if (!papername) {
++ papername = defaultpapername();
++ }
++#endif
+ page_wid = 595; page_hei = 842;
+ page_name = "A4"; /* I live in Europe :) */
+ #ifndef NO_LIBPAPER
+- get_page_geometry(systempapername()); /* or the system default */
++ if (papername) {
++ get_page_geometry(papername);
++ }
+ #endif
+ }
+
</ins></span></pre>
</div>
</div>
</body>
</html>