22dca23d5

Denis Vlasenko

2006-09-03

SOURCE BUG Duration: 37s

Subject

archival: added O_TRUNC so that when we overwrite files on unpack, we truncate them. Also spotted & fixed hard to trigger bug with extension handling.

SOURCE BUG

This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)

→ Bu hatanin tam hikayesini ve duzeltme diffini gor

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

archival/bunzip2.c +8 -5 archival/gunzip.c +2 -1 archival/uncompress.c +2 -1 archival/unlzma.c +6 -5 archival/unzip.c +1 -1

archival/bunzip2.c+8 -5

@@ -41,17 +41,20 @@ int bunzip2_main(int argc, char **argv)

	if (filename) {
	struct stat stat_buf;
-	char *extension=filename+strlen(filename)-4;
-	if (strcmp(extension, ".bz2") != 0) {
+	/* extension = filename+strlen(filename)-4 is buggy:
+	* strlen may be less than 4 */
+	char *extension = strrchr(filename, '.');
+	if (!extension \|\| strcmp(extension, ".bz2") != 0) {
	bb_error_msg_and_die("Invalid extension");
	}
	xstat(filename, &stat_buf);
-	*extension=0;
-	dst_fd = xopen3(filename, O_WRONLY \| O_CREAT, stat_buf.st_mode);
+	*extension = '\0';
+	dst_fd = xopen3(filename, O_WRONLY \| O_CREAT \| O_TRUNC,
+	stat_buf.st_mode);
	} else dst_fd = STDOUT_FILENO;
	status = uncompressStream(src_fd, dst_fd);
	if(filename) {
-	if (!status) filename[strlen(filename)]='.';
+	if (!status) filename[strlen(filename)] = '.';
	if (unlink(filename) < 0) {
	bb_error_msg_and_die("Couldn't remove %s", filename);
	}

archival/gunzip.c+2 -1

@@ -98,7 +98,8 @@ int gunzip_main(int argc, char **argv)
	}

	/* Open output file (with correct permissions) */
-	dst_fd = xopen3(new_path, O_WRONLY \| O_CREAT, stat_buf.st_mode);
+	dst_fd = xopen3(new_path, O_WRONLY \| O_CREAT \| O_TRUNC,
+	stat_buf.st_mode);

	/* If unzip succeeds remove the old file */
	delete_path = old_path;

archival/uncompress.c+2 -1

@@ -55,7 +55,8 @@ int uncompress_main(int argc, char **argv)

	/* Open output file */
	xstat(compressed_file, &stat_buf);
-	dst_fd = xopen3(uncompressed_file, O_WRONLY \| O_CREAT,
+	dst_fd = xopen3(uncompressed_file,
+	O_WRONLY \| O_CREAT \| O_TRUNC,
	stat_buf.st_mode);

	/* If unzip succeeds remove the old file */

archival/unlzma.c+6 -5

@@ -37,14 +37,15 @@ int unlzma_main(int argc, char **argv)

	if (filename) {
	struct stat stat_buf;
-	char *extension = filename + strlen(filename) - 5;
-
-	if (strcmp(extension, ".lzma") != 0) {
+	/* bug: char extension = filename + strlen(filename) - 5; /
+	char *extension = strrchr(filename, '.');
+	if (!extension \|\| strcmp(extension, ".lzma") != 0) {
	bb_error_msg_and_die("Invalid extension");
	}
	xstat(filename, &stat_buf);
-	*extension = 0;
-	dst_fd = xopen3(filename, O_WRONLY \| O_CREAT, stat_buf.st_mode);
+	*extension = '\0';
+	dst_fd = xopen3(filename, O_WRONLY \| O_CREAT \| O_TRUNC,
+	stat_buf.st_mode);
	} else
	dst_fd = STDOUT_FILENO;
	status = unlzma(src_fd, dst_fd);

archival/unzip.c+1 -1

@@ -333,7 +333,7 @@ int unzip_main(int argc, char **argv)
	overwrite = o_always;
	case 'y': /* Open file and fall into unzip */
	unzip_create_leading_dirs(dst_fn);
-	dst_fd = xopen3(dst_fn, O_WRONLY \| O_CREAT, 0777);
+	dst_fd = xopen3(dst_fn, O_WRONLY \| O_CREAT \| O_TRUNC, 0777);
	case -1: /* Unzip */
	if (verbosity == v_normal) {
	printf(" inflating: %s\n", dst_fn);