Fix # 79171: heap-buffer-overflow in phar_extract_file

cmb69 · smalyshev · commit 7df594b9437a · 2020-02-17T00:20:04.000-08:00
We must not access memory outside of the allocated buffer.
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
@@ -4153,7 +4153,7 @@ static int phar_extract_file(zend_bool overwrite, phar_entry_info *entry, char *
 			if ('\\' == filename[cnt]) {
 				filename[cnt] = '/';
 			}
-		} while (cnt++ <= filename_len);
+		} while (cnt++ < filename_len);
 	}
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -4153,7 +4153,7 @@ static int phar_extract_file(zend_bool overwrite, phar_entry_info entry, char `
`4153`	`4153`	`if ('\\' == filename[cnt]) {`
`4154`	`4154`	`filename[cnt] = '/';`
`4155`	`4155`	`}`
`4156`		`- } while (cnt++ <= filename_len);`
	`4156`	`+ } while (cnt++ < filename_len);`
`4157`	`4157`	`}`
`4158`	`4158`	`#endif`
`4159`	`4159`