Merge remote-tracking branch 'origin/maint-0.2.3'

This commit is contained in:
Nick Mathewson 2012-10-04 10:05:55 -04:00
commit d9847165e0
2 changed files with 21 additions and 9 deletions

3
changes/bug7022 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes:
- Fix memory leaks whenever we logged any message about the "path
bias" detection. Fixes bug 7022; bugfix on 0.2.3.21-rc.

View File

@ -2672,6 +2672,7 @@ pathbias_count_first_hop(origin_circuit_t *circ)
circuit_purpose_to_string(circ->_base.purpose),
circuit_state_to_string(circ->_base.state),
rate_msg);
tor_free(rate_msg);
}
tor_fragile_assert();
}
@ -2690,6 +2691,7 @@ pathbias_count_first_hop(origin_circuit_t *circ)
circuit_purpose_to_string(circ->_base.purpose),
circuit_state_to_string(circ->_base.state),
rate_msg);
tor_free(rate_msg);
}
}
@ -2717,6 +2719,7 @@ pathbias_count_first_hop(origin_circuit_t *circ)
circuit_purpose_to_string(circ->_base.purpose),
circuit_state_to_string(circ->_base.state),
rate_msg);
tor_free(rate_msg);
}
}
} else {
@ -2728,6 +2731,7 @@ pathbias_count_first_hop(origin_circuit_t *circ)
circuit_purpose_to_string(circ->_base.purpose),
circuit_state_to_string(circ->_base.state),
rate_msg);
tor_free(rate_msg);
}
}
}
@ -2744,6 +2748,7 @@ pathbias_count_first_hop(origin_circuit_t *circ)
circuit_purpose_to_string(circ->_base.purpose),
circuit_state_to_string(circ->_base.state),
rate_msg);
tor_free(rate_msg);
}
}
}
@ -2790,6 +2795,7 @@ pathbias_count_success(origin_circuit_t *circ)
circuit_purpose_to_string(circ->_base.purpose),
circuit_state_to_string(circ->_base.state),
rate_msg);
tor_free(rate_msg);
}
tor_fragile_assert();
}
@ -2819,6 +2825,7 @@ pathbias_count_success(origin_circuit_t *circ)
circuit_purpose_to_string(circ->_base.purpose),
circuit_state_to_string(circ->_base.state),
rate_msg);
tor_free(rate_msg);
}
}
@ -2840,6 +2847,7 @@ pathbias_count_success(origin_circuit_t *circ)
circuit_purpose_to_string(circ->_base.purpose),
circuit_state_to_string(circ->_base.state),
rate_msg);
tor_free(rate_msg);
}
}
} else {
@ -2853,6 +2861,7 @@ pathbias_count_success(origin_circuit_t *circ)
circuit_purpose_to_string(circ->_base.purpose),
circuit_state_to_string(circ->_base.state),
rate_msg);
tor_free(rate_msg);
}
}
}