diff options
Diffstat (limited to 'media-gfx/epsonscan2/files')
3 files changed, 97 insertions, 0 deletions
diff --git a/media-gfx/epsonscan2/files/0002-Fix-crash.patch b/media-gfx/epsonscan2/files/0002-Fix-crash.patch new file mode 100644 index 0000000..7125e37 --- /dev/null +++ b/media-gfx/epsonscan2/files/0002-Fix-crash.patch @@ -0,0 +1,31 @@ +From a162321f309b38d97442cac06185ebfb098b3b22 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <hub@figuiere.net> +Date: Sat, 1 Jun 2024 19:41:51 -0400 +Subject: [PATCH 2/4] Fix crash +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Hubert Figuière <hub@figuiere.net> +--- + src/ES2Command/Src/Interface/ipc/ipcInterfaceImpl.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/ES2Command/Src/Interface/ipc/ipcInterfaceImpl.cpp b/src/ES2Command/Src/Interface/ipc/ipcInterfaceImpl.cpp +index a095ffd..0f1bc90 100755 +--- a/src/ES2Command/Src/Interface/ipc/ipcInterfaceImpl.cpp ++++ b/src/ES2Command/Src/Interface/ipc/ipcInterfaceImpl.cpp +@@ -128,7 +128,9 @@ ESErrorCode IPCInterfaceImpl::Open() + if(!ES_IsExistFile(dat_file)){ + FILE *fp; + fp = fopen(dat_file.c_str(),"w"); +- fclose(fp); ++ if (fp) { ++ fclose(fp); ++ } + } + interrupt_.reset(new ipc_interrupt(delegate_, dat_file, IPC_SHARED_ID, IPC_SEMAHORE_KEY)); + interrupt_->start(); +-- +2.45.0 + diff --git a/media-gfx/epsonscan2/files/0003-Use-XDG-open-to-open-the-directory.patch b/media-gfx/epsonscan2/files/0003-Use-XDG-open-to-open-the-directory.patch new file mode 100644 index 0000000..b268c03 --- /dev/null +++ b/media-gfx/epsonscan2/files/0003-Use-XDG-open-to-open-the-directory.patch @@ -0,0 +1,36 @@ +From 53685b913a613023a3e3a037b5cc479bbcebdc2a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <hub@figuiere.net> +Date: Sat, 1 Jun 2024 19:42:38 -0400 +Subject: [PATCH 3/4] Use XDG open to open the directory +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Hubert Figuière <hub@figuiere.net> +--- + src/Standalone/savedestfolder.cpp | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/Standalone/savedestfolder.cpp b/src/Standalone/savedestfolder.cpp +index 7480631..7df5941 100755 +--- a/src/Standalone/savedestfolder.cpp ++++ b/src/Standalone/savedestfolder.cpp +@@ -43,7 +43,14 @@ bool SaveDestFolder::open_folder(Supervisor* sv) + int cmd_size = 0; + const bool result = ES_CMN_FUNCS::PATH::ES_IsExistFile(sv->device_data.SelectPath); + if (result) { +- if(system("which nautilus > /dev/null") == 0){ ++ if(system("which xdg-open > /dev/null") == 0){ ++ cmd_size = strlen("xdg-open "); ++ failer = (char *)malloc(cmd_size+1); ++ if(failer){ ++ memset(failer, 0, cmd_size+1); ++ memcpy(failer, "xdg-open", cmd_size); ++ } ++ } else if(system("which nautilus > /dev/null") == 0){ + cmd_size = strlen("nautilus "); + failer = (char *)malloc(cmd_size+1); + if(failer){ +-- +2.45.0 + diff --git a/media-gfx/epsonscan2/files/0004-Fix-a-crash-on-an-OOB-container-access.patch b/media-gfx/epsonscan2/files/0004-Fix-a-crash-on-an-OOB-container-access.patch new file mode 100644 index 0000000..1f32b41 --- /dev/null +++ b/media-gfx/epsonscan2/files/0004-Fix-a-crash-on-an-OOB-container-access.patch @@ -0,0 +1,30 @@ +From 09a0f982bd1601c7cd2ed28490e4d54a635b0838 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <hub@figuiere.net> +Date: Sat, 1 Jun 2024 19:43:11 -0400 +Subject: [PATCH 4/4] Fix a crash on an OOB container access +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Hubert Figuière <hub@figuiere.net> +--- + src/Controller/Src/Finder/Finder.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/Controller/Src/Finder/Finder.cpp b/src/Controller/Src/Finder/Finder.cpp +index aa6b853..5e063e8 100755 +--- a/src/Controller/Src/Finder/Finder.cpp ++++ b/src/Controller/Src/Finder/Finder.cpp +@@ -52,6 +52,9 @@ namespace epsonscan { + } + SDIDeviceInfo* Finder::GetDevicesPointer() + { ++ if (devices_.size() == 0) { ++ return nullptr; ++ } + return &devices_[0]; + } + int32_t Finder::GetDevicesCount() const +-- +2.45.0 + |