svn commit: r229095 - stable/9/contrib/file

[Dimitry Andric]

Author: dim
Date: Sat Dec 31 14:21:41 2011
New Revision: 229095
URL: http://svn.freebsd.org/changeset/base/229095

Log:
  MFC r228553:
  
  In contrib/file/softmagic.c, fix a potential format string security
  problem.  (This fix has already been applied upstream, but we do not
  have the latest version of file in the tree at the moment.)

Modified:
  stable/9/contrib/file/softmagic.c
Directory Properties:
  stable/9/contrib/file/   (props changed)

Modified: stable/9/contrib/file/softmagic.c
==============================================================================
--- stable/9/contrib/file/softmagic.c	Sat Dec 31 14:13:11 2011	(r229094)
+++ stable/9/contrib/file/softmagic.c	Sat Dec 31 14:21:41 2011	(r229095)
@@ -1582,7 +1582,7 @@ mget(struct magic_set *ms, const unsigne
 
 	case FILE_INDIRECT:
 	  	if ((ms->flags & (MAGIC_MIME|MAGIC_APPLE)) == 0 &&
-		    file_printf(ms, m->desc) == -1)
+		    file_printf(ms, "%s", m->desc) == -1)
 			return -1;
 		if (nbytes < offset)
 			return 0;