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

Make write_escaped_data more bulletproof; backport candidate.

Browse Source 
svn:r5106
This commit is contained in:
Nick Mathewson 2005-09-21 23:13:29 +00:00
parent 1cfcc4b351
commit f99b91505b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/control.c
View File

@ -290,7 +290,7 @@ write_escaped_data(const char *data, size_t len, int translate_newlines,
int start_of_line; int start_of_line;
for (i=0; i<(int)len; ++i) { for (i=0; i<(int)len; ++i) {
if (data[i]== '\n') if (data[i]== '\n')
++sz_out; sz_out += 2; /* Maybe add a CR; maybe add a dot. */
} }
*out = outp = tor_malloc(sz_out+1); *out = outp = tor_malloc(sz_out+1);
end = data+len; end = data+len;
@ -317,6 +317,8 @@ write_escaped_data(const char *data, size_t len, int translate_newlines,
*outp++ = '.'; *outp++ = '.';
*outp++ = '\r'; *outp++ = '\r';
*outp++ = '\n'; *outp++ = '\n';
*outp = '\0'; /* NUL-terminate just in case. */
tor_assert((outp - *out) <= (sz_out));
return outp - *out; return outp - *out;
} }