Skip to content

Skh/safer string ops #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sergey-khrykov wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Skh/safer string ops #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7484a58
[funexpected] Update engine to build on newer macOS
sergey-khrykov Jan 8, 2026
d0b2b26
clean up
sergey-khrykov Jan 8, 2026
a1dfffd
[funexpected] Try safer code for strings
sergey-khrykov Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/fnx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ jobs:
fail-fast: true
matrix:
include:
- os: macos-13
- os: macos-15-intel
token: osx.editor
build: scons -j2 platform=osx tools=yes target=release_debug verbose=yes
- os: macos-13
- os: macos-15-intel
token: osx.editor.headless
build: scons -j2 platform=server tools=yes target=release_debug verbose=yes
- os: macos-13
- os: macos-15-intel
token: ios.release
build: |
mkdir iphone
Expand Down
4 changes: 3 additions & 1 deletion core/project_settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,12 @@ ProjectSettings *ProjectSettings::get_singleton() {
}

String ProjectSettings::get_resource_path() const {

_THREAD_SAFE_METHOD_
return resource_path;
};

String ProjectSettings::localize_path(const String &p_path) const {
_THREAD_SAFE_METHOD_

if (resource_path == "")
return p_path; //not initialized yet
Expand Down Expand Up @@ -127,6 +128,7 @@ void ProjectSettings::set_restart_if_changed(const String &p_name, bool p_restar
}

String ProjectSettings::globalize_path(const String &p_path) const {
_THREAD_SAFE_METHOD_

if (p_path.begins_with("res://")) {

Expand Down
2 changes: 0 additions & 2 deletions platform/osx/detect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,6 @@ def configure(env):
"-framework",
"OpenGL",
"-framework",
"AGL",
"-framework",
"AudioUnit",
"-framework",
"CoreAudio",
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/embree/kernels/geometry/pointi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ namespace embree
/*! output operator */
friend __forceinline embree_ostream operator<<(embree_ostream cout, const PointMi& line)
{
return cout << "Line" << M << "i {" << line.v0 << ", " << line.geomID() << ", " << line.primID() << "}";
return cout << "Line" << M << "i {" << ", " << line.geomID() << ", " << line.primID() << "}";
Copy link

Copilot AI Jan 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The output operator for PointMi now omits printing the first field. Looking at the PointMi struct definition (lines 224-229), there is no member named 'v0'. The original code trying to print "line.v0" would have caused a compilation error. However, the fix leaves two consecutive commas in the output string, which produces malformed output like "LineMi { , geomID, primID}". Consider either removing the extra comma and space, or replacing the missing field with an actual member that should be printed for debugging purposes.

Suggested change
return cout << "Line" << M << "i {" << ", " << line.geomID() << ", " << line.primID() << "}";
return cout << "Line" << M << "i {" << line.geomID() << ", " << line.primID() << "}";

Copilot uses AI. Check for mistakes.
}

public:
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/embree/kernels/subdiv/bezier_curve.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ namespace embree
}

friend embree_ostream operator<<(embree_ostream cout, const QuadraticBezierCurve& a) {
return cout << "QuadraticBezierCurve ( (" << a.u.lower << ", " << a.u.upper << "), " << a.v0 << ", " << a.v1 << ", " << a.v2 << ")";
return cout << "QuadraticBezierCurve ( (), " << a.v0 << ", " << a.v1 << ", " << a.v2 << ")";
Copy link

Copilot AI Jan 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The output operator for QuadraticBezierCurve now prints empty parentheses "()" instead of the original interval data. The QuadraticBezierCurve struct only has members v0, v1, and v2 (defined at line 111), and does not have a member 'u' with 'lower' and 'upper' fields. The original code attempting to print "a.u.lower" and "a.u.upper" would have caused a compilation error. However, replacing this with empty parentheses "()" makes the debug output less useful. Consider either removing the empty parentheses entirely or replacing them with meaningful data that actually exists in the struct, such as the interval computed by the interval() method.

Suggested change
return cout << "QuadraticBezierCurve ( (), " << a.v0 << ", " << a.v1 << ", " << a.v2 << ")";
return cout << "QuadraticBezierCurve ( " << a.interval() << ", " << a.v0 << ", " << a.v1 << ", " << a.v2 << ")";

Copilot uses AI. Check for mistakes.
}
};

Expand Down
2 changes: 0 additions & 2 deletions thirdparty/freetype/src/gzip/ftzconf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,7 @@
# define FAR
#endif

#if !defined(MACOS) && !defined(TARGET_OS_MAC)
typedef unsigned char Byte; /* 8 bits */
#endif
typedef unsigned int uInt; /* 16 bits or more */
typedef unsigned long uLong; /* 32 bits or more */

Expand Down
12 changes: 1 addition & 11 deletions thirdparty/libpng/pngpriv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,18 +517,8 @@
*/
# include <float.h>

# if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \
defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)
/* We need to check that <math.h> hasn't already been included earlier
* as it seems it doesn't agree with <fp.h>, yet we should really use
* <fp.h> if possible.
*/
# if !defined(__MATH_H__) && !defined(__MATH_H) && !defined(__cmath__)
# include <fp.h>
# endif
# else

# include <math.h>
# endif
# if defined(_AMIGA) && defined(__SASC) && defined(_M68881)
/* Amiga SAS/C: We must include builtin FPU functions when compiling using
* MATH=68881
Expand Down
13 changes: 1 addition & 12 deletions thirdparty/zlib/zutil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,18 +130,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
# endif
#endif

#if defined(MACOS) || defined(TARGET_OS_MAC)
# define OS_CODE 7
# ifndef Z_SOLO
# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
# include <unix.h> /* for fdopen */
# else
# ifndef fdopen
# define fdopen(fd,mode) NULL /* No fdopen() */
# endif
# endif
# endif
#endif


#ifdef __acorn
# define OS_CODE 13
Expand Down
Loading