chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2e59594
)
fileio: fix MIN/MAX mixup (#3896)
author
Vito Caputo
<vcaputo@gnugeneration.com>
Fri, 5 Aug 2016 04:09:23 +0000
(21:09 -0700)
committer
Sven Eden
<yamakuzure@gmx.net>
Wed, 5 Jul 2017 06:50:50 +0000
(08:50 +0200)
The intention is to clamp the value to READ_FULL_BYTES_MAX, which
would be the minimum of the two.
src/basic/fileio.c
patch
|
blob
|
history
diff --git
a/src/basic/fileio.c
b/src/basic/fileio.c
index 16a6d02872eb7986994bb673fccce468a9de5dc5..88fd7d09436f7d6d52e8fd7e3650c16ef1815854 100644
(file)
--- 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 = M
AX
(n * 2, READ_FULL_BYTES_MAX);
+ n = M
IN
(n * 2, READ_FULL_BYTES_MAX);
}
buf[l] = 0;