StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

replace all unsigned except in wrapper

Browse Source
This commit is contained in:
Alexandra Latysheva 2020-10-11 10:01:59 +00:00
parent 69fbe39293
commit 6945f7304f
7 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
oss-internship-2020/libtiff/example/main_sandboxed.cc
View File

@ -36,25 +36,25 @@ struct ChannelLimits {
uint8_t max_alpha; uint8_t max_alpha;
}; };
constexpr unsigned kRawTileNumber = 9; constexpr uint32_t kRawTileNumber = 9;
constexpr unsigned kClusterSize = 6; constexpr uint32_t kClusterSize = 6;
constexpr unsigned kChannelsInPixel = 3; constexpr uint32_t kChannelsInPixel = 3;
constexpr unsigned kTestCount = 3; constexpr uint32_t kTestCount = 3;
constexpr unsigned kImageSize = 128 * 128; constexpr uint32_t kImageSize = 128 * 128;
constexpr unsigned kClusterImageSize = 64 * 64; constexpr uint32_t kClusterImageSize = 64 * 64;
using ClusterData = std::array<uint8_t, kClusterSize>; using ClusterData = std::array<uint8_t, kClusterSize>;
constexpr std::array<std::pair<unsigned, ClusterData>, kTestCount> kClusters = { constexpr std::array<std::pair<uint32_t, ClusterData>, kTestCount> kClusters = {
{{0, {0, 0, 2, 0, 138, 139}}, {{0, {0, 0, 2, 0, 138, 139}},
{64, {0, 0, 9, 6, 134, 119}}, {64, {0, 0, 9, 6, 134, 119}},
{128, {44, 40, 63, 59, 230, 95}}}}; {128, {44, 40, 63, 59, 230, 95}}}};
constexpr std::array<std::pair<unsigned, ChannelLimits>, kTestCount> kLimits = { constexpr std::array<std::pair<uint32_t, ChannelLimits>, kTestCount> kLimits = {
{{0, {15, 18, 0, 0, 18, 41, 255, 255}}, {{0, {15, 18, 0, 0, 18, 41, 255, 255}},
{64, {0, 0, 0, 0, 0, 2, 255, 255}}, {64, {0, 0, 0, 0, 0, 2, 255, 255}},
{512, {5, 6, 34, 36, 182, 196, 255, 255}}}}; {512, {5, 6, 34, 36, 182, 196, 255, 255}}}};
absl::Status CheckCluster(unsigned cluster, absl::Status CheckCluster(uint32_t cluster,
const sapi::v::Array<uint8_t>& buffer, const sapi::v::Array<uint8_t>& buffer,
const ClusterData& expected_cluster) { const ClusterData& expected_cluster) {
if (buffer.GetSize() <= cluster * kClusterSize) { if (buffer.GetSize() <= cluster * kClusterSize) {
@ -75,7 +75,7 @@ absl::Status CheckCluster(unsigned cluster,
target[2], "\t", target[3], "\t", target[4], "\t", target[5], "\n")); target[2], "\t", target[3], "\t", target[4], "\t", target[5], "\n"));
} }
absl::Status CheckRgbPixel(unsigned pixel, const ChannelLimits& limits, absl::Status CheckRgbPixel(uint32_t pixel, const ChannelLimits& limits,
const sapi::v::Array<uint8_t>& buffer) { const sapi::v::Array<uint8_t>& buffer) {
if (buffer.GetSize() <= pixel * kChannelsInPixel) { if (buffer.GetSize() <= pixel * kChannelsInPixel) {
return absl::InternalError("Buffer overrun\n"); return absl::InternalError("Buffer overrun\n");
@ -95,10 +95,10 @@ absl::Status CheckRgbPixel(unsigned pixel, const ChannelLimits& limits,
" (expected ", limits.min_blue, "..=", limits.max_blue, ")\n")); " (expected ", limits.min_blue, "..=", limits.max_blue, ")\n"));
} }
absl::Status CheckRgbaPixel(unsigned pixel, const ChannelLimits& limits, absl::Status CheckRgbaPixel(uint32_t pixel, const ChannelLimits& limits,
const sapi::v::Array<unsigned>& buffer) { const sapi::v::Array<uint32_t>& buffer) {
// RGBA images are upside down - adjust for normal ordering // RGBA images are upside down - adjust for normal ordering
unsigned adjusted_pixel = pixel % 128 + (127 - (pixel / 128)) * 128; uint32_t adjusted_pixel = pixel % 128 + (127 - (pixel / 128)) * 128;
if (buffer.GetSize() <= adjusted_pixel) { if (buffer.GetSize() <= adjusted_pixel) {
return absl::InternalError("Buffer overrun\n"); return absl::InternalError("Buffer overrun\n");
@ -264,7 +264,7 @@ absl::Status LibTIFFMain(const std::string& srcfile) {
return absl::InternalError(absl::StrCat("Could not reopen ", srcfile)); return absl::InternalError(absl::StrCat("Could not reopen ", srcfile));
} }
sapi::v::Array<unsigned> rgba_buffer_(kImageSize); sapi::v::Array<uint32_t> rgba_buffer_(kImageSize);
// read as rgba // read as rgba
SAPI_ASSIGN_OR_RETURN( SAPI_ASSIGN_OR_RETURN(

2
oss-internship-2020/libtiff/test/check_tag.cc
View File

@ -50,7 +50,7 @@ void CheckShortPairedField(TiffApi& api, sapi::v::RemotePtr& tif,
} }
void CheckLongField(TiffApi& api, sapi::v::RemotePtr& tif, const ttag_t field, void CheckLongField(TiffApi& api, sapi::v::RemotePtr& tif, const ttag_t field,
const unsigned value) { const uint32_t value) {
sapi::v::UInt tmp(123); sapi::v::UInt tmp(123);
absl::StatusOr<int> status_or_int; absl::StatusOr<int> status_or_int;

2
oss-internship-2020/libtiff/test/check_tag.h
View File

@ -23,4 +23,4 @@ void CheckShortPairedField(TiffApi& api, sapi::v::RemotePtr& tif,
const ttag_t field, const ttag_t field,
const std::array<uint16_t, 2>& values); const std::array<uint16_t, 2>& values);
void CheckLongField(TiffApi&, sapi::v::RemotePtr& tif, const ttag_t field, void CheckLongField(TiffApi&, sapi::v::RemotePtr& tif, const ttag_t field,
const unsigned value); const uint32_t value);

14
oss-internship-2020/libtiff/test/defer_strile_writing.cc
View File

@ -24,7 +24,7 @@ using ::testing::Eq;
using ::testing::IsTrue; using ::testing::IsTrue;
using ::testing::NotNull; using ::testing::NotNull;
constexpr unsigned kTileBufferSize = 256; constexpr uint16_t kTileBufferSize = 256;
constexpr uint16_t kWidth = 1; constexpr uint16_t kWidth = 1;
constexpr uint16_t kBps = 8; constexpr uint16_t kBps = 8;
constexpr uint16_t kRowsPerStrip = 1; constexpr uint16_t kRowsPerStrip = 1;
@ -212,9 +212,9 @@ void TestWriting(const char* mode, int tiled, int height) {
if (tiled) { if (tiled) {
for (int i = 0; i < (height + 15) / 16; ++i) { for (int i = 0; i < (height + 15) / 16; ++i) {
std::array<unsigned char, kTileBufferSize> tilebuffer; std::array<uint8_t, kTileBufferSize> tilebuffer;
tilebuffer.fill(i); tilebuffer.fill(i);
sapi::v::Array<unsigned char> tilebuffer_(tilebuffer.data(), sapi::v::Array<uint8_t> tilebuffer_(tilebuffer.data(),
kTileBufferSize); kTileBufferSize);
status_or_int = api.TIFFWriteEncodedTile(&tif, i, tilebuffer_.PtrBoth(), status_or_int = api.TIFFWriteEncodedTile(&tif, i, tilebuffer_.PtrBoth(),
@ -251,11 +251,11 @@ void TestWriting(const char* mode, int tiled, int height) {
if (tiled) { if (tiled) {
for (int i = 0; i < (height + 15) / 16; ++i) { for (int i = 0; i < (height + 15) / 16; ++i) {
for (int retry = 0; retry < 2; ++retry) { for (int retry = 0; retry < 2; ++retry) {
std::array<unsigned char, kTileBufferSize> tilebuffer; std::array<uint8_t, kTileBufferSize> tilebuffer;
unsigned char expected_c = (unsigned char)i; uint8_t expected_c = static_cast<uint8_t>(i);
tilebuffer.fill(0); tilebuffer.fill(0);
sapi::v::Array<unsigned char> tilebuffer_(tilebuffer.data(), sapi::v::Array<uint8_t> tilebuffer_(tilebuffer.data(),
kTileBufferSize); kTileBufferSize);
status_or_long = api.TIFFReadEncodedTile( status_or_long = api.TIFFReadEncodedTile(
&tif2, i, tilebuffer_.PtrBoth(), kTileBufferSize); &tif2, i, tilebuffer_.PtrBoth(), kTileBufferSize);
@ -283,7 +283,7 @@ void TestWriting(const char* mode, int tiled, int height) {
for (int i = 0; i < height; ++i) { for (int i = 0; i < height; ++i) {
for (int retry = 0; retry < 2; ++retry) { for (int retry = 0; retry < 2; ++retry) {
sapi::v::UChar c(0); sapi::v::UChar c(0);
unsigned char expected_c = (unsigned char)i; uint8_t expected_c = static_cast<uint8_t>(i);
status_or_long = api.TIFFReadEncodedStrip(&tif2, i, c.PtrBoth(), 1); status_or_long = api.TIFFReadEncodedStrip(&tif2, i, c.PtrBoth(), 1);
ASSERT_THAT(status_or_long, IsOk()) ASSERT_THAT(status_or_long, IsOk())

14
oss-internship-2020/libtiff/test/long_tag.cc
View File

@ -26,18 +26,18 @@ using ::testing::NotNull;
struct LongTag { struct LongTag {
ttag_t tag; ttag_t tag;
short count; int16_t count;
unsigned value; uint32_t value;
}; };
constexpr std::array<LongTag, 1> kLongTags = { constexpr std::array<LongTag, 1> kLongTags = {
{TIFFTAG_SUBFILETYPE, 1, {TIFFTAG_SUBFILETYPE, 1,
FILETYPE_REDUCEDIMAGE | FILETYPE_PAGE | FILETYPE_MASK}}; FILETYPE_REDUCEDIMAGE | FILETYPE_PAGE | FILETYPE_MASK}};
constexpr unsigned kSamplePerPixel = 3; constexpr uint32_t kSamplePerPixel = 3;
constexpr unsigned kWidth = 1; constexpr uint32_t kWidth = 1;
constexpr unsigned kLength = 1; constexpr uint32_t kLength = 1;
constexpr unsigned kBps = 8; constexpr uint32_t kBps = 8;
constexpr unsigned kRowsPerStrip = 1; constexpr uint32_t kRowsPerStrip = 1;
TEST(SandboxTest, LongTag) { TEST(SandboxTest, LongTag) {
absl::StatusOr<std::string> status_or_path = absl::StatusOr<std::string> status_or_path =

28
oss-internship-2020/libtiff/test/raw_decode.cc
View File

@ -37,25 +37,25 @@ struct ChannelLimits {
uint8_t max_alpha; uint8_t max_alpha;
}; };
constexpr unsigned kRawTileNumber = 9; constexpr uint32_t kRawTileNumber = 9;
constexpr unsigned kClusterSize = 6; constexpr uint32_t kClusterSize = 6;
constexpr unsigned kChannelsInPixel = 3; constexpr uint32_t kChannelsInPixel = 3;
constexpr unsigned kTestCount = 3; constexpr uint32_t kTestCount = 3;
constexpr unsigned kImageSize = 128 * 128; constexpr uint32_t kImageSize = 128 * 128;
constexpr unsigned kClusterImageSize = 64 * 64; constexpr uint32_t kClusterImageSize = 64 * 64;
using ClusterData = std::array<uint8_t, kClusterSize>; using ClusterData = std::array<uint8_t, kClusterSize>;
constexpr std::array<std::pair<unsigned, ClusterData>, kTestCount> kClusters = { constexpr std::array<std::pair<uint32_t, ClusterData>, kTestCount> kClusters = {
{{0, {0, 0, 2, 0, 138, 139}}, {{0, {0, 0, 2, 0, 138, 139}},
{64, {0, 0, 9, 6, 134, 119}}, {64, {0, 0, 9, 6, 134, 119}},
{128, {44, 40, 63, 59, 230, 95}}}}; {128, {44, 40, 63, 59, 230, 95}}}};
constexpr std::array<std::pair<unsigned, ChannelLimits>, kTestCount> kLimits = { constexpr std::array<std::pair<uint32_t, ChannelLimits>, kTestCount> kLimits = {
{{0, {15, 18, 0, 0, 18, 41, 255, 255}}, {{0, {15, 18, 0, 0, 18, 41, 255, 255}},
{64, {0, 0, 0, 0, 0, 2, 255, 255}}, {64, {0, 0, 0, 0, 0, 2, 255, 255}},
{512, {5, 6, 34, 36, 182, 196, 255, 255}}}}; {512, {5, 6, 34, 36, 182, 196, 255, 255}}}};
bool CheckCluster(unsigned cluster, const sapi::v::Array<uint8_t>& buffer, bool CheckCluster(uint32_t cluster, const sapi::v::Array<uint8_t>& buffer,
const ClusterData& expected_cluster) { const ClusterData& expected_cluster) {
bool is_overrun = (buffer.GetSize() <= cluster * kClusterSize); bool is_overrun = (buffer.GetSize() <= cluster * kClusterSize);
EXPECT_THAT(is_overrun, IsFalse()) << "Overrun"; EXPECT_THAT(is_overrun, IsFalse()) << "Overrun";
@ -80,7 +80,7 @@ bool CheckCluster(unsigned cluster, const sapi::v::Array<uint8_t>& buffer,
return comp; return comp;
} }
bool CheckRgbPixel(unsigned pixel, const ChannelLimits& limits, bool CheckRgbPixel(uint32_t pixel, const ChannelLimits& limits,
const sapi::v::Array<uint8_t>& buffer) { const sapi::v::Array<uint8_t>& buffer) {
bool is_overrun = (buffer.GetSize() <= pixel * kChannelsInPixel); bool is_overrun = (buffer.GetSize() <= pixel * kChannelsInPixel);
EXPECT_THAT(is_overrun, IsFalse()) << "Overrun"; EXPECT_THAT(is_overrun, IsFalse()) << "Overrun";
@ -103,10 +103,10 @@ bool CheckRgbPixel(unsigned pixel, const ChannelLimits& limits,
return comp; return comp;
} }
bool CheckRgbaPixel(unsigned pixel, const ChannelLimits& limits, bool CheckRgbaPixel(uint32_t pixel, const ChannelLimits& limits,
const sapi::v::Array<unsigned>& buffer) { const sapi::v::Array<uint32_t>& buffer) {
// RGBA images are upside down - adjust for normal ordering // RGBA images are upside down - adjust for normal ordering
unsigned adjusted_pixel = pixel % 128 + (127 - (pixel / 128)) * 128; uint32_t adjusted_pixel = pixel % 128 + (127 - (pixel / 128)) * 128;
bool is_overrun = (buffer.GetSize() <= adjusted_pixel); bool is_overrun = (buffer.GetSize() <= adjusted_pixel);
EXPECT_THAT(is_overrun, IsFalse()) << "Overrun"; EXPECT_THAT(is_overrun, IsFalse()) << "Overrun";
@ -225,7 +225,7 @@ TEST(SandboxTest, RawDecode) {
ASSERT_THAT(tif2.GetValue(), NotNull()) ASSERT_THAT(tif2.GetValue(), NotNull())
<< "Could not open " << srcfile << ", TIFFOpen return NULL"; << "Could not open " << srcfile << ", TIFFOpen return NULL";
sapi::v::Array<unsigned> rgba_buffer_(kImageSize); sapi::v::Array<uint32_t> rgba_buffer_(kImageSize);
status_or_int = status_or_int =
api.TIFFReadRGBATile(&tif2, 1 * 128, 2 * 128, rgba_buffer_.PtrBoth()); api.TIFFReadRGBATile(&tif2, 1 * 128, 2 * 128, rgba_buffer_.PtrBoth());

2
oss-internship-2020/libtiff/test/short_tag.cc
View File

@ -25,7 +25,7 @@ using ::testing::Ne;
using ::testing::IsTrue; using ::testing::IsTrue;
using ::testing::NotNull; using ::testing::NotNull;
constexpr unsigned kSamplePerPixel = 3; constexpr uint16_t kSamplePerPixel = 3;
constexpr uint16_t kWidth = 1; constexpr uint16_t kWidth = 1;
constexpr uint16_t kLength = 1; constexpr uint16_t kLength = 1;
constexpr uint16_t kBps = 8; constexpr uint16_t kBps = 8;