diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2011-05-16 07:08:06 +0100 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2011-05-16 07:08:06 +0100 |
| commit | 875546ac7519c97db0e3ce165c9b9d5147e27c8d (patch) | |
| tree | 3c5d29ef73ca7087e2fba0a79778b06e4ff21b9d /usr/src | |
| parent | a02e811112768aaf0fd2fb84f9a8d8261a295368 (diff) | |
| download | illumos-joyent-875546ac7519c97db0e3ce165c9b9d5147e27c8d.tar.gz | |
1626 libld may accidentally return success while failing
Reviewed by: Cyril Plisko <cyril.plisko@mountall.com>
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Approved by: Garrett D'Amore <garrett@nexenta.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/sgs/libld/common/libld.msg | 1 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/libld/common/libs.c | 19 |
2 files changed, 13 insertions, 7 deletions
diff --git a/usr/src/cmd/sgs/libld/common/libld.msg b/usr/src/cmd/sgs/libld/common/libld.msg index 2c0481503e..16ade95f99 100644 --- a/usr/src/cmd/sgs/libld/common/libld.msg +++ b/usr/src/cmd/sgs/libld/common/libld.msg @@ -436,6 +436,7 @@ @ MSG_SYS_OPEN "file %s: open failed: %s" @ MSG_SYS_UNLINK "file %s: unlink failed: %s" @ MSG_SYS_MMAPANON "mmap anon failed: %s" +@ MSG_SYS_MALLOC "malloc failed: %s" # Messages related to platform support diff --git a/usr/src/cmd/sgs/libld/common/libs.c b/usr/src/cmd/sgs/libld/common/libs.c index 561e04be0e..ebdb686462 100644 --- a/usr/src/cmd/sgs/libld/common/libs.c +++ b/usr/src/cmd/sgs/libld/common/libs.c @@ -31,6 +31,7 @@ */ #include <stdio.h> #include <string.h> +#include <errno.h> #include <ar.h> #include <debug.h> #include "msg.h" @@ -334,18 +335,22 @@ ar_member_name(const char *name, Elf *arelf, Ofl_desc *ofl) * entry: * name - Name of archive * arname - Name of archive member + * ofl - output descriptor * exit: * Returns pointer to constructed pathname on success, NULL on error. */ static const char * -ar_member_path(const char *name, const char *arname) +ar_member_path(const char *name, const char *arname, Ofl_desc *ofl) { size_t len; char *path; len = strlen(name) + strlen(arname) + 3; - if ((path = libld_malloc(len)) == NULL) + if ((path = libld_malloc(len)) == NULL) { + ld_eprintf(ofl, ERR_FATAL, MSG_INTL(MSG_SYS_MALLOC), + strerror(errno)); return (NULL); + } (void) snprintf(path, len, MSG_ORIG(MSG_FMT_ARMEM), name, arname); return (path); } @@ -600,9 +605,9 @@ ar_extract_bysym(const char *name, int fd, Ar_desc *adp, return (FALSE); /* Construct the member's full pathname */ - if ((arpath = ar_member_path(name, arname)) == - NULL) - return (S_ERROR); + if ((arpath = ar_member_path(name, arname, + ofl)) == NULL) + return (FALSE); /* * Determine whether the support libraries wish @@ -768,8 +773,8 @@ ar_extract_all(const char *name, int fd, Ar_desc *adp, Ofl_desc *ofl, next_off = _elf_getnextoff(adp->ad_elf); /* Construct the member's full pathname */ - if ((arpath = ar_member_path(name, arname)) == NULL) - return (S_ERROR); + if ((arpath = ar_member_path(name, arname, ofl)) == NULL) + return (FALSE); /* * Determine whether the support libraries wish to process |