svn commit: r189428 - head/lib/libarchive

[Tim Kientzle]

Author: kientzle
Date: Fri Mar  6 04:22:34 2009
New Revision: 189428
URL: http://svn.freebsd.org/changeset/base/189428

Log:
  Merge r398 from libarchive.googlecode.com: Check that bidder
  object was allocated before we try to use it.

Modified:
  head/lib/libarchive/archive_read_support_compression_program.c

Modified: head/lib/libarchive/archive_read_support_compression_program.c
==============================================================================
--- head/lib/libarchive/archive_read_support_compression_program.c	Fri Mar  6 04:21:23 2009	(r189427)
+++ head/lib/libarchive/archive_read_support_compression_program.c	Fri Mar  6 04:22:34 2009	(r189428)
@@ -109,12 +109,12 @@ archive_read_support_compression_program
 	struct archive_read_filter_bidder *bidder = __archive_read_get_bidder(a);
 	struct program_bidder *state;
 
-	state = (struct program_bidder *)calloc(sizeof (*state), 1);
+	if (bidder == NULL)
+		return (ARCHIVE_FATAL);
 
+	state = (struct program_bidder *)calloc(sizeof (*state), 1);
 	if (state == NULL)
 		return (ARCHIVE_FATAL);
-	if (bidder == NULL)
-		return (ARCHIVE_FATAL);
 
 	state->cmd = strdup(cmd);
 	state->bid = INT_MAX;