Merge branch 'maint-0.2.9' into release-0.2.9
This commit is contained in:
commit
8efa933da9
|
@ -0,0 +1,4 @@
|
||||||
|
o Minor bugfixes (memory leak)
|
||||||
|
- When moving a signed descriptor object from a source to an existing
|
||||||
|
destination, free the allocated memory inside that destination object.
|
||||||
|
Bugfix on tor-0.2.8.3-alpha; Closes #20715.
|
|
@ -3235,6 +3235,17 @@ signed_descriptor_free(signed_descriptor_t *sd)
|
||||||
tor_free(sd);
|
tor_free(sd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Reset the given signed descriptor <b>sd</b> by freeing the allocated
|
||||||
|
* memory inside the object and by zeroing its content. */
|
||||||
|
static void
|
||||||
|
signed_descriptor_reset(signed_descriptor_t *sd)
|
||||||
|
{
|
||||||
|
tor_assert(sd);
|
||||||
|
tor_free(sd->signed_descriptor_body);
|
||||||
|
tor_cert_free(sd->signing_key_cert);
|
||||||
|
memset(sd, 0, sizeof(*sd));
|
||||||
|
}
|
||||||
|
|
||||||
/** Copy src into dest, and steal all references inside src so that when
|
/** Copy src into dest, and steal all references inside src so that when
|
||||||
* we free src, we don't mess up dest. */
|
* we free src, we don't mess up dest. */
|
||||||
static void
|
static void
|
||||||
|
@ -3242,6 +3253,8 @@ signed_descriptor_move(signed_descriptor_t *dest,
|
||||||
signed_descriptor_t *src)
|
signed_descriptor_t *src)
|
||||||
{
|
{
|
||||||
tor_assert(dest != src);
|
tor_assert(dest != src);
|
||||||
|
/* Cleanup destination object before overwriting it.*/
|
||||||
|
signed_descriptor_reset(dest);
|
||||||
memcpy(dest, src, sizeof(signed_descriptor_t));
|
memcpy(dest, src, sizeof(signed_descriptor_t));
|
||||||
src->signed_descriptor_body = NULL;
|
src->signed_descriptor_body = NULL;
|
||||||
src->signing_key_cert = NULL;
|
src->signing_key_cert = NULL;
|
||||||
|
|
Loading…
Reference in New Issue