diff options
| author | Patrick Steinhardt <ps@pks.im> | 2018-03-08 13:13:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-08 13:13:04 +0100 |
| commit | d11c4a1a464f10c69d5cc58824e980ea5045d439 (patch) | |
| tree | de5b0786f6916ac32b2525656a3516c625eb0c78 | |
| parent | 515683c7bd9337aaf857dc69e428924cb9a7e5b4 (diff) | |
| parent | e666495b79da415587da067c79fb1474097f19da (diff) | |
| download | libgit2-d11c4a1a464f10c69d5cc58824e980ea5045d439.tar.gz | |
Merge pull request #4571 from jacquesg/overflow
Integer overflow
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | include/git2/diff.h | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e98bbc76..2ca5354a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -221,6 +221,7 @@ ELSE () ENABLE_WARNINGS(strict-aliasing) ENABLE_WARNINGS(strict-prototypes) ENABLE_WARNINGS(declaration-after-statement) + ENABLE_WARNINGS(shift-count-overflow) DISABLE_WARNINGS(unused-const-variable) DISABLE_WARNINGS(unused-function) diff --git a/include/git2/diff.h b/include/git2/diff.h index 99a94bb6d..86009f583 100644 --- a/include/git2/diff.h +++ b/include/git2/diff.h @@ -200,18 +200,18 @@ typedef enum { /** Use the "patience diff" algorithm */ GIT_DIFF_PATIENCE = (1u << 28), /** Take extra time to find minimal diff */ - GIT_DIFF_MINIMAL = (1 << 29), + GIT_DIFF_MINIMAL = (1u << 29), /** Include the necessary deflate / delta information so that `git-apply` * can apply given diff information to binary files. */ - GIT_DIFF_SHOW_BINARY = (1 << 30), + GIT_DIFF_SHOW_BINARY = (1u << 30), /** Use a heuristic that takes indentation and whitespace into account * which generally can produce better diffs when dealing with ambiguous * diff hunks. */ - GIT_DIFF_INDENT_HEURISTIC = (1 << 31), + GIT_DIFF_INDENT_HEURISTIC = (1u << 31), } git_diff_option_t; /** |