Skip to content

[v630][TPython] Fix LoadMacro for filenames containing special characters #22180

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

Merged
guitargeek merged 1 commit into from
May 8, 2026
+16 −2
Merged

[v630][TPython] Fix LoadMacro for filenames containing special characters #22180

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 16 additions & 2 deletions bindings/tpython/src/TPython.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,11 +269,25 @@ void TPython::LoadMacro(const char *name)
// obtain a reference to look for new classes later
PyObject *old = PyDict_Values(gMainDict);

// escape characters in the file name that would otherwise terminate or
// alter the Python string literal we put the file name into below
std::string escapedName;
escapedName.reserve(std::char_traits<char>::length(name));
for (const char *p = name; *p; ++p) {
switch (*p) {
case '\\': escapedName += "\\\\"; break;
case '"': escapedName += "\\\""; break;
case '\n': escapedName += "\\n"; break;
case '\r': escapedName += "\\r"; break;
default: escapedName += *p; break;
}
}

// actual execution
#if PY_VERSION_HEX < 0x03000000
Exec((std::string("execfile(\"") + name + "\")").c_str());
Exec((std::string("execfile(\"") + escapedName + "\")").c_str());
#else
Exec((std::string("__pyroot_f = open(\"") + name + "\"); "
Exec((std::string("__pyroot_f = open(\"") + escapedName + "\"); "
"exec(__pyroot_f.read()); "
"__pyroot_f.close(); del __pyroot_f")
.c_str());
Expand Down
Loading