Merge branch 'bug34077_041' into bug34077_042

This commit is contained in:
Nick Mathewson
2020-04-30 22:59:08 -04:00
2 changed files with 5 additions and 1 deletions
+3
View File
@@ -0,0 +1,3 @@
o Minor bugfixes (compiler warnings):
- Fix compilation warnings with GCC 10.0.1. Fixes bug 34077; bugfix on
0.4.0.3-alpha.
+2 -1
View File
@@ -1066,8 +1066,9 @@ sr_state_set_valid_after(time_t valid_after)
sr_phase_t
sr_state_get_phase(void)
{
void *ptr;
void *ptr=NULL;
state_query(SR_STATE_ACTION_GET, SR_STATE_OBJ_PHASE, NULL, &ptr);
tor_assert(ptr);
return *(sr_phase_t *) ptr;
}