aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2013-07-12 11:02:30 +0200
committerAndreas Schwab2013-07-12 11:02:30 +0200
commitf6774c1ada3b80488f3aa7f0082df6ed8c114dcc (patch)
tree75f3728bdba8c75e5cd45cecc6b52af61f42fac7 /src
parent18331b9040f8bf5a7d370c17cd32cf1d5a7a5d80 (diff)
downloademacs-f6774c1ada3b80488f3aa7f0082df6ed8c114dcc.tar.gz
emacs-f6774c1ada3b80488f3aa7f0082df6ed8c114dcc.zip
* image.c (x_find_image_file): Don't close a remote file handle.
Diffstat (limited to 'src')
-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 @@
12013-07-12 Andreas Schwab <schwab@linux-m68k.org>
2
3 * image.c (x_find_image_file): Don't close a remote file handle.
4
12013-07-12 Paul Eggert <eggert@cs.ucla.edu> 52013-07-12 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Fix races with threads and file descriptors. 7 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)
2260 else 2260 else
2261 { 2261 {
2262 file_found = ENCODE_FILE (file_found); 2262 file_found = ENCODE_FILE (file_found);
2263 emacs_close (fd); 2263 if (fd != -2)
2264 emacs_close (fd);
2264 } 2265 }
2265 2266
2266 return file_found; 2267 return file_found;