svn commit: r210189 - stable/8/usr.sbin/fifolog/lib

Giorgos Keramidas keramida at FreeBSD.org
Sat Jul 17 07:56:01 UTC 2010


Author: keramida (doc committer)
Date: Sat Jul 17 07:56:01 2010
New Revision: 210189
URL: http://svn.freebsd.org/changeset/base/210189

Log:
  MFC r209871 from /head
  
    Fix reading of empty fifolog files.  When we don't have anything
    to inflate, skip the rest of the fifolog reader code to avoid
    hitting the assert about Z_OK a bit further down.

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	Sat Jul 17 05:41:01 2010	(r210188)
+++ stable/8/usr.sbin/fifolog/lib/fifolog_reader.c	Sat Jul 17 07:56:01 2010	(r210189)
@@ -304,8 +304,10 @@ fifolog_reader_process(struct fifolog_re
 			if (i == Z_STREAM_END) {
 				i = inflateReset(zs);
 			}
-			if (i != Z_OK)
+			if (i != Z_OK) {
 				fprintf(stderr, "inflate = %d\n", i);
+				exit (250);
+			}
 			assert(i == Z_OK);
 			if (zs->avail_out != fr->olen) {
 				q = fr->obuf + (fr->olen - zs->avail_out);


More information about the svn-src-all mailing list