File readline82-006 of Package readline

Overview Repositories Revisions Requests Users Attributes Meta

File readline82-006 of Package readline

READLINE PATCH REPORT
			   =====================

Readline-Release: 8.2
Patch-ID: readline82-006

Bug-Reported-by:	Tom de Vries <tdevries@suse.de>
Bug-Reference-ID:
Bug-Reference-URL:	https://lists.gnu.org/archive/html/bug-readline/2022-09/msg00001.html

Bug-Description:

This is a variant of the same issue as the one fixed by patch 5. In this
case, the signal arrives and is pending before readline calls rl_getc().
When this happens, the pending signal will be handled by the loop, but may
alter or destroy some state that the callback uses. Readline needs to treat
this case the same way it would if a signal interrupts pselect/select, so
compound operations like searches and reading numeric arguments get cleaned
up properly.

Patch (apply with `patch -p0'):

*** ../readline-8.2-patched/input.c	2022-12-22 16:15:48.000000000 -0500
--- input.c	2023-01-10 11:53:45.000000000 -0500
***************
*** 812,816 ****
  rl_getc (FILE *stream)
  {
!   int result;
    unsigned char c;
    int fd;
--- 812,816 ----
  rl_getc (FILE *stream)
  {
!   int result, ostate, osig;
    unsigned char c;
    int fd;
***************
*** 823,828 ****
--- 823,842 ----
    while (1)
      {
+       osig = _rl_caught_signal;
+       ostate = rl_readline_state;
+ 
        RL_CHECK_SIGNALS ();
  
+ #if defined (READLINE_CALLBACKS)
+       /* Do signal handling post-processing here, but just in callback mode
+ 	 for right now because the signal cleanup can change some of the
+ 	 callback state, and we need to either let the application have a
+ 	 chance to react or abort some current operation that gets cleaned
+ 	 up by rl_callback_sigcleanup(). If not, we'll just run through the
+ 	 loop again. */
+       if (osig != 0 && (ostate & RL_STATE_CALLBACK))
+ 	goto postproc_signal;
+ #endif
+ 
        /* We know at this point that _rl_caught_signal == 0 */
  
***************
*** 888,891 ****
--- 902,908 ----
  
  handle_error:
+       osig = _rl_caught_signal;
+       ostate = rl_readline_state;
+ 
        /* If the error that we received was EINTR, then try again,
  	 this is simply an interrupted system call to read ().  We allow
***************
*** 928,933 ****
--- 945,959 ----
  #endif  /* SIGALRM */
  
+ postproc_signal:
+       /* POSIX says read(2)/pselect(2)/select(2) don't return EINTR for any
+ 	 reason other than being interrupted by a signal, so we can safely
+ 	 call the application's signal event hook. */
        if (rl_signal_event_hook)
  	(*rl_signal_event_hook) ();
+ #if defined (READLINE_CALLBACKS)
+       else if (osig == SIGINT && (ostate & RL_STATE_CALLBACK) && (ostate & (RL_STATE_ISEARCH|RL_STATE_NSEARCH|RL_STATE_NUMERICARG)))
+         /* just these cases for now */
+         _rl_abort_internal ();
+ #endif
      }
  }
*** ../readline-8.2/patchlevel	2013-11-15 08:11:11.000000000 -0500
--- patchlevel	2014-03-21 08:28:40.000000000 -0400
***************
*** 1,3 ****
  # Do not edit -- exists only for use by patch
  
! 5
--- 1,3 ----
  # Do not edit -- exists only for use by patch
  
! 6

Places

File readline82-006 of Package readline

Places