rexy712/nano-with-linefolding
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

spelling: properly check for a negative return value from read()

Browse Source 
This addresses the first part of
  https://lists.gnu.org/archive/html/nano-devel/2026-05/msg00040.html.
Reported-by: Arjun Basnet <disclose@securin.io>

Problem existed since version 1.1.8, commit f21f3fcc.
This commit is contained in:
Benno Schulenberg
2026-05-25 15:24:49 +02:00
parent 924190ce7d
commit 6b49b498cc
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/text.c
View File

@@ -2349,7 +2349,9 @@ void do_int_speller(const char *tempfile_name)
#if defined(HAVE_FORK) && defined(HAVE_WAITPID)
char *misspellings, *pointer, *oneword;
long pipesize;
size_t buffersize, bytesread, totalread;
ssize_t bytesread;
size_t buffersize, totalread;
int errornumber;
int spell_fd[2], sort_fd[2], uniq_fd[2], tempfile_fd = -1;
pid_t pid_spell, pid_sort, pid_uniq;
int spell_status, sort_status, uniq_status;
@@ -2470,6 +2472,7 @@ void do_int_speller(const char *tempfile_name)
}
*pointer = '\0';
errornumber = errno;
close(uniq_fd[0]);
block_sigwinch(FALSE);
@@ -2478,6 +2481,10 @@ void do_int_speller(const char *tempfile_name)
terminal_init();
doupdate();
/* When reading from the pipe went wrong, skip the spell fixes. */
if (bytesread < 0)
goto finale;
/* Save the settings of the global flags. */
memcpy(stash, flags, sizeof(flags));
@@ -2514,6 +2521,7 @@ void do_int_speller(const char *tempfile_name)
/* Restore the settings of the global flags. */
memcpy(flags, stash, sizeof(flags));
finale:
/* Process the end of the three processes. */
waitpid(pid_spell, &spell_status, 0);
waitpid(pid_sort, &sort_status, 0);
@@ -2525,6 +2533,8 @@ void do_int_speller(const char *tempfile_name)
statusline(ALERT, _("Error invoking \"sort\""));
else if (WIFEXITED(spell_status) == 0 || WEXITSTATUS(spell_status))
statusline(ALERT, _("Error invoking \"spell\""));
else if (bytesread < 0)
statusline(ALERT, _("Error reading pipe: %s"), strerror(errornumber));
else
statusline(REMARK, _("Finished checking spelling"));
#endif