eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-03 22:22:04 +01:00
Code Issues 156 Wiki Activity

fix(sonar): addressing reliability/security issues

Browse Source
This commit is contained in:
jerrrrycho
2026-10-03 22:33:13 +02:00
parent 3ab3cdeb2d
commit c6b76a0b72
7 changed files with 49 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
launcher/deferred_image.h
View File

@@ -1,7 +1,6 @@
#pragma once
#include <limits>
#include <mutex>
#include "model/Texture.h"
#include "rendering/renderer.h"
@@ -14,26 +13,16 @@ public:
deferred_image() = default;
deferred_image(const std::string &p) : path(p) { }
deferred_image(const deferred_image&) = delete;
deferred_image(deferred_image &&other) noexcept : deferred_image(std::move(other), std::scoped_lock(other.mutex)) { }
~deferred_image() = default;
deferred_image &operator=(deferred_image &&other) noexcept
{
if (this != &other) {
std::scoped_lock lock(mutex, other.mutex);
path = std::move(other.path);
image = other.image;
}
return *this;
}
deferred_image(deferred_image&&) = default;
deferred_image &operator=(deferred_image&&) = default;
operator bool() const
{
std::scoped_lock lock(mutex);
return image != null_handle || !path.empty();
}
GLuint get() const
// loads the texture on first use
GLuint get()
{
std::scoped_lock lock(mutex);
if (!path.empty()) {
image = GfxRenderer->Fetch_Texture(path, true);
path.clear();
@@ -52,7 +41,6 @@ public:
glm::ivec2 size() const
{
std::scoped_lock lock(mutex);
if (image != null_handle) {
auto &tex = GfxRenderer->Texture(image);
return glm::ivec2(tex.get_width(), tex.get_height());
@@ -61,11 +49,6 @@ public:
}
private:
// moves content of the other image, while the caller holds its lock
deferred_image(deferred_image &&other, std::scoped_lock<std::mutex> const &) noexcept : path(std::move(other.path)), image(other.image) { }
// guards lazy loading performed by the const accessors
mutable std::mutex mutex;
mutable std::string path;
mutable texture_handle image = 0;
std::string path;
texture_handle image = 0;
};

6
launcher/vehicle_picker.cpp
View File

@@ -37,7 +37,7 @@ void ui::vehiclepicker_panel::render_contents()
if (ImGui::RadioButton(STR_C("texture group"), display_by_groups))
display_by_groups = true;
std::vector<const skin_set*> skinset_list;
std::vector<skin_set*> skinset_list;
if (display_by_groups) {
std::vector<const std::string*> model_list;
@@ -114,7 +114,7 @@ void ui::vehiclepicker_panel::render_contents()
for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++) {
auto &desc = model_list[i];
const deferred_image *image = nullptr;
deferred_image *image = nullptr;
for (auto const &skinset : desc->matching_skinsets) {
if (skinset->mini) {
image = &skinset->mini;
@@ -256,7 +256,7 @@ bool ui::vehiclepicker_panel::skin_filter(const skin_set *skin, std::vector<sear
return alternative_present ? !any : false;
}
bool ui::vehiclepicker_panel::selectable_image(const char *desc, bool selected, const deferred_image* image, const skin_set *pickable)
bool ui::vehiclepicker_panel::selectable_image(const char *desc, bool selected, deferred_image *image, const skin_set *pickable)
{
ImGui::PushID(pickable);

2
launcher/vehicle_picker.h
View File

@@ -14,7 +14,7 @@ class vehiclepicker_panel : public ui_panel
void render_contents() override;
private:
bool selectable_image(const char *desc, bool selected, const deferred_image *image, const skin_set *pickable = nullptr);
bool selectable_image(const char *desc, bool selected, deferred_image *image, const skin_set *pickable = nullptr);
vehicle_type selected_type = vehicle_type::none;
std::shared_ptr<const vehicle_desc> selected_vehicle;