svn commit: r209871 - head/usr.sbin/fifolog/lib

Giorgos Keramidas keramida at FreeBSD.org
Sat Jul 10 11:40:32 UTC 2010


Author: keramida (doc committer)
Date: Sat Jul 10 11:40:31 2010
New Revision: 209871
URL: http://svn.freebsd.org/changeset/base/209871

Log:
  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.
  
  Approved by:	phk
  MFC after:	1 week

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 Jul 10 09:29:48 2010	(r209870)
+++ head/usr.sbin/fifolog/lib/fifolog_reader.c	Sat Jul 10 11:40:31 2010	(r209871)
@@ -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