From 44c2a8bb794a58af4afb02e0d230c9bfa5c85690 Mon Sep 17 00:00:00 2001 From: TapTap Date: Mon, 10 Aug 2026 17:27:33 +0200 Subject: [PATCH] fix: satisfy static analysis in review paths --- src/shared/file.c | 3 +-- src/shared/metadata.c | 2 +- src/shared/metadata.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/shared/file.c b/src/shared/file.c index 063d150..d262311 100644 --- a/src/shared/file.c +++ b/src/shared/file.c @@ -170,7 +170,7 @@ bool file_save_to_disk(const char* root_directory, File* file, const Config* con (backup_enabled && (!backup_suffix || backup_suffix[0] == '\0' || strchr(backup_suffix, '/') != NULL || strcmp(backup_suffix, ".") == 0 || strcmp(backup_suffix, "..") == 0))) { - log_message(LOG_LEVEL_ERROR, "Path traversal detected in file path: %s", file->path); + log_message(LOG_LEVEL_ERROR, "Invalid file or path received"); return false; } @@ -545,7 +545,6 @@ File* receive_incremental_check(int fd, const Config* config, bool* skipped) { } if (old_fd >= 0) { close(old_fd); - old_fd = -1; } bool match = has_old_file && (unsigned long long)st.st_size == check_size; diff --git a/src/shared/metadata.c b/src/shared/metadata.c index c18830c..98da17e 100644 --- a/src/shared/metadata.c +++ b/src/shared/metadata.c @@ -188,7 +188,7 @@ void file_restore_metadata(const char* path, FileMetadata* metadata) { log_message(LOG_LEVEL_WARNING, "Failed to set timestamps on %s: %s", path, strerror(errno)); } -bool file_restore_metadata_fd(int fd, FileMetadata* metadata) { +bool file_restore_metadata_fd(int fd, const FileMetadata* metadata) { if (fd < 0 || metadata == NULL) return metadata == NULL; bool ok = true; diff --git a/src/shared/metadata.h b/src/shared/metadata.h index 0ab6859..cedb32e 100644 --- a/src/shared/metadata.h +++ b/src/shared/metadata.h @@ -30,6 +30,6 @@ FileMetadata* metadata_from_buf(char** buf); bool metadata_send(int file_descriptor, FileMetadata* m); FileMetadata* metadata_receive(int file_descriptor, int* ok); void file_restore_metadata(const char* path, FileMetadata* metadata); -bool file_restore_metadata_fd(int fd, FileMetadata* metadata); +bool file_restore_metadata_fd(int fd, const FileMetadata* metadata); #endif