From: Vito Caputo <vcaputo@gnugeneration.com>
Date: Fri, 5 Aug 2016 04:09:23 +0000 (-0700)
Subject: fileio: fix MIN/MAX mixup (#3896)
X-Git-Tag: v232.2~98
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=80e82f41a485f3045812becb3f6ced94f4d78eed

fileio: fix MIN/MAX mixup (#3896)

The intention is to clamp the value to READ_FULL_BYTES_MAX, which
would be the minimum of the two.
---

diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index 16a6d0287..88fd7d094 100644
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -271,7 +271,7 @@ int read_full_stream(FILE *f, char **contents, size_t *size) {
                 if (n >= READ_FULL_BYTES_MAX)
                         return -E2BIG;
 
-                n = MAX(n * 2, READ_FULL_BYTES_MAX);
+                n = MIN(n * 2, READ_FULL_BYTES_MAX);
         }
 
         buf[l] = 0;