about summary refs log tree commit diff
path: root/iconv/iconv_charmap.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-04-07 08:17:33 +0000
committerUlrich Drepper <drepper@redhat.com>2006-04-07 08:17:33 +0000
commit053f7b2b47eeab73512697323068034c539914b5 (patch)
treee47cd9ab00896077e10a79dea8acb5d93b6cdf67 /iconv/iconv_charmap.c
parent616d91335a8be5fda715a34dac48bb067d77b523 (diff)
downloadglibc-053f7b2b47eeab73512697323068034c539914b5.tar.gz
glibc-053f7b2b47eeab73512697323068034c539914b5.tar.xz
glibc-053f7b2b47eeab73512697323068034c539914b5.zip
* inet/rexec.c (rexec_af): If we have no canonical name don't
	proceed further [Coverity CID 86].

	* iconv/iconv_charmap.c (process_fd): Initialize inptr from inbuf,
	not to NULL [Coverity CID 88].
Diffstat (limited to 'iconv/iconv_charmap.c')
-rw-r--r--iconv/iconv_charmap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/iconv/iconv_charmap.c b/iconv/iconv_charmap.c
index b83081efca..328121edbe 100644
--- a/iconv/iconv_charmap.c
+++ b/iconv/iconv_charmap.c
@@ -1,5 +1,5 @@
 /* Convert using charmaps and possibly iconv().
-   Copyright (C) 2001, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2001.
 
@@ -488,7 +488,7 @@ process_fd (struct convtable *tbl, int fd, FILE *output)
      process it in one step.  */
   static char *inbuf = NULL;
   static size_t maxlen = 0;
-  char *inptr = NULL;
+  char *inptr = inbuf;
   size_t actlen = 0;
 
   while (actlen < maxlen)