Merge branch 'busybox' into merge

1 files changed, 2 insertions, 1 deletions

diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index b02fb09bd..513c8ef37 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -672,7 +672,7 @@ decode_one_format(const char *s_orig, const char *s, struct tspec *tspec)
                 fmt = FLOATING_POINT;
                 ++s;
                 p = strchr(FDL, *s);
-                if (!p) {
+                if (!p || *p == '\0') {
                         size = sizeof(double);
                         if (isdigit(s[0])) {
                                 size = bb_strtou(s, &end, 0);
@@ -693,6 +693,7 @@ decode_one_format(const char *s_orig, const char *s, struct tspec *tspec)
                         };
 
                         size = FDL_sizeof[p - FDL];
+                        s++; /* skip F/D/L */
                 }
 
                 size_spec = fp_type_size[size];