Merge branch 'busybox' into merge

4 files changed, 22 insertions, 17 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')
diff --git a/libbb/wfopen.c b/libbb/wfopen.c
index 20fe18b23..1c7f7f3d7 100644
--- a/libbb/wfopen.c
+++ b/libbb/wfopen.c
@@ -42,7 +42,7 @@ static FILE* xfdopen_helper(unsigned fd_and_rw_bit)
 {
         FILE* fp = fdopen(fd_and_rw_bit >> 1, fd_and_rw_bit & 1 ? "w" : "r");
         if (!fp)
-                bb_error_msg_and_die(bb_msg_memory_exhausted);
+                bb_die_memory_exhausted();
         return fp;
 }
 FILE* FAST_FUNC xfdopen_for_read(int fd)
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 43ae98065..e8c027f17 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -59,24 +59,23 @@ char* FAST_FUNC strncpy_IFNAMSIZ(char *dst, const char *src)
  * A truncated result contains the first few digits of the result ala strncpy.
  * Returns a pointer past last generated digit, does _not_ store NUL.
  */
-void BUG_sizeof(void);
 char* FAST_FUNC utoa_to_buf(unsigned n, char *buf, unsigned buflen)
 {
         unsigned i, out, res;
 
         if (buflen) {
                 out = 0;
+
+                BUILD_BUG_ON(sizeof(n) != 4 && sizeof(n) != 8);
                 if (sizeof(n) == 4)
                 // 2^32-1 = 4294967295
                         i = 1000000000;
-#if UINT_MAX > 4294967295 /* prevents warning about "const too large" */
+#if UINT_MAX > 0xffffffff /* prevents warning about "const too large" */
                 else
                 if (sizeof(n) == 8)
                 // 2^64-1 = 18446744073709551615
                         i = 10000000000000000000;
 #endif
-                else
-                        BUG_sizeof();
                 for (; i; i /= 10) {
                         res = n / i;
                         n = n % i;
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index 7032e5f8f..21263ccfe 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -25,6 +25,11 @@
  * fail, so callers never need to check for errors.  If it returned, it
  * succeeded. */
 
+void FAST_FUNC bb_die_memory_exhausted(void)
+{
+        bb_error_msg_and_die(bb_msg_memory_exhausted);
+}
+
 #ifndef DMALLOC
 /* dmalloc provides variants of these that do abort() on failure.
  * Since dmalloc's prototypes overwrite the impls here as they are
@@ -44,7 +49,7 @@ void* FAST_FUNC xmalloc(size_t size)
 {
         void *ptr = malloc(size);
         if (ptr == NULL && size != 0)
-                bb_error_msg_and_die(bb_msg_memory_exhausted);
+                bb_die_memory_exhausted();
         return ptr;
 }
 
@@ -55,7 +60,7 @@ void* FAST_FUNC xrealloc(void *ptr, size_t size)
 {
         ptr = realloc(ptr, size);
         if (ptr == NULL && size != 0)
-                bb_error_msg_and_die(bb_msg_memory_exhausted);
+                bb_die_memory_exhausted();
         return ptr;
 }
 #endif /* DMALLOC */
@@ -79,7 +84,7 @@ char* FAST_FUNC xstrdup(const char *s)
         t = strdup(s);
 
         if (t == NULL)
-                bb_error_msg_and_die(bb_msg_memory_exhausted);
+                bb_die_memory_exhausted();
 
         return t;
 }
@@ -327,14 +332,14 @@ char* FAST_FUNC xasprintf(const char *format, ...)
         va_end(p);
 
         if (r < 0)
-                bb_error_msg_and_die(bb_msg_memory_exhausted);
+                bb_die_memory_exhausted();
         return string_ptr;
 }
 
 void FAST_FUNC xsetenv(const char *key, const char *value)
 {
         if (setenv(key, value, 1))
-                bb_error_msg_and_die(bb_msg_memory_exhausted);
+                bb_die_memory_exhausted();
 }
 
 /* Handles "VAR=VAL" strings, even those which are part of environ