Skip to content

Removed usage of variable length arrays, fixed memory leaks #2400

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
jwillemsen merged 2 commits into from
Jun 24, 2025
Merged

Removed usage of variable length arrays, fixed memory leaks #2400

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0d6b70
Removed usage of variable length arrays, these are a gcc/clang extension
jwillemsen Jun 12, 2025
37a6d5f
Add back small buffer optimization
jwillemsen Jun 12, 2025
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
36 changes: 14 additions & 22 deletions ACE/ace/Svc_Conf_Lexer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
#define ACE_MAX_BYTES_PER_CHAR 4
#define ACE_YY_CONVERSION_SPACE ACE_YY_BUF_SIZE * ACE_MAX_BYTES_PER_CHAR

#if defined (__GNUG__)
# define ACE_TEMPORARY_STRING(X,SIZE) \
__extension__ char X[SIZE]
#else
# define ACE_TEMPORARY_STRING(X,SIZE) \
char* X = 0; \
char X ## buf[ACE_YY_BUF_SIZE]; \
std::unique_ptr<char> X ## bufp (nullptr); \
if (SIZE > ACE_YY_BUF_SIZE) { \
X ## bufp.reset (new char[SIZE]); \
X = X ## bufp.get (); \
} \
else { \
X = X ## buf; \
}
#endif /* __GNUG__ */

// These are states not covered by the tokens in Svc_Conf_Tokens.h
#define ACE_NO_STATE -1
#define ACE_COMMENT 0
Expand Down Expand Up @@ -426,13 +409,22 @@ ACE_Svc_Conf_Lexer::scan (ACE_YYSTYPE* ace_yylval,
}

// String from buffer->index_ to current (inclusive)
size_t size = (current - buffer->index_) + 1;
ACE_TEMPORARY_STRING (str, size);
ACE_OS::strncpy (str, buffer->input_ + buffer->index_,
size - 1);
size_t const size = (current - buffer->index_) + 1;
char* str {};
char str_buf[ACE_YY_BUF_SIZE];
std::unique_ptr<char[]> str_bufp {};
if (size > ACE_YY_BUF_SIZE)
{
str_bufp = std::make_unique<char[]>(size);
str = str_bufp.get ();
}
else
{
str = str_buf;
}
ACE_OS::strncpy (str, buffer->input_ + buffer->index_, size - 1);
str[size - 1] = '\0';


if (ACE_OS::strcmp (str, "dynamic") == 0)
{
buffer->index_ = current;
Expand Down