aboutsummaryrefslogtreecommitdiff
path: root/bisect.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-07 14:32:54 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-07 14:32:54 -0700
commit252905dd4a237f884f4913a71b345d29abc899e3 (patch)
treeeb1b5c1d5a81ab12a616191f0cb4b10359729261 /bisect.c
parent4d35924e3ac2e3022dd7595afe48334e7a794fb4 (diff)
parent7b96d8880252d70c334857f80ef54009133dbaf3 (diff)
downloadgit-252905dd4a237f884f4913a71b345d29abc899e3.tar.gz
git-252905dd4a237f884f4913a71b345d29abc899e3.tar.xz
Merge branch 'jk/bisect-prn-unsigned'
* jk/bisect-prn-unsigned: bisect: avoid signed integer overflow
Diffstat (limited to 'bisect.c')
-rw-r--r--bisect.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/bisect.c b/bisect.c
index bd1b7b5da..374d9e24b 100644
--- a/bisect.c
+++ b/bisect.c
@@ -525,9 +525,9 @@ struct commit_list *filter_skipped(struct commit_list *list,
* is increased by one between each call, but that should not matter
* for this application.
*/
-static int get_prn(int count) {
+static unsigned get_prn(unsigned count) {
count = count * 1103515245 + 12345;
- return ((unsigned)(count/65536) % PRN_MODULO);
+ return (count/65536) % PRN_MODULO;
}
/*