Merge branch 'busybox' into merge

1 files changed, 8 insertions, 7 deletions

diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
index 4e09ddc80..09ccfba67 100644
--- a/libbb/get_line_from_file.c
+++ b/libbb/get_line_from_file.c
@@ -10,16 +10,19 @@
  */
 #include "libbb.h"
 
-char* FAST_FUNC bb_get_chunk_from_file(FILE *file, int *end)
+char* FAST_FUNC bb_get_chunk_from_file(FILE *file, size_t *end)
 {
         int ch;
-        unsigned idx = 0;
+        size_t idx = 0;
         char *linebuf = NULL;
 
         while ((ch = getc(file)) != EOF) {
                 /* grow the line buffer as necessary */
-                if (!(idx & 0xff))
+                if (!(idx & 0xff)) {
+                        if (idx == ((size_t)-1) - 0xff)
+                                bb_die_memory_exhausted();
                         linebuf = xrealloc(linebuf, idx + 0x100);
+                }
                 linebuf[idx++] = (char) ch;
                 if (ch == '\0')
                         break;
@@ -44,14 +47,12 @@ char* FAST_FUNC bb_get_chunk_from_file(FILE *file, int *end)
 /* Get line, including trailing \n if any */
 char* FAST_FUNC xmalloc_fgets(FILE *file)
 {
-        int i;
-
-        return bb_get_chunk_from_file(file, &i);
+        return bb_get_chunk_from_file(file, NULL);
 }
 /* Get line.  Remove trailing \n */
 char* FAST_FUNC xmalloc_fgetline(FILE *file)
 {
-        int i;
+        size_t i;
         char *c = bb_get_chunk_from_file(file, &i);
 
         if (i && c[--i] == '\n')