From d83faee95648bc043b8e0c9386c870f3836ff08b Mon Sep 17 00:00:00 2001 From: Luc <8822552+luc-github@users.noreply.github.com> Date: Thu, 7 Jan 2021 20:42:03 +0100 Subject: [PATCH] Add some sanity check due to webUI --- esp3d/src/include/version.h | 2 +- esp3d/src/modules/http/handles/upload-mks-files.cpp | 6 ++++++ esp3d/src/modules/mks/mks_service.cpp | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/esp3d/src/include/version.h b/esp3d/src/include/version.h index d3fc7b18..6ecb1c1c 100644 --- a/esp3d/src/include/version.h +++ b/esp3d/src/include/version.h @@ -22,7 +22,7 @@ #define _VERSION_ESP3D_H //version and sources location -#define FW_VERSION "3.0.0.a80" +#define FW_VERSION "3.0.0.a81" #define REPOSITORY "https://github.com/luc-github/ESP3D/tree/3.0" #endif //_VERSION_ESP3D_H diff --git a/esp3d/src/modules/http/handles/upload-mks-files.cpp b/esp3d/src/modules/http/handles/upload-mks-files.cpp index 86df728e..cfb2849b 100644 --- a/esp3d/src/modules/http/handles/upload-mks-files.cpp +++ b/esp3d/src/modules/http/handles/upload-mks-files.cpp @@ -49,6 +49,12 @@ void HTTP_Server::MKSFileupload () size_t fileSize = 0 ; String filename = upload.filename; String sfilename = "s"+filename; + //No / in filename + int p = filename.lastIndexOf("/"); + + if(p!=-1) { + filename.remove(0,p+1); + } if (_webserver->hasArg(sfilename)) { fileSize = _webserver->arg(sfilename).toInt(); } else if (_webserver->hasHeader("Content-Length")) { diff --git a/esp3d/src/modules/mks/mks_service.cpp b/esp3d/src/modules/mks/mks_service.cpp index 246ccd07..10db459d 100644 --- a/esp3d/src/modules/mks/mks_service.cpp +++ b/esp3d/src/modules/mks/mks_service.cpp @@ -408,7 +408,7 @@ void MKSService::messageWiFiControl(const uint8_t * dataFrame, const size_t data log_esp3d("WiFi control flag not supported"); } } -//Exception handle - but actually not used +//Exception handle - but actually not used void MKSService::messageException(const uint8_t * dataFrame, const size_t dataSize ) { if(dataSize != 1) {