[git commit master] od: fix -tx without length spec

Denys Vlasenko vda.linux at googlemail.com
Sun Nov 22 14:37:16 UTC 2009


commit: http://git.busybox.net/busybox/commit/?id=11f3a8b7ed366b23e4740fc847662a971cf65de3
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 coreutils/od_bloaty.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index 0c4740b..6a532fa 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);
-- 
1.6.3.3



More information about the busybox-cvs mailing list