d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

5589 improper use of NULL in tools/ctf

Browse Source 
Reviewed by: David Höppner <0xffea@gmail.com>
Reviewed by: Josef "Jeff" Sipek <jeffpc@josefsipek.net>
Approved by: Dan McDonald <danmcd@omniti.com>
Author: Richard PALO <richard@NetBSD.org>

illumos/illumos-gate@ad0b1ea5d6
This commit is contained in:
Mark Johnston 2015-03-09 20:43:14 +00:00
parent 360534a625
commit 168b1a758b
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/ctf/cvt/ctf.c
View File

@ -1216,7 +1216,7 @@ decompress_ctf(caddr_t cbuf, size_t cbufsz, caddr_t dbuf, size_t dbufsz)
(rc = inflate(&zstr, Z_NO_FLUSH)) != Z_STREAM_END || (rc = inflate(&zstr, Z_NO_FLUSH)) != Z_STREAM_END ||
(rc = inflateEnd(&zstr)) != Z_OK) { (rc = inflateEnd(&zstr)) != Z_OK) {
warning("CTF decompress zlib error %s\n", zError(rc)); warning("CTF decompress zlib error %s\n", zError(rc));
return (NULL); return (0);
} }
debug(3, "reflated %lu bytes to %lu, pointer at %d\n", debug(3, "reflated %lu bytes to %lu, pointer at %d\n",

2
tools/ctf/cvt/dwarf.c
View File

@ -1714,7 +1714,7 @@ static const die_creator_t die_creators[] = {
{ DW_TAG_variable, DW_F_NOTDP, die_variable_create }, { DW_TAG_variable, DW_F_NOTDP, die_variable_create },
{ DW_TAG_volatile_type, 0, die_volatile_create }, { DW_TAG_volatile_type, 0, die_volatile_create },
{ DW_TAG_restrict_type, 0, die_restrict_create }, { DW_TAG_restrict_type, 0, die_restrict_create },
{ 0, NULL } { 0, 0, NULL }
}; };
static const die_creator_t * static const die_creator_t *

8
tools/ctf/cvt/output.c
View File

@ -23,8 +23,6 @@
* Use is subject to license terms. * Use is subject to license terms.
*/ */
#pragma ident "%Z%%M% %I% %E% SMI"
/* /*
* Routines for preparing tdata trees for conversion into CTF data, and * Routines for preparing tdata trees for conversion into CTF data, and
* for placing the resulting data into an output file. * for placing the resulting data into an output file.
@ -466,7 +464,7 @@ write_file(Elf *src, const char *srcname, Elf *dst, const char *dstname,
int pad; int pad;
int i; int i;
if (gelf_newehdr(dst, gelf_getclass(src)) == NULL) if (gelf_newehdr(dst, gelf_getclass(src)) == 0)
elfterminate(dstname, "Cannot copy ehdr to temp file"); elfterminate(dstname, "Cannot copy ehdr to temp file");
gelf_getehdr(src, &sehdr); gelf_getehdr(src, &sehdr);
memcpy(&dehdr, &sehdr, sizeof (GElf_Ehdr)); memcpy(&dehdr, &sehdr, sizeof (GElf_Ehdr));
@ -482,7 +480,7 @@ write_file(Elf *src, const char *srcname, Elf *dst, const char *dstname,
*/ */
if (sehdr.e_phnum != 0) { if (sehdr.e_phnum != 0) {
(void) elf_flagelf(dst, ELF_C_SET, ELF_F_LAYOUT); (void) elf_flagelf(dst, ELF_C_SET, ELF_F_LAYOUT);
if (gelf_newphdr(dst, sehdr.e_phnum) == NULL) if (gelf_newphdr(dst, sehdr.e_phnum) == 0)
elfterminate(dstname, "Cannot make phdrs in temp file"); elfterminate(dstname, "Cannot make phdrs in temp file");
for (i = 0; i < sehdr.e_phnum; i++) { for (i = 0; i < sehdr.e_phnum; i++) {
@ -616,7 +614,7 @@ write_file(Elf *src, const char *srcname, Elf *dst, const char *dstname,
} }
} }
if (gelf_update_shdr(dscn, &shdr) == NULL) if (gelf_update_shdr(dscn, &shdr) == 0)
elfterminate(dstname, "Cannot update sect %s", sname); elfterminate(dstname, "Cannot update sect %s", sname);
new_offset = (off_t)shdr.sh_offset; new_offset = (off_t)shdr.sh_offset;