svn commit: r189471 - head/lib/libarchive

Tim Kientzle kientzle at FreeBSD.org
Fri Mar 6 17:18:32 PST 2009


Author: kientzle
Date: Sat Mar  7 01:18:30 2009
New Revision: 189471
URL: http://svn.freebsd.org/changeset/base/189471

Log:
  Merge r608 from libarchive.googlecode.com: Clear a newly-allocated
  bidder object.

Modified:
  head/lib/libarchive/archive_read.c

Modified: head/lib/libarchive/archive_read.c
==============================================================================
--- head/lib/libarchive/archive_read.c	Sat Mar  7 01:18:21 2009	(r189470)
+++ head/lib/libarchive/archive_read.c	Sat Mar  7 01:18:30 2009	(r189471)
@@ -805,8 +805,10 @@ __archive_read_get_bidder(struct archive
 	number_slots = sizeof(a->bidders) / sizeof(a->bidders[0]);
 
 	for (i = 0; i < number_slots; i++) {
-		if (a->bidders[i].bid == NULL)
+		if (a->bidders[i].bid == NULL) {
+			memset(a->bidders + i, 0, sizeof(a->bidders[0]));
 			return (a->bidders + i);
+		}
 	}
 
 	__archive_errx(1, "Not enough slots for compression registration");


More information about the svn-src-all mailing list