diff options
-rw-r--r-- | libbb/fgets_str.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/libbb/fgets_str.c b/libbb/fgets_str.c index 1a7f2e9e0..c884ef8af 100644 --- a/libbb/fgets_str.c +++ b/libbb/fgets_str.c | |||
@@ -17,7 +17,7 @@ static char *xmalloc_fgets_internal(FILE *file, const char *terminating_string, | |||
17 | int linebufsz = 0; | 17 | int linebufsz = 0; |
18 | int idx = 0; | 18 | int idx = 0; |
19 | int ch; | 19 | int ch; |
20 | size_t maxsz = *maxsz_p; | 20 | size_t maxsz = maxsz_p ? *maxsz_p : INT_MAX - 4095; |
21 | 21 | ||
22 | while (1) { | 22 | while (1) { |
23 | ch = fgetc(file); | 23 | ch = fgetc(file); |
@@ -53,7 +53,8 @@ static char *xmalloc_fgets_internal(FILE *file, const char *terminating_string, | |||
53 | /* Grow/shrink *first*, then store NUL */ | 53 | /* Grow/shrink *first*, then store NUL */ |
54 | linebuf = xrealloc(linebuf, idx + 1); | 54 | linebuf = xrealloc(linebuf, idx + 1); |
55 | linebuf[idx] = '\0'; | 55 | linebuf[idx] = '\0'; |
56 | *maxsz_p = idx; | 56 | if (maxsz_p) |
57 | *maxsz_p = idx; | ||
57 | return linebuf; | 58 | return linebuf; |
58 | } | 59 | } |
59 | 60 | ||
@@ -63,23 +64,15 @@ static char *xmalloc_fgets_internal(FILE *file, const char *terminating_string, | |||
63 | * Return NULL if EOF is reached immediately. */ | 64 | * Return NULL if EOF is reached immediately. */ |
64 | char* FAST_FUNC xmalloc_fgets_str(FILE *file, const char *terminating_string) | 65 | char* FAST_FUNC xmalloc_fgets_str(FILE *file, const char *terminating_string) |
65 | { | 66 | { |
66 | size_t maxsz = INT_MAX - 4095; | 67 | return xmalloc_fgets_internal(file, terminating_string, 0, NULL); |
67 | return xmalloc_fgets_internal(file, terminating_string, 0, &maxsz); | ||
68 | } | 68 | } |
69 | 69 | ||
70 | char* FAST_FUNC xmalloc_fgets_str_len(FILE *file, const char *terminating_string, size_t *maxsz_p) | 70 | char* FAST_FUNC xmalloc_fgets_str_len(FILE *file, const char *terminating_string, size_t *maxsz_p) |
71 | { | 71 | { |
72 | size_t maxsz; | ||
73 | |||
74 | if (!maxsz_p) { | ||
75 | maxsz = INT_MAX - 4095; | ||
76 | maxsz_p = &maxsz; | ||
77 | } | ||
78 | return xmalloc_fgets_internal(file, terminating_string, 0, maxsz_p); | 72 | return xmalloc_fgets_internal(file, terminating_string, 0, maxsz_p); |
79 | } | 73 | } |
80 | 74 | ||
81 | char* FAST_FUNC xmalloc_fgetline_str(FILE *file, const char *terminating_string) | 75 | char* FAST_FUNC xmalloc_fgetline_str(FILE *file, const char *terminating_string) |
82 | { | 76 | { |
83 | size_t maxsz = INT_MAX - 4095; | 77 | return xmalloc_fgets_internal(file, terminating_string, 1, NULL); |
84 | return xmalloc_fgets_internal(file, terminating_string, 1, &maxsz); | ||
85 | } | 78 | } |