summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--iconv/iconv_prog.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 56f5e45ddd..48ca52e8a7 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 a1ca05f153..3bcb9b464e 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