Merge pull request #586 from Tarsnap/bounties

Nitpicks
Tarsnap · Sep 26, 2023 · 9bea927 · 9bea927
2 parents 262b178 + d5c1efc
commit 9bea927
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib-platform/util/ts_getfstype.c b/lib-platform/util/ts_getfstype.c
@@ -156,7 +156,7 @@ static struct ftyperec {
 	{SELINUX_MAGIC, "selinux"},
 	{0, NULL}
 };
-#endif /* HAVE_STATFS_F_TYPE */
+#endif /* HAVE_STRUCT_STATFS_F_TYPE */
 #endif /* !HAVE_STRUCT_STATVFS_F_FSTYPENAME */
 #endif /* !HAVE_STRUCT_STATVFS_F_BASETYPE */
 #endif /* !HAVE_STRUCT_STATFS_F_FSTYPENAME */

diff --git a/tar/util.c b/tar/util.c
@@ -296,6 +296,8 @@ process_lines(struct bsdtar *bsdtar, const char *pathname,
 	FILE *f;
 	char *buff, *buff_end, *line_start, *line_end, *p;
 	size_t buff_length, new_buff_length, bytes_read, bytes_wanted;
+	size_t buff_end_pos;
+	size_t line_end_pos;
 	const char * separator;
 	size_t seplen;
 	int lastcharwasr = 0;
@@ -376,12 +378,14 @@ process_lines(struct bsdtar *bsdtar, const char *pathname,
 				bsdtar_errc(bsdtar, 1, ENOMEM,
 				    "Line too long in %s", pathname);
 			buff_length = new_buff_length;
+			buff_end_pos = buff_end - buff;
+			line_end_pos = line_end - buff;
 			p = realloc(buff, buff_length);
 			if (p == NULL)
 				bsdtar_errc(bsdtar, 1, ENOMEM,
 				    "Line too long in %s", pathname);
-			buff_end = p + (buff_end - buff);
-			line_end = p + (line_end - buff);
+			buff_end = p + buff_end_pos;
+			line_end = p + line_end_pos;
 			line_start = buff = p;
 			bsdtar->conffile_buffer = buff;
 		}