ci/cd: add msvc stl hardening (from c++26)

.github/workflows/cd.yml

@@ -204,8 +204,18 @@ jobs:
     #- uses: ilammy/setup-nasm@v1
 
     - name: Configure CMake
+      env:
+        CXXFLAGS: "/D_MSVC_STL_HARDENING=1"
       # TODO: og asan had this -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded
-      run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DTOMATO_DEP_LIBWEBP_USE_SYSTEM=ON -DSDLIMAGE_VENDORED=OFF -DSDLIMAGE_DEPS_SHARED=OFF -DSDLIMAGE_JXL=OFF -DSDLIMAGE_AVIF=OFF -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe -DTOMATO_BREAKPAD=ON -DTOMATO_TOX_AV=ON -DTOMATO_ASAN=${{matrix.type == 'asan' && 'ON' || 'OFF'}}
+      run: cmake -G Ninja
+        -B ${{github.workspace}}/build
+        -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+        -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static
+        -DTOMATO_DEP_LIBWEBP_USE_SYSTEM=ON
+        -DSDLIMAGE_VENDORED=OFF -DSDLIMAGE_DEPS_SHARED=OFF -DSDLIMAGE_JXL=OFF -DSDLIMAGE_AVIF=OFF
+        -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe
+        -DTOMATO_BREAKPAD=ON -DTOMATO_TOX_AV=ON
+        -DTOMATO_ASAN=${{matrix.type == 'asan' && 'ON' || 'OFF'}}
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -t tomato

.github/workflows/ci.yml

@@ -179,7 +179,15 @@ jobs:
         arch: amd64
 
     - name: Configure CMake
-      run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DTOMATO_DEP_LIBWEBP_USE_SYSTEM=ON -DSDLIMAGE_VENDORED=OFF -DSDLIMAGE_DEPS_SHARED=OFF -DSDLIMAGE_JXL=OFF -DSDLIMAGE_AVIF=OFF -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe
+      env:
+        CXXFLAGS: "/D_MSVC_STL_HARDENING=1"
+      run: cmake -G Ninja
+        -B ${{github.workspace}}/build
+        -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+        -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static
+        -DTOMATO_DEP_LIBWEBP_USE_SYSTEM=ON
+        -DSDLIMAGE_VENDORED=OFF -DSDLIMAGE_DEPS_SHARED=OFF -DSDLIMAGE_JXL=OFF -DSDLIMAGE_AVIF=OFF
+        -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 -t tomato

flake.lock

@@ -21,17 +21,17 @@
     "imgui": {
       "flake": false,
       "locked": {
-        "lastModified": 1752080038,
+        "lastModified": 1758128722,
-        "narHash": "sha256-m5h/H8k/CZ5Qwr3L9+Elt8XT/Tgwr3s4HuhVtI4wkwE=",
+        "narHash": "sha256-J+h7jJ+4wqr6RivtzyTDMXKxFoGs7dQbzqdu51XgEbc=",
         "owner": "ocornut",
         "repo": "imgui",
-        "rev": "5d4126876bc10396d4c6511853ff10964414c776",
+        "rev": "bf75bfec48fc00f532af8926130b70c0e26eb099",
         "type": "github"
       },
       "original": {
         "owner": "ocornut",
         "repo": "imgui",
-        "rev": "5d4126876bc10396d4c6511853ff10964414c776",
+        "rev": "bf75bfec48fc00f532af8926130b70c0e26eb099",
         "type": "github"
       }
     },

flake.nix

@@ -21,7 +21,7 @@
       flake = false;
     };
     imgui = {
-      url = "github:ocornut/imgui/5d4126876bc10396d4c6511853ff10964414c776";
+      url = "github:ocornut/imgui/bf75bfec48fc00f532af8926130b70c0e26eb099";
       flake = false;
     };
     plutosvg = {

src/image_loader_webp.cpp

@@ -70,7 +70,10 @@ ImageLoaderWebP::ImageResult ImageLoaderWebP::loadFromMemoryRGBA(const uint8_t*
 	while (WebPAnimDecoderHasMoreFrames(dec.get())) {
 		uint8_t* buf;
 		int timestamp;
-		WebPAnimDecoderGetNext(dec.get(), &buf, &timestamp);
+		if (WebPAnimDecoderGetNext(dec.get(), &buf, &timestamp) == 0 || buf == nullptr) {
+			// error out with empty res
+			return {};
+		}
 		// ... (Render 'buf' based on 'timestamp').
 		// ... (Do NOT free 'buf', as it is owned by 'dec').
 

src/message_image_loader.cpp

@@ -103,10 +103,17 @@ TextureLoaderResult MessageImageLoader::load(TextureUploaderI& tu, Message3Handl
 		new_entry.current_texture = 0;
 		for (const auto& [ms, data] : res.frames) {
 			const auto n_t = tu.upload(data.data(), res.width, res.height);
+			if (n_t == 0) {
+				continue;
+			}
 			new_entry.textures.push_back(n_t);
 			new_entry.frame_duration.push_back(ms);
 		}
 
+		if (new_entry.textures.empty()) {
+			continue;
+		}
+
 		new_entry.width = res.width;
 		new_entry.height = res.height;
 

src/texture_cache.hpp

@@ -116,6 +116,9 @@ struct TextureCache {
 				_tu.destroy(tex_id);
 			}
 		}
+		for (const auto& tex_id : _default_texture.textures) {
+			_tu.destroy(tex_id);
+		}
 	}
 
 	struct GetInfo {