From 95971130b85cb887fc4f29dcb8ef1fa6e383c00b Mon Sep 17 00:00:00 2001 From: David Tschumperle Date: Fri, 10 May 2024 10:27:06 +0200 Subject: [PATCH 1/2] Auto-commit for release 3.3.6_pre --- html/header.html | 2 +- html/header_doxygen.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/html/header.html b/html/header.html index c290ba71..e88a24e7 100644 --- a/html/header.html +++ b/html/header.html @@ -23,7 +23,7 @@
Logo

- Latest stable version: 3.3.5        Current pre-release: 3.3.6 (2024/05/06) + Latest stable version: 3.3.5        Current pre-release: 3.3.6 (2024/05/10)


diff --git a/html/header_doxygen.html b/html/header_doxygen.html index e55169aa..09a91c6b 100644 --- a/html/header_doxygen.html +++ b/html/header_doxygen.html @@ -26,7 +26,7 @@
Logo

- Latest stable version: 3.3.5        Current pre-release: 3.3.6 (2024/05/06) + Latest stable version: 3.3.5        Current pre-release: 3.3.6 (2024/05/10)


From e2ca0a41a22301e2fd88a03539cca163043febdf Mon Sep 17 00:00:00 2001 From: David Tschumperle Date: Sat, 11 May 2024 16:57:36 +0200 Subject: [PATCH 2/2] cimg::load_network(): Try to fix double-free. --- CImg.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/CImg.h b/CImg.h index 8c3d0ba2..8752d7ec 100644 --- a/CImg.h +++ b/CImg.h @@ -68285,6 +68285,7 @@ namespace cimg_library { cimg::temporary_path(),cimg_file_separator,cimg::filenamerand(),ext._data); if ((file = cimg::std_fopen(filename_local,"rb"))!=0) cimg::fclose(file); } while (file); + file = 0; #ifdef cimg_use_curl const unsigned int omode = cimg::exception_mode(); @@ -68311,10 +68312,9 @@ namespace cimg_library { cimg::fseek(file,0,SEEK_END); // Check if file size is 0 const cimg_ulong siz = cimg::ftell(file); cimg::fclose(file); - if (siz>0 && res==CURLE_OK) { - cimg::exception_mode(omode); - return filename_local; - } else std::remove(filename_local); + file = 0; + if (siz>0 && res==CURLE_OK) { cimg::exception_mode(omode); return filename_local; } + else std::remove(filename_local); } } catch (...) { } cimg::exception_mode(omode); @@ -68373,7 +68373,6 @@ namespace cimg_library { #else "'wget' or 'curl'.",url); #endif - cimg::fclose(file); // Try gunzip it. cimg_snprintf(command,command._width,"%s.gz",filename_local);