From owner-svn-src-all@FreeBSD.ORG  Mon Nov 25 15:54:19 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 68767C3F;
 Mon, 25 Nov 2013 15:54:19 +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 57567237E;
 Mon, 25 Nov 2013 15:54:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAPFsJGd003292;
 Mon, 25 Nov 2013 15:54:19 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAPFsJOE003291;
 Mon, 25 Nov 2013 15:54:19 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201311251554.rAPFsJOE003291@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 25 Nov 2013 15:54:19 +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: r258558 - stable/10/contrib/libexecinfo
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.16
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: Mon, 25 Nov 2013 15:54:19 -0000

Author: emaste
Date: Mon Nov 25 15:54:18 2013
New Revision: 258558
URL: http://svnweb.freebsd.org/changeset/base/258558

Log:
  MFC r258426: libexecinfo: Include terminating null in byte count
  
    Otherwise, a formatted string with a strlen equal to the remaining
    buffer space would have the last character omitted (because vsnprintf
    always null-terminates), and later the assert in backtrace_symbols_fmt
    would fail.
  
  Sponsored by:	DARPA, AFRL
  Approved by:	re (gjb)

Modified:
  stable/10/contrib/libexecinfo/backtrace.c
Directory Properties:
  stable/10/contrib/libexecinfo/   (props changed)

Modified: stable/10/contrib/libexecinfo/backtrace.c
==============================================================================
--- stable/10/contrib/libexecinfo/backtrace.c	Mon Nov 25 15:53:08 2013	(r258557)
+++ stable/10/contrib/libexecinfo/backtrace.c	Mon Nov 25 15:54:18 2013	(r258558)
@@ -89,7 +89,7 @@ rasprintf(char **buf, size_t *bufsiz, si
 			len = vsnprintf(*buf + offs, *bufsiz - offs, fmt, ap);
 			va_end(ap);
 
-			if (len < 0 || (size_t)len < *bufsiz - offs)
+			if (len < 0 || (size_t)len + 1 < *bufsiz - offs)
 				return len;
 			nbufsiz = MAX(*bufsiz + 512, (size_t)len + 1);
 		} else