ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-18 12:22:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'romeromalaquias-scary-ifdefs'

Browse Source 
Pulls preprocessor conditional out of the middle of a ||
This commit is contained in:
Raymond Pasco 2015-12-10 15:03:26 -05:00
commit 9957cc9589
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jets/e/scr.c
View File

@ -237,11 +237,12 @@ _crypto_scrypt(const uint8_t * passwd, size_t passwdlen,
errno = EINVAL;
goto err0;
}
if ((r > SIZE_MAX / 128 / p) ||
int test_size_max = (r > SIZE_MAX / 128 / p) || (N > SIZE_MAX / 128 / r);
#if SIZE_MAX / 256 <= UINT32_MAX
(r > (SIZE_MAX - 64) / 256) ||
test_size_max = (r > (SIZE_MAX - 64) / 256) || test_size_max;
#endif
(N > SIZE_MAX / 128 / r)) {
if(test_size_max) {
errno = ENOMEM;
goto err0;
}