From 11f3a8b7ed366b23e4740fc847662a971cf65de3 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 22 Nov 2009 15:37:16 +0100 Subject: od: fix -tx without length spec Signed-off-by: Denys Vlasenko --- coreutils/od_bloaty.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c index 0c4740b47..6a532fa9d 100644 --- a/coreutils/od_bloaty.c +++ b/coreutils/od_bloaty.c @@ -545,7 +545,8 @@ decode_one_format(const char *s_orig, const char *s, struct tspec *tspec) c = *s++; p = strchr(CSIL, *s); - if (!p) { + /* if *s == NUL, p != NULL! Testcase: "od -tx" */ + if (!p || *p == '\0') { size = sizeof(int); if (isdigit(s[0])) { size = bb_strtou(s, &end, 0); -- cgit v1.2.3