diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 76bf2a9951..e70dd68e82 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-12  John Reiser  <jreiser@BitWagon.com>
+
+	* readelf.c (process_symbol_table): Set gnubuckets to NULL after
+	freeing it and before returning.
+
 2009-06-12  Jakub Jelinek  <jakub@redhat.com>
 
 	* readelf.c (process_symbol_table): Don't return early if
diff --git a/binutils/readelf.c b/binutils/readelf.c
index af372fd44d..7c45adeb4b 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -7289,10 +7289,10 @@ process_symbol_table (FILE * file)
       if (gnuchains == NULL)
 	{
 	  free (gnubuckets);
-	  if (do_using_dynamic)
-	    return 0;
 	  gnubuckets = NULL;
 	  ngnubuckets = 0;
+	  if (do_using_dynamic)
+	    return 0;
 	}
     }