d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a SIGSEGV when emitting XML or JSON when reading stdin. In that

Browse Source 
case the file variable is NULL.
This commit is contained in:
Marcel Moolenaar 2014-11-07 01:36:20 +00:00
parent b78618fbda
commit 985c93f0b4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=274210
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/wc/wc.c
View File

@ -164,8 +164,6 @@ show_cnt(const char *file, uintmax_t linect, uintmax_t wordct,
siginfo = 0;
}
xo_emit("{ek:filename/%s}", file);
if (doline)
xo_emit_h(xop, " {:lines/%7ju/%ju}", linect);
if (doword)
@ -175,7 +173,7 @@ show_cnt(const char *file, uintmax_t linect, uintmax_t wordct,
if (dolongline)
xo_emit_h(xop, " {:long-lines/%7ju/%ju}", llct);
if (file != NULL)
xo_emit_h(xop, " {d:filename/%s}\n", file);
xo_emit_h(xop, " {:filename/%s}\n", file);
else
xo_emit_h(xop, "\n");
}