From owner-svn-src-head@FreeBSD.ORG  Mon Aug  8 05:22:09 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6A34B1065675;
	Mon,  8 Aug 2011 05:22:09 +0000 (UTC)
	(envelope-from kevlo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 59D7D8FC0C;
	Mon,  8 Aug 2011 05:22:09 +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 p785M9Bt032368;
	Mon, 8 Aug 2011 05:22:09 GMT (envelope-from kevlo@svn.freebsd.org)
Received: (from kevlo@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p785M9R8032366;
	Mon, 8 Aug 2011 05:22:09 GMT (envelope-from kevlo@svn.freebsd.org)
Message-Id: <201108080522.p785M9R8032366@svn.freebsd.org>
From: Kevin Lo <kevlo@FreeBSD.org>
Date: Mon, 8 Aug 2011 05:22:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224702 - head/usr.bin/xlint/lint1
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Aug 2011 05:22:09 -0000

Author: kevlo
Date: Mon Aug  8 05:22:09 2011
New Revision: 224702
URL: http://svn.freebsd.org/changeset/base/224702

Log:
  catstrg() does not set the resulting string length.
  
  PR:	bin/152549
  Submitted by:	Henning Petersen <henning dot petersen at t-online dot de>
  Approved by:	re (hrs)

Modified:
  head/usr.bin/xlint/lint1/tree.c

Modified: head/usr.bin/xlint/lint1/tree.c
==============================================================================
--- head/usr.bin/xlint/lint1/tree.c	Mon Aug  8 03:09:03 2011	(r224701)
+++ head/usr.bin/xlint/lint1/tree.c	Mon Aug  8 05:22:09 2011	(r224702)
@@ -3786,6 +3786,7 @@ catstrg(strg_t *strg1, strg_t *strg2)
 			     (len2 + 1) * sizeof (wchar_t));
 		free(strg2->st_wcp);
 	}
+	strg1->st_len = len;
 	free(strg2);
 
 	return (strg1);