diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-04 16:29:55 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-04 16:30:43 -0800 |
| commit | c45a1ca3c4eed56be6ad8086dcc805a86bc5935c (patch) | |
| tree | 69cc5b2e7f8b6d21160ce750f4bffce47a88169b /src/doc.c | |
| parent | 265141b332edfacd03e10a2de9e070077d0b2e82 (diff) | |
| download | emacs-c45a1ca3c4eed56be6ad8086dcc805a86bc5935c.tar.gz | |
doc string file descriptor exhaustion fix
* src/doc.c (get_doc_string): Move newly-added check to a better
location (Bug#22814).
Diffstat (limited to 'src/doc.c')
| -rw-r--r-- | src/doc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/doc.c b/src/doc.c index 6e7906578a4..a20ecbdb753 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"); |