mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 21:23:58 +01:00
Make write_escaped_data more bulletproof; backport candidate.
svn:r5106
This commit is contained in:
parent
1cfcc4b351
commit
f99b91505b
@ -290,7 +290,7 @@ write_escaped_data(const char *data, size_t len, int translate_newlines,
|
||||
int start_of_line;
|
||||
for (i=0; i<(int)len; ++i) {
|
||||
if (data[i]== '\n')
|
||||
++sz_out;
|
||||
sz_out += 2; /* Maybe add a CR; maybe add a dot. */
|
||||
}
|
||||
*out = outp = tor_malloc(sz_out+1);
|
||||
end = data+len;
|
||||
@ -317,6 +317,8 @@ write_escaped_data(const char *data, size_t len, int translate_newlines,
|
||||
*outp++ = '.';
|
||||
*outp++ = '\r';
|
||||
*outp++ = '\n';
|
||||
*outp = '\0'; /* NUL-terminate just in case. */
|
||||
tor_assert((outp - *out) <= (sz_out));
|
||||
return outp - *out;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user