From owner-svn-src-head@FreeBSD.ORG  Sat May 15 08:57:17 2010
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 76752106566B;
	Sat, 15 May 2010 08:57:17 +0000 (UTC) (envelope-from phk@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6530F8FC12;
	Sat, 15 May 2010 08:57:17 +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 o4F8vHcI027580;
	Sat, 15 May 2010 08:57:17 GMT (envelope-from phk@svn.freebsd.org)
Received: (from phk@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4F8vHOU027578;
	Sat, 15 May 2010 08:57:17 GMT (envelope-from phk@svn.freebsd.org)
Message-Id: <201005150857.o4F8vHOU027578@svn.freebsd.org>
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Sat, 15 May 2010 08:57:17 +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: r208110 - head/usr.sbin/fifolog/lib
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: Sat, 15 May 2010 08:57:17 -0000

Author: phk
Date: Sat May 15 08:57:16 2010
New Revision: 208110
URL: http://svn.freebsd.org/changeset/base/208110

Log:
  Do not attempt to render a logrecord with length byte, until we have
  decompressed all the bytes required.

Modified:
  head/usr.sbin/fifolog/lib/fifolog_reader.c

Modified: head/usr.sbin/fifolog/lib/fifolog_reader.c
==============================================================================
--- head/usr.sbin/fifolog/lib/fifolog_reader.c	Sat May 15 07:07:38 2010	(r208109)
+++ head/usr.sbin/fifolog/lib/fifolog_reader.c	Sat May 15 08:57:16 2010	(r208110)
@@ -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;