mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
e7c8359e43
was allocated here. [Coverity CID 219] * posix/getconf.c (print_all): Free confstr data after printing. [Coverity CID 218] * sysdeps/posix/getaddrinfo.c (gaih_inet): Free canon string if list allocation fails. [Coverity CID 215] * nss/nsswitch.c (__nss_configure_lookup): Fix loop end condition. [Coverity CID 213] * argp/argp-help.c (hol_entry_cmp): Don't call canon_doc_option if string is NULL. [Coverity CID 212] * argp/Makefile: Add rules to build and run bug-argp1. * argp/bug-argp1.c: New file. * io/ftw.c (ftw_dir): Use __rawmemchr instead of strchr to find end of string. * stdlib/canonicalize.c (__realpath): Likewise. * locale/programs/ld-time.c (time_finish): Don't dereference NULL pointer. [Coverity CID 206] * elf/dl-dst.h (DL_DST_REQUIRED): Be prepared for missing link map in statically linked code. * elf/dl-load.c (_dl_dst_substitute): When replacing ORIGIN in statically built code, be prepared to have no link map. [Coverity CID 205] * argp/argp-help.c (fill_in_uparams): Handle STATE==NULL in dgettext calls. [Coverity CID 204] * argp/argp-help.c (struct uparams): Remove valid member. Change the one user. (uparam_names): Reduce size. Avoid relative relocations. Moved to read-only segment. (fill_in_uparams): Update for new layout. * sysdeps/unix/sysv/linux/ifaddrs.c (getifaddrs): Parameter can be assumed to always be != NULL. [Coverity CID 202] * argp/argp-help.c (hol_entry_help): Remove some dead code [Coverity CID 200]. * nis/nss_nis/nis-service.c (_nss_nis_getservbyport_r): Optimize away a few more unconditional yperr2nss calls. (_nss_nis_getservbyname_r): Likewise.
86 lines
3.2 KiB
C
86 lines
3.2 KiB
C
/* Handling of dynamic sring tokens.
|
|
Copyright (C) 1999,2001,2002,2003,2004,2006 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
/* Determine the number of DST elements in the name. Only if IS_PATH is
|
|
nonzero paths are recognized (i.e., multiple, ':' separated filenames). */
|
|
#define DL_DST_COUNT(name, is_path) \
|
|
({ \
|
|
size_t __cnt = 0; \
|
|
const char *__sf = strchr (name, '$'); \
|
|
\
|
|
if (__builtin_expect (__sf != NULL, 0)) \
|
|
__cnt = _dl_dst_count (__sf, is_path); \
|
|
\
|
|
__cnt; })
|
|
#ifndef IS_IN_rtld
|
|
# define _dl_dst_count GLRO(dl_dst_count)
|
|
#endif
|
|
|
|
|
|
/* Guess from the number of DSTs the length of the result string. */
|
|
#define DL_DST_REQUIRED(l, name, len, cnt) \
|
|
({ \
|
|
size_t __len = (len); \
|
|
size_t __cnt = (cnt); \
|
|
\
|
|
if (__cnt > 0) \
|
|
{ \
|
|
size_t origin_len; \
|
|
/* Now we make a guess how many extra characters on top of the \
|
|
length of S we need to represent the result. We know that \
|
|
we have CNT replacements. Each at most can use \
|
|
MAX (strlen (ORIGIN), strlen (_dl_platform)) \
|
|
minus 7 (which is the length of "$ORIGIN"). \
|
|
\
|
|
First get the origin string if it is not available yet. \
|
|
This can only happen for the map of the executable. */ \
|
|
DL_DST_REQ_STATIC \
|
|
if ((l)->l_origin == NULL) \
|
|
{ \
|
|
assert ((l)->l_name[0] == '\0'); \
|
|
(l)->l_origin = _dl_get_origin (); \
|
|
origin_len = ((l)->l_origin && (l)->l_origin != (char *) -1 \
|
|
? strlen ((l)->l_origin) : 0); \
|
|
} \
|
|
else \
|
|
origin_len = (l)->l_origin == (char *) -1 \
|
|
? 0 : strlen ((l)->l_origin); \
|
|
\
|
|
__len += __cnt * (MAX (origin_len, GLRO(dl_platformlen)) - 7); \
|
|
} \
|
|
\
|
|
__len; })
|
|
|
|
#ifdef SHARED
|
|
# define DL_DST_REQ_STATIC /* nothing */
|
|
#else
|
|
# define DL_DST_REQ_STATIC \
|
|
if ((l) == NULL) \
|
|
{ \
|
|
const char *origin = _dl_get_origin (); \
|
|
origin_len = (origin && origin != (char *) -1 ? strlen (origin) : 0); \
|
|
} \
|
|
else
|
|
#endif
|
|
|
|
#ifndef IS_IN_rtld
|
|
# define _dl_get_origin GLRO(dl_get_origin)
|
|
# define _dl_dst_substitute GLRO(dl_dst_substitute)
|
|
#endif
|