Avoid crash due to broken optimisation in job locking [OpenSUSE]

McDutchie · McDutchie · commit 88e8fa67c69a · 2020-07-22T05:01:21.000+01:00
This applies ksh93-jobs.dif from OpenSUSE. Source: https://build.opensuse.org/package/show/openSUSE:Leap:42.3:Update/ksh src/cmd/ksh93/sh/jobs.c: - jog_init(): Save errno in case close(JOBTTY) fails. If cause of failure was interruption by a signal (EINTR), repeat close. - job_kill(): Replace Red Hat fix for #35 with nicer OpenSUSE fix that doesn't add a goto before declaring variables. Re: ff358f3
diff --git a/src/cmd/ksh93/sh/jobs.c b/src/cmd/ksh93/sh/jobs.c
@@ -530,12 +530,14 @@ void job_init(Shell_t *shp, int lflag)
 		/* This should have already been done by rlogin */
                 register int fd;
                 register char *ttynam;
+		int err = errno;
 #ifndef SIGTSTP
                 setpgid(0,shp->gd->pid);
 #endif /*SIGTSTP */
                 if(job.mypgid<0 || !(ttynam=ttyname(JOBTTY)))
                         return;
-                close(JOBTTY);
+		while(close(JOBTTY)<0 && errno==EINTR)
+			errno = err;
                 if((fd = open(ttynam,O_RDWR)) <0)
                         return;
                 if(fd!=JOBTTY)
@@ -977,9 +979,7 @@ static struct process *job_bystring(register char *ajob)
 
 int job_kill(register struct process *pw,register int sig)
 {
-	if(!pw)
-		goto error;
-	Shell_t	*shp = pw->p_shp;
+	Shell_t	*shp;
 	register pid_t pid;
 	register int r;
 	const char *msg;
@@ -990,6 +990,9 @@ int job_kill(register struct process *pw,register int sig)
 #endif	/* SIGTSTP */
 	job_lock();
 	errno = ECHILD;
+	if(pw==0)
+		goto error;
+	shp = pw->p_shp;
 	pid = pw->p_pid;
 	if(by_number)
 	{
