Skip to content

Fix #51 segfault #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
probonopd merged 3 commits into from
Aug 5, 2024
Merged

Fix #51 segfault #53

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cdf424
Try to fix #51
probonopd Aug 5, 2024
e6cddd4
Revert recent changes
probonopd Aug 5, 2024
39bfcff
Try to fix build_mount_point
probonopd Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 4 additions & 34 deletions src/runtime/runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Softwaref is
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
Expand Down Expand Up @@ -61,7 +61,6 @@ extern int sqfs_opt_proc(void* data, const char* arg, int key, struct fuse_args*
#include <fnmatch.h>
#include <sys/mman.h>
#include <stdint.h>
#include <libgen.h>

typedef struct {
uint32_t lo;
Expand Down Expand Up @@ -865,49 +864,20 @@ bool rm_recursive(const char* const path) {
void build_mount_point(char* mount_dir, const char* const argv0, char const* const temp_base, const size_t templen) {
const size_t maxnamelen = 6;

// Check for NULL argv0
if (argv0 == NULL) {
fprintf(stderr, "Error: argv0 is NULL\n");
return;
}

// need to copy argv0 as it's a const value, basename intends to modify it
char* argv0_copy = strdup(argv0);
if (argv0_copy == NULL) {
fprintf(stderr, "Error: strdup failed\n");
return;
}

char* path_basename = basename(argv0_copy);
if (path_basename == NULL) {
free(argv0_copy);
fprintf(stderr, "Error: basename returned NULL\n");
return;
}
char* path_basename;
path_basename = basename(argv0);

size_t namelen = strlen(path_basename);
// limit length of tempdir name
if (namelen > maxnamelen) {
namelen = maxnamelen;
}

// Ensure mount_dir has enough space
size_t required_length = templen + 8 + namelen + 6 + 1; // +1 for null terminator
if (strlen(temp_base) + required_length > sizeof(mount_dir)) {
free(argv0_copy);
fprintf(stderr, "Error: mount_dir does not have enough space\n");
return;
}

strcpy(mount_dir, temp_base);
strncpy(mount_dir + templen, "/.mount_", 8);
strncpy(mount_dir + templen + 8, path_basename, namelen);
strncpy(mount_dir + templen + 8 + namelen, "XXXXXX", 6);

// Null terminate the destination
mount_dir[templen + 8 + namelen + 6] = '\0'; // null terminate destination

free(argv0_copy);
mount_dir[templen + 8 + namelen + 6] = 0; // null terminate destination
}

int fusefs_main(int argc, char* argv[], void (* mounted)(void)) {
Expand Down