Properly read data from stream in pki --pkcs7

diff --git a/src/pki/commands/pkcs7.c b/src/pki/commands/pkcs7.c
index 9f167d3768fe1b11d0a600e2edfe9fdc804b8055..790656c62bef76623f74123c881d56bef817f772 100644 (file)
--- 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))