Skip to content

buffer: remove noAssert argument #12119

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

Closed
bnoordhuis wants to merge 3 commits into from
Closed

buffer: remove noAssert argument #12119

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f8c353
src: add helpers for unsigned saturating addition
bnoordhuis Aug 9, 2017
8d8f4dd
src: check receiver when writing floating point
bnoordhuis Aug 9, 2017
2b3e2a2
src: check bounds when reading floating point
bnoordhuis Aug 9, 2017
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
Next Next commit
src: add helpers for unsigned saturating addition
  • Loading branch information
@bnoordhuis
bnoordhuis committed Aug 9, 2017
commit 1f8c353688652694fee116a8d24d2ff66dfa0f67
8 changes: 8 additions & 0 deletions src/util-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,14 @@ bool StringEqualNoCaseN(const char* a, const char* b, size_t length) {
return true;
}

inline uint32_t Add32Clamp(uint32_t x, uint32_t y) {
return x + y >= x ? x + y : static_cast<uint32_t>(-1);
}

inline uint64_t Add64Clamp(uint64_t x, uint64_t y) {
return x + y >= x ? x + y : static_cast<uint64_t>(-1);
}
Copy link
Copy Markdown
Member

@BridgeAR BridgeAR Sep 23, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function seems unused.

Copy link
Copy Markdown
Member Author

@bnoordhuis bnoordhuis Sep 25, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added it for parity (I had plans to use it for something else) but I can remove it.

Copy link
Copy Markdown
Member

@BridgeAR BridgeAR Sep 26, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer not to add functions that have no functionality are unused.


inline size_t MultiplyWithOverflowCheck(size_t a, size_t b) {
size_t ret = a * b;
if (a != 0)
Expand Down
4 changes: 4 additions & 0 deletions src/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,10 @@ inline bool StringEqualNoCase(const char* a, const char* b);
// strncasecmp() is locale-sensitive. Use StringEqualNoCaseN() instead.
inline bool StringEqualNoCaseN(const char* a, const char* b, size_t length);

// Saturating addition.
inline uint32_t Add32Clamp(uint32_t x, uint32_t y);
inline uint64_t Add64Clamp(uint64_t x, uint64_t y);

// Allocates an array of member type T. For up to kStackStorageSize items,
// the stack is used, otherwise malloc().
template <typename T, size_t kStackStorageSize = 1024>
Expand Down