about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2010-01-25 07:17:47 -0800
committerUlrich Drepper <drepper@redhat.com>2010-01-25 07:17:47 -0800
commit7a518360023592882a7335b843ce1a5ea322dec5 (patch)
tree58db2a563d8851b05b890504f9478f7b370da2b2
parent8549abcb9ca4d7857cc457aaa17c2073522804f4 (diff)
downloadglibc-7a518360023592882a7335b843ce1a5ea322dec5.tar.gz
glibc-7a518360023592882a7335b843ce1a5ea322dec5.tar.xz
glibc-7a518360023592882a7335b843ce1a5ea322dec5.zip
Fix error checking in iconv.
-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