[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 c45a1ca: doc string file descriptor exhaustion fi
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] emacs-25 c45a1ca: doc string file descriptor exhaustion fix |
Date: |
Sat, 05 Mar 2016 00:30:47 +0000 |
branch: emacs-25
commit c45a1ca3c4eed56be6ad8086dcc805a86bc5935c
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
doc string file descriptor exhaustion fix
* src/doc.c (get_doc_string): Move newly-added check to a better
location (Bug#22814).
---
src/doc.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/doc.c b/src/doc.c
index 6e79065..a20ecbd 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -126,9 +126,6 @@ get_doc_string (Lisp_Object filepos, bool unibyte, bool
definition)
fd = emacs_open (name, O_RDONLY, 0);
if (fd < 0)
{
- if ((errno == EMFILE) || (errno == ENFILE))
- report_file_error ("Read error on documentation file", file);
-
#ifndef CANNOT_DUMP
if (!NILP (Vpurify_flag))
{
@@ -141,6 +138,9 @@ get_doc_string (Lisp_Object filepos, bool unibyte, bool
definition)
#endif
if (fd < 0)
{
+ if (errno == EMFILE || errno == ENFILE)
+ report_file_error ("Read error on documentation file", file);
+
SAFE_FREE ();
AUTO_STRING (cannot_open, "Cannot open doc string file \"");
AUTO_STRING (quote_nl, "\"\n");
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 c45a1ca: doc string file descriptor exhaustion fix,
Paul Eggert <=