Fix off-by-one in nv_mktype() (Solaris patch 210-Bug15993811)

McDutchie · McDutchie · commit ad9ea0ba7d42 · 2021-01-08T11:56:04.000Z
This change is pulled from here: https://github.com/oracle/solaris-userland/blob/master/components/ksh93/patches/210-Bug15993811.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).
diff --git a/src/cmd/ksh93/sh/nvtype.c b/src/cmd/ksh93/sh/nvtype.c
@@ -904,8 +904,6 @@ Namval_t *nv_mktype(Namval_t **nodes, int numnodes)
 	}
 	offset = roundof(offset,sizeof(char*));
 	nv_setsize(mp,offset);
-	if(nd)
-		nd++;
 	k = roundof(sizeof(Namtype_t),sizeof(Sfdouble_t)) - sizeof(Namtype_t);
 	pp = newof(NiL, Namtype_t, 1, nnodes*NV_MINSZ + offset + size + (nnodes+nd)*sizeof(char*) + iref*sizeof(struct Namref)+k);
 	pp->fun.dsize = sizeof(Namtype_t)+nnodes*NV_MINSZ +offset+k;

Original file line number	Diff line number	Diff line change
`@@ -904,8 +904,6 @@ Namval_t nv_mktype(Namval_t *nodes, int numnodes)`
`904`	`904`	`}`
`905`	`905`	`offset = roundof(offset,sizeof(char*));`
`906`	`906`	`nv_setsize(mp,offset);`
`907`		`- if(nd)`
`908`		`- nd++;`
`909`	`907`	`k = roundof(sizeof(Namtype_t),sizeof(Sfdouble_t)) - sizeof(Namtype_t);`
`910`	`908`	`pp = newof(NiL, Namtype_t, 1, nnodesNV_MINSZ + offset + size + (nnodes+nd)sizeof(char) + irefsizeof(struct Namref)+k);`
`911`	`909`	`pp->fun.dsize = sizeof(Namtype_t)+nnodes*NV_MINSZ +offset+k;`