emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix overflow for machines greater than 4GB, return unsigned int to avoid

Browse Source 
a cast and for greater accuracy.
This commit is contained in:
Glenn L McGrath 2003-08-26 02:14:58 +00:00
parent 97e2426582
commit ce6482eace
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
init/init.c
View File

@ -310,7 +310,7 @@ static void set_term(int fd)
/* How much memory does this machine have?
Units are kBytes to avoid overflow on 4GB machines */
static int check_free_memory(void)
static unsigned int check_free_memory(void)
{
struct sysinfo info;
unsigned int result, u, s = 10;
@ -330,10 +330,11 @@ static int check_free_memory(void)
s--;
}
result = (info.totalram >> s) + (info.totalswap >> s);
result = result * u;
if (result < 0)
result = INT_MAX;
return result;
if ((unsigned long long) (result * u) > UINT_MAX) {
return(UINT_MAX);
} else {
return(result * u);
}
}
static void console_init(void)