Skip to content

[C++] Cast memcpy argument to size_t #730

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
merged 1 commit into from
Oct 15, 2019
Merged

[C++] Cast memcpy argument to size_t #730

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
7 changes: 4 additions & 3 deletions sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ private CharSequence generateVarData(final String className, final List<Token> t
indent + " std::uint64_t bytesToCopy = length < dataLength ? length : dataLength;\n" +
indent + " std::uint64_t pos = sbePosition();\n" +
indent + " sbePosition(pos + dataLength);\n" +
indent + " std::memcpy(dst, m_buffer + pos, bytesToCopy);\n" +
indent + " std::memcpy(dst, m_buffer + pos, static_cast<size_t>(bytesToCopy));\n" +
indent + " return bytesToCopy;\n" +
indent + " }\n",
propertyName,
Expand Down Expand Up @@ -1441,7 +1441,8 @@ private CharSequence generateArrayProperty(
indent + " }\n\n" +

"%3$s" +
indent + " std::memcpy(dst, m_buffer + m_offset + %4$d, sizeof(%5$s) * length);\n" +
indent + " std::memcpy(dst, m_buffer + m_offset + %4$d, " +
"sizeof(%5$s) * static_cast<size_t>(length));\n" +
indent + " return length;\n" +
indent + " }\n",
toUpperFirstChar(propertyName),
Expand Down Expand Up @@ -1643,7 +1644,7 @@ private CharSequence generateConstPropertyMethods(
indent + " std::uint64_t bytesToCopy = " +
"length < sizeof(%2$sValues) ? length : sizeof(%2$sValues);\n\n" +

indent + " std::memcpy(dst, %2$sValues, bytesToCopy);\n" +
indent + " std::memcpy(dst, %2$sValues, static_cast<size_t>(bytesToCopy));\n" +
indent + " return bytesToCopy;\n" +
indent + " }\n",
toUpperFirstChar(propertyName),
Expand Down