#include "libbb.h"
-static char *xmalloc_fgets_internal(FILE *file, const char *terminating_string, int chop_off)
+static char *xmalloc_fgets_internal(FILE *file, const char *terminating_string, int chop_off, size_t *maxsz_p)
{
char *linebuf = NULL;
const int term_length = strlen(terminating_string);
int linebufsz = 0;
int idx = 0;
int ch;
+ size_t maxsz = *maxsz_p;
while (1) {
ch = fgetc(file);
if (idx >= linebufsz) {
linebufsz += 200;
linebuf = xrealloc(linebuf, linebufsz);
+ if (idx >= maxsz) {
+ linebuf[idx] = ch;
+ idx++;
+ break;
+ }
}
linebuf[idx] = ch;
/* Grow/shrink *first*, then store NUL */
linebuf = xrealloc(linebuf, idx + 1);
linebuf[idx] = '\0';
+ *maxsz_p = idx;
return linebuf;
}
* including terminating string.
* Non-terminated string can be returned if EOF is reached.
* Return NULL if EOF is reached immediately. */
-char *xmalloc_fgets_str(FILE *file, const char *terminating_string)
+char* FAST_FUNC xmalloc_fgets_str(FILE *file, const char *terminating_string)
{
- return xmalloc_fgets_internal(file, terminating_string, 0);
+ size_t maxsz = INT_MAX - 4095;
+ return xmalloc_fgets_internal(file, terminating_string, 0, &maxsz);
}
-char *xmalloc_fgetline_str(FILE *file, const char *terminating_string)
+char* FAST_FUNC xmalloc_fgets_str_len(FILE *file, const char *terminating_string, size_t *maxsz_p)
{
- return xmalloc_fgets_internal(file, terminating_string, 1);
+ size_t maxsz;
+
+ if (!maxsz_p) {
+ maxsz = INT_MAX - 4095;
+ maxsz_p = &maxsz;
+ }
+ return xmalloc_fgets_internal(file, terminating_string, 0, maxsz_p);
+}
+
+char* FAST_FUNC xmalloc_fgetline_str(FILE *file, const char *terminating_string)
+{
+ size_t maxsz = INT_MAX - 4095;
+ return xmalloc_fgets_internal(file, terminating_string, 1, &maxsz);
}