mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2024-12-22 07:27:59 -08:00
Code

In 32 bits sqrt(val) + 1 can overflow, so some big primes still

Browse Source 
aren't recognized as such, for example 18446744073709551577 given
in the commit message of factor.c r1.7 from NetBSD.  Move the
return type of usqrt() from u_int32_t to u_int64_t.

ok guenther, tom, otto
This commit is contained in:
tb 2016-09-01 10:48:38 +00:00
parent a26544efd3
commit 2fde6ebb66
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
games/factor/factor.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: factor.c,v 1.29 2016/08/14 18:34:48 guenther Exp $ */
/* $OpenBSD: factor.c,v 1.30 2016/09/01 10:48:38 tb Exp $ */
/* $NetBSD: factor.c,v 1.5 1995/03/23 08:28:07 cgd Exp $ */
/*
@ -75,7 +75,7 @@ extern const int pattern_size;
static void pr_fact(u_int64_t); /* print factors of a value */
static void pr_bigfact(u_int64_t);
static u_int32_t usqrt(u_int64_t);
static u_int64_t usqrt(u_int64_t);
static void __dead usage(void);
int
@ -284,7 +284,7 @@ pr_bigfact(u_int64_t val) /* Factor this value. */
}
/* Code taken from ping.c */
static u_int32_t
static u_int64_t
usqrt(u_int64_t n)
{
u_int64_t y, x = 1;
@ -299,7 +299,7 @@ usqrt(u_int64_t n)
x /= 2;
} while (((y < x) && (x - y) > 1) || (y - x) > 1);
return (u_int32_t)x;
return x;
}
static void __dead