From owner-svn-src-stable-8@FreeBSD.ORG  Mon May 24 15:26:40 2010
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 90692106566C;
	Mon, 24 May 2010 15:26:40 +0000 (UTC)
	(envelope-from kensmith@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7E84D8FC16;
	Mon, 24 May 2010 15:26:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4OFQenh038823;
	Mon, 24 May 2010 15:26:40 GMT
	(envelope-from kensmith@svn.freebsd.org)
Received: (from kensmith@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4OFQePi038821;
	Mon, 24 May 2010 15:26:40 GMT
	(envelope-from kensmith@svn.freebsd.org)
Message-Id: <201005241526.o4OFQePi038821@svn.freebsd.org>
From: Ken Smith <kensmith@FreeBSD.org>
Date: Mon, 24 May 2010 15:26:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208506 - stable/8/usr.sbin/fifolog/lib
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 May 2010 15:26:40 -0000

Author: kensmith
Date: Mon May 24 15:26:40 2010
New Revision: 208506
URL: http://svn.freebsd.org/changeset/base/208506

Log:
  Merge r208110:
  
  > Do not attempt to render a logrecord with length byte, until we have
  > decompressed all the bytes required.
  
  Requested by:	phk

Modified:
  stable/8/usr.sbin/fifolog/lib/fifolog_reader.c
Directory Properties:
  stable/8/usr.sbin/fifolog/   (props changed)

Modified: stable/8/usr.sbin/fifolog/lib/fifolog_reader.c
==============================================================================
--- stable/8/usr.sbin/fifolog/lib/fifolog_reader.c	Mon May 24 15:12:12 2010	(r208505)
+++ stable/8/usr.sbin/fifolog/lib/fifolog_reader.c	Mon May 24 15:26:40 2010	(r208506)
@@ -225,6 +225,8 @@ fifolog_reader_chop(struct fifolog_reade
 		if (u & FIFOLOG_LENGTH) {
 			v = p[w];
 			w++;
+			if (p + w + v >= q)
+				return (p);
 		} else {
 			for (v = 0; p + v + w < q && p[v + w] != '\0'; v++)
 				continue;