From 15cc7dd182a6be79cbb01a5de4f13e958717bd69 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 16 May 2011 09:10:36 -0400 Subject: Fix test for error_one_per_line mode in error --- misc/error.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'misc/error.c') diff --git a/misc/error.c b/misc/error.c index 85d1cffbf9..9a73a61c74 100644 --- a/misc/error.c +++ b/misc/error.c @@ -1,5 +1,5 @@ /* Error handler for noninteractive utilities - Copyright (C) 1990-1998, 2000-2005, 2006 Free Software Foundation, Inc. + Copyright (C) 1990-1998, 2000-2006, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -272,7 +272,9 @@ error_at_line (int status, int errnum, const char *file_name, if (old_line_number == line_number && (file_name == old_file_name - || strcmp (old_file_name, file_name) == 0)) + || (old_file_name != NULL + && file_name != NULL + && strcmp (old_file_name, file_name) == 0))) /* Simply return and print nothing. */ return; -- cgit v1.2.3-70-g09d2