Skip to content

fix(ipc): Don't read past the footer when reporting a bad file magic #985

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pedrobtz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(ipc): Don't read past the footer when reporting a bad file magic #985

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion src/nanoarrow/ipc/decoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1701,7 +1701,8 @@ ArrowErrorCode ArrowIpcDecoderPeekFooter(struct ArrowIpcDecoder* decoder,
const char* footer_size_data = magic - sizeof(int32_t);

if (memcmp(magic, NANOARROW_IPC_MAGIC, strlen(NANOARROW_IPC_MAGIC)) != 0) {
ArrowErrorSet(error, "Expected file to end with ARROW1 but got %s", data_end);
// data is not NUL-terminated: print only the bytes that were compared
ArrowErrorSet(error, "Expected file to end with ARROW1 but got %.6s", magic);
return EINVAL;
}

Expand Down
8 changes: 8 additions & 0 deletions src/nanoarrow/ipc/decoder_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
// under the License.

#include <cstring>
#include <memory>
#include <thread>

#if defined(NANOARROW_BUILD_TESTS_WITH_ARROW)
Expand Down Expand Up @@ -1312,6 +1313,13 @@ TEST(NanoarrowIpcTest, NanoarrowIpcFooterDecodingErrors) {
EINVAL)
<< error.message;

// the message must not read past the end of data, which isn't NUL-terminated
std::unique_ptr<char[]> unterminated(new char[10]);
memcpy(unterminated.get(), "\0\0\0\0blargh", 10);
EXPECT_EQ(ArrowIpcDecoderPeekFooter(decoder.get(), {{unterminated.get()}, 10}, &error),
EINVAL);
EXPECT_STREQ(error.message, "Expected file to end with ARROW1 but got blargh");

// negative size
EXPECT_EQ(ArrowIpcDecoderPeekFooter(decoder.get(),
{{"\xFF\xFF\xFF\xFF"
Expand Down