Merge remote-tracking branch 'sebastian/osxcompile'

This commit is contained in:
Nick Mathewson 2011-10-10 22:03:20 -04:00
commit b5edc838f2

View File

@ -3894,7 +3894,9 @@ get_string_from_pipe(FILE *stream, char *buf_out, size_t count)
char *retval;
size_t len;
retval = fgets(buf_out, count, stream);
tor_assert(count <= INT_MAX);
retval = fgets(buf_out, (int)count, stream);
if (!retval) {
if (feof(stream)) {