From: Jim Meyering Date: Wed, 2 Mar 2011 17:54:43 +0000 (+0100) Subject: wc: avoid NULL dereference on out-of-memory error X-Git-Tag: v8.11~55 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cfd12c78e0be4c90f29c99ab383163aa1471504;p=thirdparty%2Fcoreutils.git wc: avoid NULL dereference on out-of-memory error * src/wc.c (main): Diagnose failed argv_iter_init_* failure, rather than falling through and dereferencing NULL. Bug introduced by 2008-11-25 commit c2e56e0d, "wc: read and process --files0-from= input a name at a time,". * NEWS (Bug fixes): Mention it. --- diff --git a/NEWS b/NEWS index a367d8d715..9993469fa2 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,9 @@ GNU coreutils NEWS -*- outline -*- delimiter and an unbounded range like "-f1234567890-". [bug introduced in coreutils-5.3.0] + wc would dereference a NULL pointer upon an early out-of-memory error + [bug introduced in coreutils-7.1] + * Noteworthy changes in release 8.10 (2011-02-04) [stable] diff --git a/src/wc.c b/src/wc.c index 3afd4deabd..ccf4ccfbc5 100644 --- a/src/wc.c +++ b/src/wc.c @@ -709,6 +709,9 @@ main (int argc, char **argv) ai = argv_iter_init_argv (files); } + if (!ai) + xalloc_die (); + fstatus = get_input_fstatus (nfiles, files); number_width = compute_number_width (nfiles, fstatus);