Skip to content

THRIFT-5932: compiler/cpp: bound saferealpath() output on Windows #3357

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
neosys007 wants to merge 2 commits into
base: master
Choose a base branch
from
+19 −10
Open

THRIFT-5932: compiler/cpp: bound saferealpath() output on Windows #3357

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72e169c
THRIFT-5932: compiler/cpp: bound saferealpath() output on Windows
neosys007 Mar 21, 2026
6e59e50
compiler: use strcpy() for checked saferealpath() copy
neosys007 Mar 25, 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
29 changes: 19 additions & 10 deletions compiler/cpp/src/thrift/main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include <stdio.h>
#include <stdarg.h>
#include <time.h>
#include <cstring>
#include <string>
#include <algorithm>
#include <sys/types.h>
Expand Down Expand Up @@ -164,27 +165,35 @@ bool g_generator_failure = false;
* Win32 doesn't have realpath, so use fallback implementation in that case,
* otherwise this just calls through to realpath
*/
char* saferealpath(const char* path, char* resolved_path) {
char* saferealpath(const char* path, char* resolved_path, size_t resolved_path_size) {
#ifdef _WIN32
char buf[MAX_PATH];
char* basename;
const char* source;
size_t source_len;
DWORD len = GetFullPathNameA(path, MAX_PATH, buf, &basename);
if (len == 0 || len > MAX_PATH - 1) {
strcpy(resolved_path, path);
source = path;
} else {
strcpy(resolved_path, buf);
source = buf;
}

source_len = strlen(source);
if (source_len >= resolved_path_size) {
return nullptr;
}
strcpy(resolved_path, source);

Copy link
Copy Markdown
Member

@Jens-G Jens-G Mar 24, 2026

Choose a reason for hiding this comment

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

Why memcpy() now?

// Replace backslashes with forward slashes so the
// rest of the code behaves correctly.
size_t resolved_len = strlen(resolved_path);
for (size_t i = 0; i < resolved_len; i++) {
for (size_t i = 0; i < source_len; i++) {
if (resolved_path[i] == '\\') {
resolved_path[i] = '/';
}
}
return resolved_path;
#else
(void) resolved_path_size;
return realpath(path, resolved_path);
#endif
}
Expand Down Expand Up @@ -337,7 +346,7 @@ string include_file(string filename) {
// Realpath!
char rp[THRIFT_PATH_MAX];
// cppcheck-suppress uninitvar
if (saferealpath(filename.c_str(), rp) == nullptr) {
if (saferealpath(filename.c_str(), rp, THRIFT_PATH_MAX) == nullptr) {
pwarning(0, "Cannot open include file %s\n", filename.c_str());
return std::string();
}
Expand All @@ -360,7 +369,7 @@ string include_file(string filename) {
// Realpath!
char rp[THRIFT_PATH_MAX];
// cppcheck-suppress uninitvar
if (saferealpath(sfilename.c_str(), rp) == nullptr) {
if (saferealpath(sfilename.c_str(), rp, THRIFT_PATH_MAX) == nullptr) {
continue;
}

Expand Down Expand Up @@ -1174,7 +1183,7 @@ int main(int argc, char** argv) {
char old_thrift_file_rp[THRIFT_PATH_MAX];

// cppcheck-suppress uninitvar
if (saferealpath(arg, old_thrift_file_rp) == nullptr) {
if (saferealpath(arg, old_thrift_file_rp, THRIFT_PATH_MAX) == nullptr) {
failure("Could not open input file with realpath: %s", arg);
}
old_input_file = string(old_thrift_file_rp);
Expand Down Expand Up @@ -1232,7 +1241,7 @@ int main(int argc, char** argv) {
usage();
}
// cppcheck-suppress uninitvar
if (saferealpath(argv[i], new_thrift_file_rp) == nullptr) {
if (saferealpath(argv[i], new_thrift_file_rp, THRIFT_PATH_MAX) == nullptr) {
failure("Could not open input file with realpath: %s", argv[i]);
}
string new_input_file(new_thrift_file_rp);
Expand All @@ -1258,7 +1267,7 @@ int main(int argc, char** argv) {
usage();
}
// cppcheck-suppress uninitvar
if (saferealpath(argv[i], rp) == nullptr) {
if (saferealpath(argv[i], rp, THRIFT_PATH_MAX) == nullptr) {
failure("Could not open input file with realpath: %s", argv[i]);
}
string input_file(rp);
Expand Down