From e8ef5f9e9f168bc25a03a22e93f32c4912c4d003 Mon Sep 17 00:00:00 2001 From: ITotalJustice <47043333+ITotalJustice@users.noreply.github.com> Date: Mon, 30 Dec 2024 20:16:18 +0000 Subject: [PATCH] Nx fix potential oob bug when casting vfs --- CMakeLists.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0256b2b..0e0a8db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) set(FTPSRV_VERSION_MAJOR 1) set(FTPSRV_VERSION_MINOR 2) -set(FTPSRV_VERSION_PATCH 0) +set(FTPSRV_VERSION_PATCH 1) set(FTPSRV_VERSION ${FTPSRV_VERSION_MAJOR}.${FTPSRV_VERSION_MINOR}.${FTPSRV_VERSION_PATCH}) project(ftpsrv @@ -209,6 +209,10 @@ if (FTPSRV_LIB_BUILD) target_compile_definitions(ftpsrv PUBLIC FTP_VFS_HEADER="${FTPSRV_LIB_VFS_CUSTOM}") endif() + if (FTPSRV_LIB_CUSTOM_DEFINES) + target_compile_definitions(ftpsrv PUBLIC ${FTPSRV_LIB_CUSTOM_DEFINES}) + endif() + ftp_set_options(ftpsrv ${FTPSRV_LIB_PATH_SIZE} ${FTPSRV_LIB_SESSIONS} @@ -266,7 +270,7 @@ else() ${NX_SRC} ) - target_compile_definitions(ftpexe PUBLIC + target_compile_definitions(ftpsrv PUBLIC USE_VFS_SAVE=$ USE_VFS_STORAGE=$ USE_VFS_GC=$ @@ -371,7 +375,7 @@ else() ftp_add(sysftp) target_link_libraries(sysftp PRIVATE ftpsrv_sysmod minIni) - target_compile_definitions(ftpexe PUBLIC + target_compile_definitions(ftpsrv_sysmod PUBLIC USE_VFS_SAVE=$ USE_VFS_STORAGE=$ USE_VFS_GC=$