diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 60c5833afc6..1d491887e7d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-08  Joel Brobecker  <brobecker@adacore.com>
+
+	* solib-darwin.c (darwin_bfd_open): Make sure that the filename
+	of the returned BFD is allocated by GDB.
+
 2012-02-07  Tom Tromey  <tromey@redhat.com>
 
 	PR python/12027:
diff --git a/gdb/solib-darwin.c b/gdb/solib-darwin.c
index ddfd48ba985..95f8ad7962d 100644
--- a/gdb/solib-darwin.c
+++ b/gdb/solib-darwin.c
@@ -456,6 +456,12 @@ darwin_bfd_open (char *pathname)
       error (_("`%s': not a shared-library: %s"),
 	     found_pathname, bfd_errmsg (bfd_get_error ()));
     }
+
+  /* Make sure that the filename is malloc'ed.  The current filename
+     for fat-binaries BFDs is a name that was generated by BFD, usually
+     a static string containing the name of the architecture.  */
+  res->filename = xstrdup (pathname);
+
   return res;
 }