setdisc(): Return null pointer if no event (Solaris 110-CR7061011)

McDutchie · McDutchie · commit 3f150672720e · 2021-01-08T11:27:30.000Z
This change is pulled from here: https://github.com/oracle/solaris-userland/blob/master/components/ksh93/patches/110-CR7061011.patch Unfortunately there is no publicly available documentation on why this change was needed. We just have to assume the Solaris people knew what they were doing. ksh2020 upstreamed this too (as well as all the other Solaris patches applied here). src/cmd/ksh93/sh/nvdisc.c: setdisc(): - If no <event> is known for <np>, return a null pointer instead of a pointer to the empty string.
diff --git a/src/cmd/ksh93/sh/nvdisc.c b/src/cmd/ksh93/sh/nvdisc.c
@@ -604,7 +604,7 @@ static char *setdisc(register Namval_t* np,register const char *event,Namval_t *
 		action = vp->bltins[type];
 		vp->bltins[type] = 0;
 	}
-	return(action?(char*)action:"");
+	return((char*)action);
 }
 
 static void putdisc(Namval_t* np, const char* val, int flag, Namfun_t* fp)

Original file line number	Diff line number	Diff line change
`@@ -604,7 +604,7 @@ static char setdisc(register Namval_t np,register const char event,Namval_t `
`604`	`604`	`action = vp->bltins[type];`
`605`	`605`	`vp->bltins[type] = 0;`
`606`	`606`	`}`
`607`		`- return(action?(char*)action:"");`
	`607`	`+ return((char*)action);`
`608`	`608`	`}`
`609`	`609`
`610`	`610`	`static void putdisc(Namval_t* np, const char* val, int flag, Namfun_t* fp)`