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

Merge branch 'maint-0.3.3' into maint-0.3.4

Browse Source
This commit is contained in:
Nick Mathewson 2018-10-29 15:57:31 -04:00
commit c4b6b57388
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug28202 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (C correctness):
- Avoid undefined behavior in an end-of-string check when parsing the
BEGIN line in a directory object. Fixes bug 28202; bugfix on
0.2.0.3-alpha.

3
src/or/parsecommon.c
View File

@ -345,7 +345,7 @@ get_next_token(memarea_t *area,
goto check_object; goto check_object;
obstart = *s; /* Set obstart to start of object spec */ obstart = *s; /* Set obstart to start of object spec */
if (*s+16 >= eol || memchr(*s+11,'\0',eol-*s-16) || /* no short lines, */ if (eol - *s <= 16 || memchr(*s+11,'\0',eol-*s-16) || /* no short lines, */
strcmp_len(eol-5, "-----", 5) || /* nuls or invalid endings */ strcmp_len(eol-5, "-----", 5) || /* nuls or invalid endings */
(eol-*s) > MAX_UNPARSED_OBJECT_SIZE) { /* name too long */ (eol-*s) > MAX_UNPARSED_OBJECT_SIZE) { /* name too long */
RET_ERR("Malformed object: bad begin line"); RET_ERR("Malformed object: bad begin line");
@ -448,4 +448,3 @@ find_all_by_keyword(const smartlist_t *s, directory_keyword k)
}); });
return out; return out;
} }

7
src/or/routerparse.c
View File

@ -4602,13 +4602,13 @@ find_start_of_next_microdesc(const char *s, const char *eos)
return NULL; return NULL;
#define CHECK_LENGTH() STMT_BEGIN \ #define CHECK_LENGTH() STMT_BEGIN \
if (s+32 > eos) \ if (eos - s < 32) \
return NULL; \ return NULL; \
STMT_END STMT_END
#define NEXT_LINE() STMT_BEGIN \ #define NEXT_LINE() STMT_BEGIN \
s = memchr(s, '\n', eos-s); \ s = memchr(s, '\n', eos-s); \
if (!s || s+1 >= eos) \ if (!s || eos - s <= 1) \
return NULL; \ return NULL; \
s++; \ s++; \
STMT_END STMT_END
@ -4632,7 +4632,7 @@ find_start_of_next_microdesc(const char *s, const char *eos)
/* Okay, now we're pointed at the first line of the microdescriptor which is /* Okay, now we're pointed at the first line of the microdescriptor which is
not an annotation or onion-key. The next line that _is_ an annotation or not an annotation or onion-key. The next line that _is_ an annotation or
onion-key is the start of the next microdescriptor. */ onion-key is the start of the next microdescriptor. */
while (s+32 < eos) { while (eos - s > 32) {
if (*s == '@' || !strcmpstart(s, "onion-key")) if (*s == '@' || !strcmpstart(s, "onion-key"))
return s; return s;
NEXT_LINE(); NEXT_LINE();
@ -5667,4 +5667,3 @@ routerparse_free_all(void)
{ {
dump_desc_fifo_cleanup(); dump_desc_fifo_cleanup();
} }