Skip to content

Fix NPY header length error due to signed->unsigned conversion #2889

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
Kwonunn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix NPY header length error due to signed->unsigned conversion #2889

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
11 changes: 8 additions & 3 deletions include/xtensor/io/xnpy.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,9 @@ namespace xt
char header_len_le16[2];
istream.read(header_len_le16, 2);

uint16_t header_length = uint16_t(header_len_le16[0] << 0) | uint16_t(header_len_le16[1] << 8);
uint16_t header_b0 = static_cast<uint16_t>(static_cast<uint8_t>(header_len_le16[0]));
uint16_t header_b1 = static_cast<uint16_t>(static_cast<uint8_t>(header_len_le16[1])) << 8;
uint16_t header_length = header_b0 | header_b1;

if ((magic_string_length + 2 + 2 + header_length) % 16 != 0)
{
Expand All @@ -502,8 +504,11 @@ namespace xt
char header_len_le32[4];
istream.read(header_len_le32, 4);

uint32_t header_length = uint32_t(header_len_le32[0] << 0) | uint32_t(header_len_le32[1] << 8)
| uint32_t(header_len_le32[2] << 16) | uint32_t(header_len_le32[3] << 24);
uint32_t header_b0 = static_cast<uint32_t>(static_cast<uint8_t>(header_len_le32[0]));
uint32_t header_b1 = static_cast<uint32_t>(static_cast<uint8_t>(header_len_le32[1])) << 8;
uint32_t header_b2 = static_cast<uint32_t>(static_cast<uint8_t>(header_len_le32[2])) << 16;
uint32_t header_b3 = static_cast<uint32_t>(static_cast<uint8_t>(header_len_le32[3])) << 24;
uint32_t header_length = header_b0 | header_b1 | header_b2 | header_b3;

if ((magic_string_length + 2 + 4 + header_length) % 16 != 0)
{
Expand Down