ATRONIX/FIX: Avoid heap-buffer-overflow

zsx · Oldes · commit db842b503136 · 2018-09-11T17:17:21.000+02:00
bp-1 might not be readable when len == 0 (cherry picked from commit e1d1c12)
diff --git a/src/core/f-enbase.c b/src/core/f-enbase.c
@@ -609,7 +609,7 @@
 		if (brk && ((count % 32) == 0)) *bp++ = LF;
 	}
 
-	if (*(bp-1) != LF && (len >= 32) && brk) *bp++ = LF;
+	if ((len >= 32) && brk && *(bp-1) != LF) *bp++ = LF;
 	*bp = 0;
 	
 	SERIES_TAIL(series) = DIFF_PTRS(bp, series->data);

Original file line number	Diff line number	Diff line change
`@@ -609,7 +609,7 @@`
`609`	`609`	`if (brk && ((count % 32) == 0)) *bp++ = LF;`
`610`	`610`	`}`
`611`	`611`
`612`		`- if ((bp-1) != LF && (len >= 32) && brk) bp++ = LF;`
	`612`	`+ if ((len >= 32) && brk && (bp-1) != LF) bp++ = LF;`
`613`	`613`	`*bp = 0;`
`614`	`614`
`615`	`615`	`SERIES_TAIL(series) = DIFF_PTRS(bp, series->data);`