[69460] trunk/dports/sysutils/file

[ricci at macports.org]

Revision: 69460
          http://trac.macports.org/changeset/69460
Author:   ricci at macports.org
Date:     2010-07-06 16:06:14 -0700 (Tue, 06 Jul 2010)
Log Message:
-----------
add patch (from Apple OpenSource) that avoids a NULL pointer deref.

Modified Paths:
--------------
    trunk/dports/sysutils/file/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/file/files/patch-src-readcdf.c.diff

Modified: trunk/dports/sysutils/file/Portfile
===================================================================
--- trunk/dports/sysutils/file/Portfile	2010-07-06 20:03:41 UTC (rev 69459)
+++ trunk/dports/sysutils/file/Portfile	2010-07-06 23:06:14 UTC (rev 69460)
@@ -5,6 +5,7 @@
 
 name                file
 version             5.04
+revision            1
 categories          sysutils
 maintainers         jay.fm:jay-macports \
                     openmaintainer
@@ -27,7 +28,8 @@
                     sha1    56ddf7135471aa656334ed8fefe1112bcccc2cc3 \
                     rmd160  2ee0dc535a4fb6f06950f81882772cc34f981984
 
-patchfiles          patch-magic-Magdir-msdos.diff
+patchfiles          patch-magic-Magdir-msdos.diff \
+                    patch-src-readcdf.c.diff
 
 configure.args      --mandir=${prefix}/share/man \
                     --enable-fsect-man5

Added: trunk/dports/sysutils/file/files/patch-src-readcdf.c.diff
===================================================================
--- trunk/dports/sysutils/file/files/patch-src-readcdf.c.diff	                        (rev 0)
+++ trunk/dports/sysutils/file/files/patch-src-readcdf.c.diff	2010-07-06 23:06:14 UTC (rev 69460)
@@ -0,0 +1,11 @@
+--- src/readcdf.c.orig	2010-01-19 17:36:55.000000000 -0800
++++ src/readcdf.c	2010-07-06 15:46:11.000000000 -0700
+@@ -126,7 +126,7 @@
+ 					char *c, *ec;
+ 					cdf_timestamp_to_timespec(&ts, tp);
+ 					c = ctime(&ts.tv_sec);
+-					if ((ec = strchr(c, '\n')) != NULL)
++					if (c != NULL && (ec = strchr(c, '\n')) != NULL)
+ 						*ec = '\0';
+ 
+ 					if (NOTMIME(ms) && file_printf(ms,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100706/c586861e/attachment.html>