aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-10-10 22:03:20 -0400
committerNick Mathewson <nickm@torproject.org>2011-10-10 22:03:20 -0400
commitb5edc838f283c50e8de378e3037a999736d9bbf4 (patch)
tree5092ef9a47f09f2487952af583c5b53a2bb467a6 /src
parentb4bd836f46549b6263c8c55eb3bc127884b72340 (diff)
parentcce85c819b4a9c20562f7860cbe2a8020123ebff (diff)
downloadtor-b5edc838f283c50e8de378e3037a999736d9bbf4.tar.gz
tor-b5edc838f283c50e8de378e3037a999736d9bbf4.zip
Merge remote-tracking branch 'sebastian/osxcompile'
Diffstat (limited to 'src')
-rw-r--r--src/common/util.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/common/util.c b/src/common/util.c
index 9df7a5031f..79e09e4f59 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -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)) {