From 036c954b0a43b033a3054e4d77faf54bf4e01eef Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 11 Nov 2020 01:03:11 +0100 Subject: Fix potential memory error when joining filesystem paths --- src/filesystem.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/filesystem.c b/src/filesystem.c index 7cda4d9..c8a58c1 100644 --- a/src/filesystem.c +++ b/src/filesystem.c @@ -199,10 +199,11 @@ lilv_path_join(const char* a, const char* b) return (b && b[0]) ? lilv_strdup(b) : NULL; } - const size_t a_len = strlen(a); - const size_t b_len = b ? strlen(b) : 0; - const size_t pre_len = a_len - (lilv_is_dir_sep(a[a_len - 1]) ? 1 : 0); - char* path = (char*)calloc(1, a_len + b_len + 2); + const size_t a_len = strlen(a); + const size_t b_len = b ? strlen(b) : 0; + const bool a_end_is_sep = a_len > 0 && lilv_is_dir_sep(a[a_len - 1]); + const size_t pre_len = a_len - (a_end_is_sep ? 1 : 0); + char* path = (char*)calloc(1, a_len + b_len + 2); memcpy(path, a, pre_len); path[pre_len] = '/'; if (b) { -- cgit v1.2.1