aboutsummaryrefslogtreecommitdiff
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
parent616d91335a8be5fda715a34dac48bb067d77b523 (diff)
downloadglibc-053f7b2b47eeab73512697323068034c539914b5.tar
glibc-053f7b2b47eeab73512697323068034c539914b5.tar.gz
glibc-053f7b2b47eeab73512697323068034c539914b5.tar.bz2
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].
-rw-r--r--ChangeLog8
-rw-r--r--iconv/iconv_charmap.c4
-rw-r--r--inet/rexec.c5
3 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4541ce76cf..cf94f00003 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-07 Ulrich Drepper <drepper@redhat.com>
+
+ * 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].
+
2006-04-06 Ulrich Drepper <drepper@redhat.com>
* elf/ldconfig.c (main): Use rawmemchr instead of strchr.
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)
diff --git a/inet/rexec.c b/inet/rexec.c
index 6deb1feb45..07ddeeafea 100644
--- a/inet/rexec.c
+++ b/inet/rexec.c
@@ -87,8 +87,11 @@ rexec_af(ahost, rport, name, pass, cmd, fd2p, af)
return (-1);
}
*ahost = ahostbuf;
- } else
+ } else {
*ahost = NULL;
+ __set_errno (ENOENT);
+ return -1;
+ }
ruserpass(res0->ai_canonname, &name, &pass);
retry:
s = __socket(res0->ai_family, res0->ai_socktype, 0);