diff --git a/gas/ChangeLog b/gas/ChangeLog
index edfdd6658b..0a08ce9465 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -3,6 +3,9 @@
 	* dw2gencfi.c (cfi_add_CFA_offset):
 	Assert DWARF2_CIE_DATA_ALIGNMENT is non-zero.
 
+	* write.c (chain_frchains_together_1): Assert that this function
+	never returns a pointer to the auto variable `dummy'.
+
 2006-10-25  Trevor Smigiel  <Trevor_Smigiel@playstation.sony.com>
 	    Yukishige Shibata  <shibata@rd.scei.sony.co.jp>
 	    Nobuhisa Fujinami  <fnami@rd.scei.sony.co.jp>
diff --git a/gas/write.c b/gas/write.c
index 66a05a530f..2b084e3a01 100644
--- a/gas/write.c
+++ b/gas/write.c
@@ -394,6 +394,7 @@ chain_frchains_together_1 (segT section, struct frchain *frchp)
 	}
     }
   assert (prev_frag->fr_type != 0);
+  assert (prev_frag != &dummy);
   prev_frag->fr_next = 0;
   return prev_frag;
 }