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 e7722de5a4ebfb6cf86b15cb9904ff9eb5fc4ef0..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;
@@ -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;
                                                        }