edit/vi.c: sanity checks from OpenSUSE

McDutchie · McDutchie · commit 129614b99f12 · 2021-01-28T04:35:46.000Z
Source: https://build.opensuse.org/package/view_file/shells/ksh/ksh93-vi.dif Patch from 2007, apparently never upstreamed.
diff --git a/src/cmd/ksh93/edit/vi.c b/src/cmd/ksh93/edit/vi.c
@@ -385,6 +385,8 @@ int ed_viread(void *context, int fd, register char *shbuf, int nchar, int reedit
 
 	if(!yankbuf)
 		yankbuf = (genchar*)malloc(MAXLINE*CHARSIZE);
+	if(!vp->lastline)
+		vp->lastline = (genchar*)malloc(MAXLINE*CHARSIZE);
 	if( vp->last_cmd == '\0' )
 	{
 		/*** first time for this shell ***/
@@ -394,6 +396,8 @@ int ed_viread(void *context, int fd, register char *shbuf, int nchar, int reedit
 		vp->lastmotion = '\0';
 		vp->lastrepeat = 1;
 		vp->repeat = 1;
+		if(!yankbuf)
+			return(-1);
 		*yankbuf = 0;
 	}
 
@@ -1117,7 +1121,7 @@ static void cdelete(Vi_t *vp,register int nchars, int mode)
 
 		/*** save characters to be deleted ***/
 
-		if( mode != 'c' )
+		if( mode != 'c' && yankbuf )
 		{
 			i = cp[nchars];
 			cp[nchars] = 0;
@@ -2172,6 +2176,8 @@ static void save_last(register Vi_t* vp)
 {
 	register int i;
 
+	if(vp->lastline == NULL)
+		return;
 	if( (i = cur_virt - first_virt + 1) > 0 )
 	{
 		/*** save last thing user typed ***/
@@ -2420,6 +2426,8 @@ static int textmod(register Vi_t *vp,register int c, int mode)
 		/*** change p from lastline to yankbuf ***/
 		p = yankbuf;
 	}
+	if(!p)
+		return(BAD);
 
 addin:
 	switch( c )
@@ -2693,6 +2701,8 @@ static int textmod(register Vi_t *vp,register int c, int mode)
 		vp->lastmotion = c;
 		if( c == 'y' )
 		{
+			if(!yankbuf)
+				return(BAD);
 			gencpy(yankbuf, virtual);
 		}
 		else if(!delmotion(vp, c, 'y'))

Original file line number	Diff line number	Diff line change
`@@ -385,6 +385,8 @@ int ed_viread(void context, int fd, register char shbuf, int nchar, int reedit`
`385`	`385`
`386`	`386`	`if(!yankbuf)`
`387`	`387`	`yankbuf = (genchar)malloc(MAXLINECHARSIZE);`
	`388`	`+ if(!vp->lastline)`
	`389`	`+ vp->lastline = (genchar)malloc(MAXLINECHARSIZE);`
`388`	`390`	`if( vp->last_cmd == '\0' )`
`389`	`391`	`{`
`390`	`392`	`/* first time for this shell */`
`@@ -394,6 +396,8 @@ int ed_viread(void context, int fd, register char shbuf, int nchar, int reedit`
`394`	`396`	`vp->lastmotion = '\0';`
`395`	`397`	`vp->lastrepeat = 1;`
`396`	`398`	`vp->repeat = 1;`
	`399`	`+ if(!yankbuf)`
	`400`	`+ return(-1);`
`397`	`401`	`*yankbuf = 0;`
`398`	`402`	`}`
`399`	`403`
`@@ -1117,7 +1121,7 @@ static void cdelete(Vi_t *vp,register int nchars, int mode)`
`1117`	`1121`
`1118`	`1122`	`/* save characters to be deleted */`
`1119`	`1123`
`1120`		`- if( mode != 'c' )`
	`1124`	`+ if( mode != 'c' && yankbuf )`
`1121`	`1125`	`{`
`1122`	`1126`	`i = cp[nchars];`
`1123`	`1127`	`cp[nchars] = 0;`
`@@ -2172,6 +2176,8 @@ static void save_last(register Vi_t* vp)`
`2172`	`2176`	`{`
`2173`	`2177`	`register int i;`
`2174`	`2178`
	`2179`	`+ if(vp->lastline == NULL)`
	`2180`	`+ return;`
`2175`	`2181`	`if( (i = cur_virt - first_virt + 1) > 0 )`
`2176`	`2182`	`{`
`2177`	`2183`	`/* save last thing user typed */`
`@@ -2420,6 +2426,8 @@ static int textmod(register Vi_t *vp,register int c, int mode)`
`2420`	`2426`	`/* change p from lastline to yankbuf */`
`2421`	`2427`	`p = yankbuf;`
`2422`	`2428`	`}`
	`2429`	`+ if(!p)`
	`2430`	`+ return(BAD);`
`2423`	`2431`
`2424`	`2432`	`addin:`
`2425`	`2433`	`switch( c )`
`@@ -2693,6 +2701,8 @@ static int textmod(register Vi_t *vp,register int c, int mode)`
`2693`	`2701`	`vp->lastmotion = c;`
`2694`	`2702`	`if( c == 'y' )`
`2695`	`2703`	`{`
	`2704`	`+ if(!yankbuf)`
	`2705`	`+ return(BAD);`
`2696`	`2706`	`gencpy(yankbuf, virtual);`
`2697`	`2707`	`}`
`2698`	`2708`	`else if(!delmotion(vp, c, 'y'))`