From owner-svn-src-all@FreeBSD.ORG  Sun Dec 22 14:14:53 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C97ADDCA;
 Sun, 22 Dec 2013 14:14:53 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B69A21FF3;
 Sun, 22 Dec 2013 14:14:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBMEErd0079642;
 Sun, 22 Dec 2013 14:14:53 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBMEErJ7079641;
 Sun, 22 Dec 2013 14:14:53 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201312221414.rBMEErJ7079641@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 22 Dec 2013 14:14:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r259724 - head/contrib/file
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Dec 2013 14:14:53 -0000

Author: dim
Date: Sun Dec 22 14:14:53 2013
New Revision: 259724
URL: http://svnweb.freebsd.org/changeset/base/259724

Log:
  Apply upstream commit 33312fd828e59c78ae4ee30fd70d0ca109748cf0 (by
  zoulasc) to contrib/file:
  
    don't write a char to a pointer.
  
  MFC after:	3 days

Modified:
  head/contrib/file/compress.c

Modified: head/contrib/file/compress.c
==============================================================================
--- head/contrib/file/compress.c	Sun Dec 22 14:13:00 2013	(r259723)
+++ head/contrib/file/compress.c	Sun Dec 22 14:14:53 2013	(r259724)
@@ -480,7 +480,7 @@ uncompressbuf(struct magic_set *ms, int 
 #endif
 			free(*newch);
 			n = 0;
-			newch[0] = '\0';
+			*newch = NULL;
 			goto err;
 		} else {
 			n = r;