torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Light grammar edits

Browse Source
This commit is contained in:
Nick Mathewson
2019-11-11 12:26:09 -05:00
parent 7c3378fb8d
commit 3d1a7d7dd7
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/confmgt/unitparse.c
+5 -3
View File
@@ -148,7 +148,7 @@ config_parse_units(const char *val, const unit_table_t *u, int *ok)
d = u->multiplier * d;
if (d < 0) {
log_warn(LD_CONFIG, "Negative value arised when parsing %s %s",
log_warn(LD_CONFIG, "Got a negative value while parsing %s %s",
val, u->unit);
*ok = 0;
goto done;
@@ -157,7 +157,8 @@ config_parse_units(const char *val, const unit_table_t *u, int *ok)
// Some compilers may warn about casting a double to an unsigned type
// because they don't know if d is >= 0
if (d >= 0 && (d > (double)INT64_MAX || (uint64_t)d > INT64_MAX)) {
log_warn(LD_CONFIG, "Overflow detected parsing %s %s", val, u->unit);
log_warn(LD_CONFIG, "Overflow detected while parsing %s %s",
val, u->unit);
*ok = 0;
goto done;
}
@@ -167,7 +168,8 @@ config_parse_units(const char *val, const unit_table_t *u, int *ok)
v = tor_mul_u64_nowrap(v, u->multiplier);
if (v > INT64_MAX) {
log_warn(LD_CONFIG, "Overflow detected parsing %s %s", val, u->unit);
log_warn(LD_CONFIG, "Overflow detected while parsing %s %s",
val, u->unit);
*ok = 0;
goto done;
}
src/lib/intmath/muldiv.c
+2 -2
View File
@@ -69,8 +69,8 @@ gcd64(uint64_t a, uint64_t b)
return a;
}
/** Return the unsigned integer product of <b>a</b> and <b>b</b>, if overflow
* is detected return UINT64_MAX instead. */
/** Return the unsigned integer product of <b>a</b> and <b>b</b>. If overflow
* is detected, return UINT64_MAX instead. */
uint64_t
tor_mul_u64_nowrap(uint64_t a, uint64_t b)
{