From owner-svn-src-all@FreeBSD.ORG  Wed Dec 25 00:48:09 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 DFF0C577;
 Wed, 25 Dec 2013 00:48:09 +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 CB0AF1F13;
 Wed, 25 Dec 2013 00:48:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBP0m96H055361;
 Wed, 25 Dec 2013 00:48:09 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBP0m9vW055360;
 Wed, 25 Dec 2013 00:48:09 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201312250048.rBP0m9vW055360@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 25 Dec 2013 00:48:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r259852 - in stable: 10/contrib/file 8/contrib/file
 9/contrib/file
X-SVN-Group: stable-10
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: Wed, 25 Dec 2013 00:48:10 -0000

Author: dim
Date: Wed Dec 25 00:48:08 2013
New Revision: 259852
URL: http://svnweb.freebsd.org/changeset/base/259852

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

Modified:
  stable/10/contrib/file/compress.c
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/8/contrib/file/compress.c
  stable/9/contrib/file/compress.c
Directory Properties:
  stable/8/contrib/file/   (props changed)
  stable/9/contrib/file/   (props changed)

Modified: stable/10/contrib/file/compress.c
==============================================================================
--- stable/10/contrib/file/compress.c	Wed Dec 25 00:40:42 2013	(r259851)
+++ stable/10/contrib/file/compress.c	Wed Dec 25 00:48:08 2013	(r259852)
@@ -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;