summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog4
-rw-r--r--src/image.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 20c8be63cd6..75031274694 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-12 Andreas Schwab <schwab@linux-m68k.org>
+
+ * image.c (x_find_image_file): Don't close a remote file handle.
+
2013-07-12 Paul Eggert <eggert@cs.ucla.edu>
Fix races with threads and file descriptors.
diff --git a/src/image.c b/src/image.c
index 0938a11da7b..00d1836116f 100644
--- a/src/image.c
+++ b/src/image.c
@@ -2260,7 +2260,8 @@ x_find_image_file (Lisp_Object file)
else
{
file_found = ENCODE_FILE (file_found);
- emacs_close (fd);
+ if (fd != -2)
+ emacs_close (fd);
}
return file_found;