fix up potential printf's with unsafe format strings

[oweals/busybox.git] / libbb / dump.c

diff --git a/libbb/dump.c b/libbb/dump.c
index 74c5e1691753f965a7d543d4f029020aa812a44d..bef485eff3491dda8c4599eb04c5eddaf130f6c3 100644 (file)
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -96,7 +96,7 @@ static NOINLINE int bb_dump_size(FS *fs)
        return cur_size;
 }
 
-static void rewrite(priv_dumper_t *dumper, FS *fs)
+static NOINLINE void rewrite(priv_dumper_t *dumper, FS *fs)
 {
        enum { NOTOKAY, USEBCNT, USEPREC } sokay;
        PR *pr, **nextpr = NULL;
@@ -298,7 +298,7 @@ static void rewrite(priv_dumper_t *dumper, FS *fs)
         * if, rep count is greater than 1, no trailing whitespace
         * gets output from the last iteration of the format unit.
         */
-       for (fu = fs->nextfu;; fu = fu->nextfu) {
+       for (fu = fs->nextfu; fu; fu = fu->nextfu) {
                if (!fu->nextfu && fs->bcnt < dumper->blocksize
                 && !(fu->flags & F_SETREP) && fu->bcnt
                ) {
@@ -579,11 +579,11 @@ static void display(priv_dumper_t* dumper)
 
                                                        switch (pr->bcnt) {
                                                        case 4:
-                                                               memmove(&fval, bp, sizeof(fval));
+                                                               memcpy(&fval, bp, sizeof(fval));
                                                                printf(pr->fmt, fval);
                                                                break;
                                                        case 8:
-                                                               memmove(&dval, bp, sizeof(dval));
+                                                               memcpy(&dval, bp, sizeof(dval));
                                                                printf(pr->fmt, dval);
                                                                break;
                                                        }
@@ -598,11 +598,11 @@ static void display(priv_dumper_t* dumper)
                                                                printf(pr->fmt, (int) *bp);
                                                                break;
                                                        case 2:
-                                                               memmove(&sval, bp, sizeof(sval));
+                                                               memcpy(&sval, bp, sizeof(sval));
                                                                printf(pr->fmt, (int) sval);
                                                                break;
                                                        case 4:
-                                                               memmove(&ival, bp, sizeof(ival));
+                                                               memcpy(&ival, bp, sizeof(ival));
                                                                printf(pr->fmt, ival);
                                                                break;
                                                        }
@@ -629,11 +629,11 @@ static void display(priv_dumper_t* dumper)
                                                                printf(pr->fmt, (unsigned) *bp);
                                                                break;
                                                        case 2:
-                                                               memmove(&sval, bp, sizeof(sval));
+                                                               memcpy(&sval, bp, sizeof(sval));
                                                                printf(pr->fmt, (unsigned) sval);
                                                                break;
                                                        case 4:
-                                                               memmove(&ival, bp, sizeof(ival));
+                                                               memcpy(&ival, bp, sizeof(ival));
                                                                printf(pr->fmt, ival);
                                                                break;
                                                        }
@@ -723,7 +723,8 @@ void FAST_FUNC bb_dump_add(dumper_t* pub_dumper, const char *fmt)
        nextfupp = &tfs->nextfu;
 
        /* take the format string and break it up into format units */
-       for (p = fmt;;) {
+       p = fmt;
+       for (;;) {
                p = skip_whitespace(p);
                if (!*p) {
                        break;