aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-12 13:41:46 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-12 13:41:46 -0700
commit23589a90c3673be5c308cbdd62637bd0cdb6c680 (patch)
treecea44adc863110ace4115e488608fabdf63cd869
parentcd12104ab6a7fde2498bd3962a0f22699d2b9715 (diff)
parent7b96d8880252d70c334857f80ef54009133dbaf3 (diff)
downloadgit-23589a90c3673be5c308cbdd62637bd0cdb6c680.tar.gz
git-23589a90c3673be5c308cbdd62637bd0cdb6c680.tar.xz
Merge branch 'jk/bisect-prn-unsigned' into maint
* jk/bisect-prn-unsigned: bisect: avoid signed integer overflow
-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;
}
/*