nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some logging on failed apply_ed_diff

Browse Source
This commit is contained in:
Nick Mathewson 2017-03-07 11:08:18 -05:00
parent 97620cf18f
commit 06017f35e8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/or/consdiff.c
View File

@ -670,15 +670,15 @@ apply_ed_diff(smartlist_t *cons1, smartlist_t *diff)
if (*endptr1 == ',') { if (*endptr1 == ',') {
end = (int)strtol(endptr1+1, &endptr2, 10); end = (int)strtol(endptr1+1, &endptr2, 10);
if (endptr2 == endptr1+1) { if (endptr2 == endptr1+1) {
goto error_cleanup;
log_warn(LD_CONSDIFF, "Could not apply consensus diff because " log_warn(LD_CONSDIFF, "Could not apply consensus diff because "
"an ed command was missing a range end line number."); "an ed command was missing a range end line number.");
goto error_cleanup;
} }
/* Incoherent range. */ /* Incoherent range. */
if (end <= start) { if (end <= start) {
goto error_cleanup;
log_warn(LD_CONSDIFF, "Could not apply consensus diff because " log_warn(LD_CONSDIFF, "Could not apply consensus diff because "
"an invalid range was found in an ed command."); "an invalid range was found in an ed command.");
goto error_cleanup;
} }
/* We'll take <n1> as <n1>,<n1> for simplicity. */ /* We'll take <n1> as <n1>,<n1> for simplicity. */
@ -693,6 +693,12 @@ apply_ed_diff(smartlist_t *cons1, smartlist_t *diff)
goto error_cleanup; goto error_cleanup;
} }
if (*endptr2 == '\0') {
log_warn(LD_CONSDIFF, "Could not apply consensus diff because "
"a line with no ed command was found");
goto error_cleanup;
}
if (*(endptr2+1) != '\0') { if (*(endptr2+1) != '\0') {
log_warn(LD_CONSDIFF, "Could not apply consensus diff because " log_warn(LD_CONSDIFF, "Could not apply consensus diff because "
"an ed command longer than one char was found."); "an ed command longer than one char was found.");