diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7504cf4fc0..72329b3f8c 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-14  Andreas Schwab  <schwab@suse.de>
+
+	* config/tc-ia64.c (tc_gen_reloc): Return NULL if relocation is
+	unrepresentable.
+
 2007-08-12  Matthias Klose  <doko@ubuntu.com>
 
 	* doc/Makefile.am (AM_MAKEINFOFLAGS, TEXI2DVI): Include
diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c
index b42c336244..d6fcb2cc7a 100644
--- a/gas/config/tc-ia64.c
+++ b/gas/config/tc-ia64.c
@@ -11678,6 +11678,8 @@ tc_gen_reloc (sec, fixp)
       as_bad_where (fixp->fx_file, fixp->fx_line,
 		    "Cannot represent %s relocation in object file",
 		    bfd_get_reloc_code_name (fixp->fx_r_type));
+      free (reloc);
+      return NULL;
     }
   return reloc;
 }