From owner-svn-src-stable-9@FreeBSD.ORG  Sat Dec 31 14:21:42 2011
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C772F1065670;
	Sat, 31 Dec 2011 14:21:41 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B18528FC14;
	Sat, 31 Dec 2011 14:21:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBVELfYY067449;
	Sat, 31 Dec 2011 14:21:41 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBVELf2H067447;
	Sat, 31 Dec 2011 14:21:41 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201112311421.pBVELf2H067447@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 31 Dec 2011 14:21:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229095 - stable/9/contrib/file
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 31 Dec 2011 14:21:42 -0000

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;