diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index c1ef68dd0c6..4ebcb84acba 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-20  Mark Wielaard  <mjw@redhat.com>
+
+	* src/closures.c (open_temp_exec_file_mnt): Check if getmntent_r
+	returns NULL.
+
 2010-08-09  Andreas Tobler  <andreast@fgznet.ch>
 
 	* configure.ac: Add target powerpc64-*-freebsd*.
diff --git a/libffi/src/closures.c b/libffi/src/closures.c
index 8f295dddc3c..d7b338b5f5e 100644
--- a/libffi/src/closures.c
+++ b/libffi/src/closures.c
@@ -294,7 +294,7 @@ open_temp_exec_file_mnt (const char *mounts)
       struct mntent mnt;
       char buf[MAXPATHLEN * 3];
 
-      if (getmntent_r (last_mntent, &mnt, buf, sizeof (buf)))
+      if (getmntent_r (last_mntent, &mnt, buf, sizeof (buf)) == NULL)
 	return -1;
 
       if (hasmntopt (&mnt, "ro")