From 74cacffb0c3894fbf8c43d960842f6360fef41bf Mon Sep 17 00:00:00 2001 From: "Alex Lam S.L" Date: Fri, 31 Mar 2023 07:54:56 +0300 Subject: [install] fix stale pointer with tarball URLs (#2520) * [install] fix stale pointer with tarball URLs fixes #2512 * `alloc()` & `free()` instead of fixed-size buffer --- src/install/extract_tarball.zig | 6 +++--- src/install/install.zig | 34 +++++++++++++++++++++++----------- 2 files changed, 26 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/install/extract_tarball.zig b/src/install/extract_tarball.zig index b2664392e..df2238535 100644 --- a/src/install/extract_tarball.zig +++ b/src/install/extract_tarball.zig @@ -24,7 +24,7 @@ temp_dir: std.fs.Dir, dependency_id: DependencyID, skip_verify: bool = false, integrity: Integrity = .{}, -url: string = "", +url: strings.StringOrTinyString, package_manager: *PackageManager, pub inline fn run(this: ExtractTarball, bytes: []const u8) !Install.ExtractData { @@ -288,7 +288,7 @@ fn extract(this: *const ExtractTarball, tgz_bytes: []const u8) !Install.ExtractD const folder_name = switch (this.resolution.tag) { .npm => this.package_manager.cachedNPMPackageFolderNamePrint(&folder_name_buf, name, this.resolution.value.npm.version), .github => PackageManager.cachedGitHubFolderNamePrint(&folder_name_buf, resolved), - .local_tarball, .remote_tarball => PackageManager.cachedTarballFolderNamePrint(&folder_name_buf, this.url), + .local_tarball, .remote_tarball => PackageManager.cachedTarballFolderNamePrint(&folder_name_buf, this.url.slice()), else => unreachable, }; if (folder_name.len == 0 or (folder_name.len == 1 and folder_name[0] == '/')) @panic("Tried to delete root and stopped it"); @@ -398,7 +398,7 @@ fn extract(this: *const ExtractTarball, tgz_bytes: []const u8) !Install.ExtractD const ret_json_path = try FileSystem.instance.dirname_store.append(@TypeOf(json_path), json_path); return .{ - .url = this.url, + .url = this.url.slice(), .resolved = resolved, .json_path = ret_json_path, .json_buf = json_buf, diff --git a/src/install/install.zig b/src/install/install.zig index 767b6fc4b..1c1ea124d 100644 --- a/src/install/install.zig +++ b/src/install/install.zig @@ -373,7 +373,8 @@ const NetworkTask = struct { tarball: ExtractTarball, scope: *const Npm.Registry.Scope, ) !void { - if (tarball.url.len == 0) { + const tarball_url = tarball.url.slice(); + if (tarball_url.len == 0) { this.url_buf = try ExtractTarball.buildURL( scope.url.href, tarball.name, @@ -381,7 +382,7 @@ const NetworkTask = struct { this.package_manager.lockfile.buffers.string_bytes.items, ); } else { - this.url_buf = tarball.url; + this.url_buf = tarball_url; } this.response_buffer = try MutableString.init(allocator, 0); @@ -704,7 +705,7 @@ const Task = struct { } fn readAndExtract(allocator: std.mem.Allocator, tarball: ExtractTarball) !ExtractData { - const file = try std.fs.cwd().openFile(tarball.url, .{ .mode = .read_only }); + const file = try std.fs.cwd().openFile(tarball.url.slice(), .{ .mode = .read_only }); defer file.close(); const bytes = try file.readToEndAlloc(allocator, std.math.maxInt(usize)); defer allocator.free(bytes); @@ -2000,14 +2001,14 @@ pub const PackageManager = struct { return this.allocator.create(NetworkTask) catch @panic("Memory allocation failure creating NetworkTask!"); } - fn allocGitHubURL(this: *const PackageManager, repository: *const Repository) !string { + fn allocGitHubURL(this: *const PackageManager, repository: *const Repository) string { var github_api_domain: string = "api.github.com"; if (this.env.map.get("GITHUB_API_DOMAIN")) |api_domain| { if (api_domain.len > 0) { github_api_domain = api_domain; } } - return try std.fmt.allocPrint( + return std.fmt.allocPrint( this.allocator, "https://{s}/repos/{s}/{s}/tarball/{s}", .{ @@ -2016,7 +2017,7 @@ pub const PackageManager = struct { this.lockfile.str(&repository.repo), this.lockfile.str(&repository.committish), }, - ); + ) catch unreachable; } pub fn cachedGitFolderNamePrint(buf: []u8, resolved: string) stringZ { @@ -2437,7 +2438,11 @@ pub const PackageManager = struct { .temp_dir = this.getTemporaryDirectory().dir, .dependency_id = dependency_id, .integrity = package.meta.integrity, - .url = url, + .url = try strings.StringOrTinyString.initAppendIfNeeded( + url, + *FileSystem.FilenameStore, + &FileSystem.FilenameStore.instance, + ), }, scope, ); @@ -2727,7 +2732,11 @@ pub const PackageManager = struct { .cache_dir = this.getCacheDirectory().dir, .temp_dir = this.getTemporaryDirectory().dir, .dependency_id = dependency_id, - .url = path, + .url = strings.StringOrTinyString.initAppendIfNeeded( + path, + *FileSystem.FilenameStore, + &FileSystem.FilenameStore.instance, + ) catch unreachable, }, }, }, @@ -3100,7 +3109,8 @@ pub const PackageManager = struct { return; } - const url = this.allocGitHubURL(dep) catch unreachable; + const url = this.allocGitHubURL(dep); + defer this.allocator.free(url); const task_id = Task.Id.forTarball(url); var entry = this.task_queue.getOrPutContext(this.allocator, task_id, .{}) catch unreachable; if (!entry.found_existing) { @@ -3922,7 +3932,7 @@ pub const PackageManager = struct { err, switch (task.tag) { .extract => task.request.extract.network.url_buf, - .local_tarball => task.request.local_tarball.tarball.url, + .local_tarball => task.request.local_tarball.tarball.url.slice(), else => unreachable, }, ); @@ -6587,10 +6597,12 @@ pub const PackageManager = struct { ); }, .github => { + const url = this.manager.allocGitHubURL(&resolution.value.github); + defer this.manager.allocator.free(url); this.manager.enqueueTarballForDownload( dependency_id, package_id, - this.manager.allocGitHubURL(&resolution.value.github) catch unreachable, + url, .{ .node_modules_folder = this.node_modules_folder.dir.fd }, ); }, -- cgit v1.2.3 ix-crash'>jarred/fix-crash Unnamed repository; edit this file 'description' to name the repository.
aboutsummaryrefslogtreecommitdiff
path: root/test/bun.js/child-process-stdio.test.js (unfollow)
AgeCommit message (Expand)AuthorFilesLines
2023-03-01chore(builtins): add process builtin gen'd codeGravatar Derrick Farris 1-1/+24
2023-03-01feat(stdio): add some `tty.WriteStream` methodsGravatar Derrick Farris 1-0/+23
2023-03-01fix bun server segfault with abortsignal (#2261)Gravatar Ciro Spaciari 3-133/+79
2023-03-01fix(node:http): match Node `http.request()` GET/HEAD w/ body (#2262)Gravatar Derrick Farris 2-2/+31
2023-03-01Add a test for https request in node:httpGravatar Jarred Sumner 2-17/+28
2023-03-01fix(node:http/https): fix passing `URL` objs to `http.request`(#2253) (#2258)Gravatar Derrick Farris 2-43/+63
2023-03-01Revert "Update clap (#2238)"Gravatar Jarred Sumner 16-290/+1840
2023-03-01Revert "Add `-D`, `--dev` flags for bun install (#2240)"Gravatar Jarred Sumner 1-9/+9
2023-03-01Use GitHub action ID instead of SHA for test workflowGravatar Ashcon Partovi 1-1/+1
2023-03-01avoids segfault after aborted onReject in Bun.serve streams (#2256)Gravatar Ciro Spaciari 1-7/+8
2023-03-01Run tests in CI for bun-linux-aarch64Gravatar Ashcon Partovi 2-1/+30
2023-03-01Revert spawnSync changeGravatar Jarred Sumner 1-1/+2
2023-03-01Update bindings.zigGravatar Jarred Sumner 1-1/+3
2023-03-01fix deinit behavior when connection is aborted using ResponseStream and abort...Gravatar Ciro Spaciari 3-34/+174
2023-03-01fix Bun.file.arrayBuffer() segmentation fault on empty file #2248 (#2249)Gravatar Ciro Spaciari 3-7/+23
2023-03-01Fix async in sqliteGravatar Colin McDonnell 1-2/+2
2023-02-28Forces a specific libdir for c-ares (#2241)Gravatar Justin Whear 1-1/+5
2023-02-28Make Bun.gc(true) more aggressiveGravatar Jarred Sumner 1-0/+3
2023-02-28Expose JSC::Options via `BUN_JSC_` prefixGravatar Jarred Sumner 6-8/+47
2023-02-28fixupGravatar Jarred Sumner 1-1/+1
2023-02-28Fix typecheckGravatar Colin McDonnell 2-1/+4
2023-02-28Fix incorrect Bun version in docs (#2236)Gravatar Derrick Farris 1-1/+1
2023-02-28just some comments fix (#2237)Gravatar Ciro Spaciari 1-4/+2
2023-02-28Add `-D`, `--dev` flags for bun install (#2240)Gravatar Justin Whear 1-9/+9
2023-02-28Document punningGravatar Colin McDonnell 1-1/+18