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

Merge remote-tracking branch 'tor-github/pr/1407' into maint-0.4.2

Browse Source
This commit is contained in:
teor 2019-10-18 12:05:07 +10:00
commit f73c8bd786
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket32063 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (hs-v3, memory leak):
- Fix memory leak in unlikely error code path when encoding HS DoS establish
intro extension cell. Fixes bug 32063; bugfix on 0.4.2.1-alpha.

13
src/feature/hs/hs_cell.c
View File

@ -503,8 +503,8 @@ build_establish_intro_dos_extension(const hs_service_config_t *service_config,
ssize_t ret;
size_t dos_ext_encoded_len;
uint8_t *field_array;
trn_cell_extension_field_t *field;
trn_cell_extension_dos_t *dos_ext;
trn_cell_extension_field_t *field = NULL;
trn_cell_extension_dos_t *dos_ext = NULL;
tor_assert(service_config);
tor_assert(extensions);
@ -530,7 +530,7 @@ build_establish_intro_dos_extension(const hs_service_config_t *service_config,
/* Set the field with the encoded DoS extension. */
ret = trn_cell_extension_dos_encoded_len(dos_ext);
if (BUG(ret <= 0)) {
return -1;
goto err;
}
dos_ext_encoded_len = ret;
/* Set length field and the field array size length. */
@ -541,7 +541,7 @@ build_establish_intro_dos_extension(const hs_service_config_t *service_config,
ret = trn_cell_extension_dos_encode(field_array,
trn_cell_extension_field_getlen_field(field), dos_ext);
if (BUG(ret <= 0)) {
return -1;
goto err;
}
tor_assert(ret == (ssize_t) dos_ext_encoded_len);
@ -557,6 +557,11 @@ build_establish_intro_dos_extension(const hs_service_config_t *service_config,
trn_cell_extension_dos_free(dos_ext);
return 0;
err:
trn_cell_extension_field_free(field);
trn_cell_extension_dos_free(dos_ext);
return -1;
}
/* ========== */