Permalink
Show file tree
Hide file tree
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Fix BER decoder integer overflow
- Loading branch information
Showing
4 changed files
with
55 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* | ||
| * Safe(r) Integer Handling | ||
| * (C) 2016 Jack Lloyd | ||
| * | ||
| * Botan is released under the Simplified BSD License (see license.txt) | ||
| */ | ||
|
|
||
| #ifndef BOTAN_UTILS_SAFE_INT_H__ | ||
| #define BOTAN_UTILS_SAFE_INT_H__ | ||
|
|
||
| #include <botan/exceptn.h> | ||
| #include <string> | ||
|
|
||
| namespace Botan { | ||
|
|
||
| class Integer_Overflow_Detected : public Exception | ||
| { | ||
| public: | ||
| Integer_Overflow_Detected(const std::string& file, int line) : | ||
| Exception("Integer overflow detected at " + file + ":" + std::to_string(line)) | ||
| {} | ||
| }; | ||
|
|
||
| inline size_t checked_add(size_t x, size_t y, const char* file, int line) | ||
| { | ||
| // TODO: use __builtin_x_overflow on GCC and Clang | ||
| size_t z = x + y; | ||
| if(z < x) | ||
| { | ||
| throw Integer_Overflow_Detected(file, line); | ||
| } | ||
| return z; | ||
| } | ||
|
|
||
| #define BOTAN_CHECKED_ADD(x,y) checked_add(x,y,__FILE__,__LINE__) | ||
|
|
||
| } | ||
|
|
||
| #endif |