scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enhance CMake configuration and improve string safety in source files

Browse Source 
- Updated CMakeLists.txt to silence C++23 deprecation warnings and added definitions for intrinsic int128 support.
- Modified GitHub Actions workflow to handle missing asset directories gracefully and ensure correct versioning in Info.plist.
- Refactored string handling in multiple source files to use std::memcpy for safer string copying, preventing potential buffer overflows.
- Improved font loading logic and ensured consistent handling of theme properties in the editor.
This commit is contained in:
scawful
2025-09-27 22:03:03 -04:00
parent 332f050cf6
commit 660c3fd46f
8 changed files with 98 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
.github/workflows/release.yml vendored
View File

@@ -152,10 +152,11 @@ jobs:
# Use the existing bundle and just update it
cp -r build/bin/yaze.app ./Yaze.app
# Add additional resources to the bundle
cp -r assets "Yaze.app/Contents/Resources/"
# Update Info.plist if needed
cp -r assets "Yaze.app/Contents/Resources/" 2>/dev/null || echo "assets directory not found"
# Update Info.plist with correct version
if [ -f "cmake/yaze.plist.in" ]; then
cp cmake/yaze.plist.in "Yaze.app/Contents/Info.plist"
VERSION_NUM=$(echo "${{ needs.validate-and-prepare.outputs.tag_name }}" | sed 's/^v//')
sed "s/@yaze_VERSION@/$VERSION_NUM/g" cmake/yaze.plist.in > "Yaze.app/Contents/Info.plist"
fi
else
echo "No bundle found, creating manual bundle"
@@ -163,8 +164,35 @@ jobs:
mkdir -p "Yaze.app/Contents/MacOS"
mkdir -p "Yaze.app/Contents/Resources"
cp build/bin/yaze "Yaze.app/Contents/MacOS/"
cp -r assets "Yaze.app/Contents/Resources/"
cp cmake/yaze.plist.in "Yaze.app/Contents/Info.plist"
cp -r assets "Yaze.app/Contents/Resources/" 2>/dev/null || echo "assets directory not found"
# Create Info.plist with correct version
if [ -f "cmake/yaze.plist.in" ]; then
VERSION_NUM=$(echo "${{ needs.validate-and-prepare.outputs.tag_name }}" | sed 's/^v//')
sed "s/@yaze_VERSION@/$VERSION_NUM/g" cmake/yaze.plist.in > "Yaze.app/Contents/Info.plist"
else
# Create a basic Info.plist
VERSION_NUM=$(echo "${{ needs.validate-and-prepare.outputs.tag_name }}" | sed 's/^v//')
cat > "Yaze.app/Contents/Info.plist" << EOF
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleExecutable</key>
<string>yaze</string>
<key>CFBundleIdentifier</key>
<string>com.yaze.editor</string>
<key>CFBundleName</key>
<string>Yaze</string>
<key>CFBundleVersion</key>
<string>$VERSION_NUM</string>
<key>CFBundleShortVersionString</key>
<string>$VERSION_NUM</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
</dict>
</plist>
EOF
fi
fi
# Create DMG
@@ -225,7 +253,7 @@ jobs:
if: runner.os == 'macOS'
run: |
# Install Homebrew dependencies needed for UI tests and full builds
brew install pkg-config libpng boost abseil ninja
brew install pkg-config libpng boost abseil ninja gtk+3
- name: Setup build environment
run: |
@@ -248,6 +276,7 @@ jobs:
-DYAZE_ENABLE_ROM_TESTS=OFF \
-DYAZE_ENABLE_EXPERIMENTAL_TESTS=OFF \
-DYAZE_INSTALL_LIB=OFF \
-DYAZE_MINIMAL_BUILD=OFF \
-GNinja
# Set up vcpkg for Windows builds with fallback
@@ -411,10 +440,10 @@ jobs:
$ErrorActionPreference = "Stop"
# Determine executable path based on platform
if (${{ runner.os }} -eq "Windows") {
if ("${{ runner.os }}" -eq "Windows") {
$exePath = "build\bin\${{ env.BUILD_TYPE }}\yaze.exe"
} elseif (${{ runner.os }} -eq "macOS") {
$exePath = "build/bin/yaze"
} elseif ("${{ runner.os }}" -eq "macOS") {
$exePath = "build/bin/yaze.app/Contents/MacOS/yaze"
} else {
$exePath = "build/bin/yaze"
}

12
CMakeLists.txt
View File

@@ -111,13 +111,23 @@ if(MSVC)
_CRT_SECURE_NO_WARNINGS
_CRT_NONSTDC_NO_WARNINGS
SILENCE_CXX23_DEPRECATIONS
_SILENCE_CXX23_DEPRECATION_WARNING
NOMINMAX # Disable min/max macros
WIN32_LEAN_AND_MEAN # Reduce Windows header bloat
strncasecmp=_strnicmp
strcasecmp=_stricmp
)
else()
target_compile_options(yaze_common INTERFACE -Wall -Wextra -Wpedantic)
target_compile_options(yaze_common INTERFACE
-Wall -Wextra -Wpedantic
-Wno-deprecated-declarations # Silence deprecation warnings
-Wno-c++23-compat # Silence C++23 compatibility warnings
)
# Add C++23 deprecation silencing for GCC/Clang
target_compile_definitions(yaze_common INTERFACE
_SILENCE_CXX23_DEPRECATION_WARNING
ABSL_HAVE_INTRINSIC_INT128=1 # Enable intrinsic int128 support
)
endif()
# Abseil Standard Specifications

7
cmake/absl.cmake
View File

@@ -15,6 +15,13 @@ set(ABSL_PROPAGATE_CXX_STD ON)
set(ABSL_CXX_STANDARD 23)
set(ABSL_USE_GOOGLETEST_HEAD ON)
set(ABSL_ENABLE_INSTALL ON)
# Silence C++23 deprecation warnings for Abseil int128
if(MSVC)
add_definitions(-DSILENCE_CXX23_DEPRECATIONS)
else()
add_definitions(-D_SILENCE_CXX23_DEPRECATION_WARNING)
endif()
set(
ABSL_TARGETS
absl::strings

15
src/app/core/platform/font_loader.cc
View File

@@ -3,6 +3,11 @@
#include <filesystem>
#include <string>
#include <vector>
#include <cstring>
#include <algorithm>
#include <cmath>
#
#include "absl/status/status.h"
#include "absl/strings/str_cat.h"
@@ -98,11 +103,11 @@ absl::Status LoadPackageFonts() {
if (font_registry.fonts.empty()) {
// Initialize the font names and sizes
font_registry.fonts = {
{KARLA_REGULAR, FONT_SIZE_DEFAULT},
{ROBOTO_MEDIUM, FONT_SIZE_DEFAULT},
{COUSINE_REGULAR, FONT_SIZE_DEFAULT},
{IBM_PLEX_JP, FONT_SIZE_DEFAULT},
{DROID_SANS, FONT_SIZE_DROID_SANS},
FontConfig{KARLA_REGULAR, FONT_SIZE_DEFAULT},
FontConfig{ROBOTO_MEDIUM, FONT_SIZE_DEFAULT},
FontConfig{COUSINE_REGULAR, FONT_SIZE_DEFAULT},
FontConfig{IBM_PLEX_JP, FONT_SIZE_DEFAULT},
FontConfig{DROID_SANS, FONT_SIZE_DROID_SANS},
};
}

7
src/app/editor/dungeon/dungeon_object_selector.cc
View File

@@ -1,5 +1,6 @@
#include "dungeon_object_selector.h"
#include <algorithm>
#include <iterator>
#include <cstring>
@@ -1046,8 +1047,10 @@ void DungeonObjectSelector::DrawCompactPropertiesEditor() {
static int music_id = 0;
// Copy current values
std::strncpy(room_name, properties.name.c_str(), sizeof(room_name) - 1);
room_name[sizeof(room_name) - 1] = '\0';
// Safe string copy with bounds checking
size_t name_len = std::min(properties.name.length(), sizeof(room_name) - 1);
std::memcpy(room_name, properties.name.c_str(), name_len);
room_name[name_len] = '\0';
dungeon_id = properties.dungeon_id;
floor_level = properties.floor_level;
is_boss_room = properties.is_boss_room;

15
src/app/editor/editor_manager.cc
View File

@@ -1,5 +1,6 @@
#include "editor_manager.h"
#include <algorithm>
#include <chrono>
#include <cstring>
@@ -2254,8 +2255,11 @@ void EditorManager::DrawSessionSwitcher() {
ImGui::SameLine();
if (ImGui::Button("Rename")) {
session_to_rename_ = i;
std::strncpy(session_rename_buffer_, session.GetDisplayName().c_str(), sizeof(session_rename_buffer_) - 1);
session_rename_buffer_[sizeof(session_rename_buffer_) - 1] = '\0';
// Safe string copy with bounds checking
const std::string& name = session.GetDisplayName();
size_t copy_len = std::min(name.length(), sizeof(session_rename_buffer_) - 1);
std::memcpy(session_rename_buffer_, name.c_str(), copy_len);
session_rename_buffer_[copy_len] = '\0';
show_session_rename_dialog_ = true;
}
@@ -2431,8 +2435,11 @@ void EditorManager::DrawSessionManager() {
ImGui::SameLine();
if (ImGui::Button("Rename")) {
session_to_rename_ = i;
std::strncpy(session_rename_buffer_, session.GetDisplayName().c_str(), sizeof(session_rename_buffer_) - 1);
session_rename_buffer_[sizeof(session_rename_buffer_) - 1] = '\0';
// Safe string copy with bounds checking
const std::string& name = session.GetDisplayName();
size_t copy_len = std::min(name.length(), sizeof(session_rename_buffer_) - 1);
std::memcpy(session_rename_buffer_, name.c_str(), copy_len);
session_rename_buffer_[copy_len] = '\0';
show_session_rename_dialog_ = true;
}

19
src/app/gui/theme_manager.cc
View File

@@ -1,5 +1,6 @@
#include "theme_manager.h"
#include <algorithm>
#include <cctype>
#include <fstream>
#include <set>
@@ -1778,12 +1779,18 @@ void ThemeManager::ShowSimpleThemeEditor(bool* p_open) {
ImGui::SameLine();
if (ImGui::Button("Reset to Current")) {
edit_theme = current_theme_;
std::strncpy(theme_name, current_theme_.name.c_str(), sizeof(theme_name) - 1);
theme_name[sizeof(theme_name) - 1] = '\0';
std::strncpy(theme_description, current_theme_.description.c_str(), sizeof(theme_description) - 1);
theme_description[sizeof(theme_description) - 1] = '\0';
std::strncpy(theme_author, current_theme_.author.c_str(), sizeof(theme_author) - 1);
theme_author[sizeof(theme_author) - 1] = '\0';
// Safe string copy with bounds checking
size_t name_len = std::min(current_theme_.name.length(), sizeof(theme_name) - 1);
std::memcpy(theme_name, current_theme_.name.c_str(), name_len);
theme_name[name_len] = '\0';
size_t desc_len = std::min(current_theme_.description.length(), sizeof(theme_description) - 1);
std::memcpy(theme_description, current_theme_.description.c_str(), desc_len);
theme_description[desc_len] = '\0';
size_t author_len = std::min(current_theme_.author.length(), sizeof(theme_author) - 1);
std::memcpy(theme_author, current_theme_.author.c_str(), author_len);
theme_author[author_len] = '\0';
// Reset backup state since we're back to current theme
if (theme_backup_made) {

5
src/yaze.cc
View File

@@ -1,5 +1,6 @@
#include "yaze.h"
#include <algorithm>
#include <cstring>
#include <iostream>
#include <memory>
@@ -292,8 +293,8 @@ yaze_status yaze_load_messages(const zelda3_rom* rom, zelda3_message** messages,
std::memcpy((*messages)[i].raw_data, msg.Data.data(), msg.Data.size());
(*messages)[i].parsed_text = new char[msg.ContentsParsed.length() + 1];
std::strncpy((*messages)[i].parsed_text, msg.ContentsParsed.c_str(),
msg.ContentsParsed.length());
// Safe string copy with bounds checking
std::memcpy((*messages)[i].parsed_text, msg.ContentsParsed.c_str(), msg.ContentsParsed.length());
(*messages)[i].parsed_text[msg.ContentsParsed.length()] = '\0';
(*messages)[i].is_compressed = false; // TODO: Detect compression