This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.11-173-g7a51836
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 25 Jan 2010 15:18:11 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.11-173-g7a51836
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 7a518360023592882a7335b843ce1a5ea322dec5 (commit)
from 8549abcb9ca4d7857cc457aaa17c2073522804f4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7a518360023592882a7335b843ce1a5ea322dec5
commit 7a518360023592882a7335b843ce1a5ea322dec5
Author: Andreas Schwab <schwab@redhat.com>
Date: Mon Jan 25 07:17:47 2010 -0800
Fix error checking in iconv.
diff --git a/ChangeLog b/ChangeLog
index 56f5e45..48ca52e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-25 Andreas Schwab <schwab@redhat.com>
+
+ * iconv/iconv_prog.c (write_output): Fix check for open failure.
+
2010-01-22 Ulrich Drepper <drepper@redhat.com>
[BZ #11200]
diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index a1ca05f..3bcb9b4 100644
--- a/iconv/iconv_prog.c
+++ b/iconv/iconv_prog.c
@@ -442,7 +442,7 @@ write_output (const char *outbuf, const char *outptr, FILE **output,
if (output_file != NULL && strcmp (output_file, "-") != 0)
{
*output = fopen (output_file, "w");
- if (output == NULL)
+ if (*output == NULL)
error (EXIT_FAILURE, errno, _("cannot open output file"));
}
else
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
iconv/iconv_prog.c | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources