diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/pki/commands/pkcs7.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/pki/commands/pkcs7.c b/src/pki/commands/pkcs7.c index 9f167d376..790656c62 100644 --- a/src/pki/commands/pkcs7.c +++ b/src/pki/commands/pkcs7.c @@ -31,13 +31,16 @@ static chunk_t read_from_stream(FILE *stream) while (TRUE) { len = fread(buf + total, 1, sizeof(buf) - total, stream); - if (len < 0) + if (len < (sizeof(buf) - total)) { - return chunk_empty; - } - if (len == 0) - { - return chunk_clone(chunk_create(buf, total)); + if (ferror(stream)) + { + return chunk_empty; + } + if (feof(stream)) + { + return chunk_clone(chunk_create(buf, total + len)); + } } total += len; if (total == sizeof(buf)) |