[ipfire-3.x.git] / bash / patches / bash-4.3-lastpipe-nested-pipe-segfault.patch0

*** ../bash-4.3-patched/execute_cmd.c	2014-01-31 10:54:52.000000000 -0500
--- execute_cmd.c	2014-06-19 08:05:49.000000000 -0400
***************
*** 2410,2414 ****
        lstdin = wait_for (lastpid);
  #if defined (JOB_CONTROL)
!       exec_result = job_exit_status (lastpipe_jid);
  #endif
        unfreeze_jobs_list ();
--- 2425,2438 ----
        lstdin = wait_for (lastpid);
  #if defined (JOB_CONTROL)
!       /* If wait_for removes the job from the jobs table, use result of last
! 	 command as pipeline's exit status as usual.  The jobs list can get
! 	 frozen and unfrozen at inconvenient times if there are multiple pipelines
! 	 running simultaneously. */
!       if (INVALID_JOB (lastpipe_jid) == 0)
! 	exec_result = job_exit_status (lastpipe_jid);
!       else if (pipefail_opt)
! 	exec_result = exec_result | lstdin;	/* XXX */
!       /* otherwise we use exec_result */
!         
  #endif
        unfreeze_jobs_list ();
Commit	Line	Data
56ba7d19 MT	1	*** ../bash-4.3-patched/execute_cmd.c 2014-01-31 10:54:52.000000000 -0500
	2	--- execute_cmd.c 2014-06-19 08:05:49.000000000 -0400
	3	***************
	4	* 2410,2414 **
	5	lstdin = wait_for (lastpid);
	6	#if defined (JOB_CONTROL)
	7	! exec_result = job_exit_status (lastpipe_jid);
	8	#endif
	9	unfreeze_jobs_list ();
	10	--- 2425,2438 ----
	11	lstdin = wait_for (lastpid);
	12	#if defined (JOB_CONTROL)
	13	! /* If wait_for removes the job from the jobs table, use result of last
	14	! command as pipeline's exit status as usual. The jobs list can get
	15	! frozen and unfrozen at inconvenient times if there are multiple pipelines
	16	! running simultaneously. */
	17	! if (INVALID_JOB (lastpipe_jid) == 0)
	18	! exec_result = job_exit_status (lastpipe_jid);
	19	! else if (pipefail_opt)
	20	! exec_result = exec_result \| lstdin; /* XXX */
	21	! /* otherwise we use exec_result */
	22	!
	23	#endif
	24	unfreeze_jobs_list ();