Bug 30685

Summary: Patch for usr.bin/hexdump
Product: Base System Reporter: simon <simon>
Component: binAssignee: Crist J. Clark <cjc>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Unspecified   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description simon 2001-09-20 15:27:54 UTC 
>Number:         30685
>Category:       bin
>Synopsis:       Patch for usr.bin/hexdump
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 20 07:30:03 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Andrey Simonenko
>Release:        FreeBSD 4.4-RC i386
>Organization:
>Environment:

FreeBSD 4.4-RC i386

>Description:

hexdump(8) expects that an argument for -e option is always surrounded by
double quote (" ") marks. And following calls generate core-dumps:

$ hexdump -e "" some-file
$ hexdump -e "\"%c\"" -e " " some-file

hexdump(8) shouldn't generate core-dumps in reaction on -e "" option,
instead it should skip this format string as empty.

Following patch fixes described above problem with hexdump(8).

>How-To-Repeat:

$ hexdump -e "" /COPYRIGHT
$ hexdump -e "\"%c\"" -e " " /COPYRIGHT

I checked original hexdump and patched hexdump with different format
strings in -e option, and didn't find any differences in outputs.

>Fix:

diff -ru /usr/src/usr.bin/hexdump/parse.c hexdump/parse.c
--- /usr/src/usr.bin/hexdump/parse.c	Sat Aug 28 04:02:03 1999
+++ hexdump/parse.c	Thu Sep 20 17:01:09 2001
@@ -413,7 +413,7 @@
 	 * 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 != NULL; fu = fu->nextfu) {
 		if (!fu->nextfu && fs->bcnt < blocksize &&
 		    !(fu->flags&F_SETREP) && fu->bcnt)
 			fu->reps += (blocksize - fs->bcnt) / fu->bcnt;
@@ -426,8 +426,6 @@
 			if (p2)
 				pr->nospace = p2;
 		}
-		if (!fu->nextfu)
-			break;
 	}
 #ifdef DEBUG
 	for (fu = fs->nextfu; fu; fu = fu->nextfu) {

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message
Comment 1 simon 2001-09-20 15:30:03 UTC 
hexdump(8) expects that an argument for -e option is always surrounded by
double quote (" ") marks. And following calls generate core-dumps:

$ hexdump -e "" some-file
$ hexdump -e "\"%c\"" -e " " some-file

hexdump(8) shouldn't generate core-dumps in reaction on -e "" option,
instead it should skip this format string as empty.

Following patch fixes described above problem with hexdump(8).

How-To-Repeat: 
$ hexdump -e "" /COPYRIGHT
$ hexdump -e "\"%c\"" -e " " /COPYRIGHT

I checked original hexdump and patched hexdump with different format
strings in -e option, and didn't find any differences in outputs.
Comment 2 Crist J. Clark freebsd_committer freebsd_triage 2001-09-20 20:28:57 UTC 
State Changed
From-To: open->analyzed

Patch looks good. Doing some checks and will commit if it works out.
Comment 3 Crist J. Clark freebsd_committer freebsd_triage 2001-09-20 20:28:57 UTC 
Responsible Changed
From-To: freebsd-bugs->cjc

Made the changes in my local repo and doing tests before commit.
Comment 4 Johan Karlsson freebsd_committer freebsd_triage 2004-07-16 09:57:57 UTC 
State Changed
From-To: analyzed->closed

This was fixed in rev 1.10 and MFCed in rev 1.4.2.1 of parse.c. 

Crist, I hope you do not mind me closing this :-)