diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-02-13 12:46:41 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-02-13 12:46:41 +0000 |
| commit | cf607e7adae64e868ad748f0bf9f44ff02495aec (patch) | |
| tree | 38054df221ef3a2149d936258b72222e60d7d302 /usr/src/common/ctf/ctf_create.c | |
| parent | 7d8f5232eba76666c623d07e4ae4401c00f43570 (diff) | |
| parent | c78b1a4529122c8f26c5b25b88f01dc4800751a0 (diff) | |
| download | illumos-joyent-cf607e7adae64e868ad748f0bf9f44ff02495aec.tar.gz | |
[illumos-gate merge]
commit cbc8e155c29643fa0d62159c2d3dee078ed6cc91
10355 uts: new-font project. Use terminus Unicode fonts for console.
commit c9aaca5d3825256aa6c09cc34e4ce5640630341b
10403 consfonts: update to terminus-font-4.47
commit 2d106d6b0c1dcb62c2b9842419c54acabdc3ca0f
10401 loader: biosvbe_get_mode is using wrong mask with ebx register
commit d1c9087b969ca22e13154e77ea4147ad672bc63b
10136 smatch fix for policykit
commit 2756274fa95226a2638604ba310268a09e4f4744
10143 smatch fix for ttymon
commit e83359656fe4880d77df4da075573820c2a7adc0
10393 ctf: NULL pointer errors
commit b83d2fbf46ff51c4409d2bf8ed4c483ef21f456f
10394 SPARC qemu panic in the fd module
Diffstat (limited to 'usr/src/common/ctf/ctf_create.c')
| -rw-r--r-- | usr/src/common/ctf/ctf_create.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/common/ctf/ctf_create.c b/usr/src/common/ctf/ctf_create.c index c0a4b15055..355165eb12 100644 --- a/usr/src/common/ctf/ctf_create.c +++ b/usr/src/common/ctf/ctf_create.c @@ -1986,7 +1986,7 @@ ctf_add_function(ctf_file_t *fp, ulong_t idx, const ctf_funcinfo_t *fip, if (ctf_dsd_lookup(fp, idx) != NULL) return (ctf_set_errno(fp, ECTF_CONFLICT)); - if (symbase == NULL) + if (symbase == (uintptr_t)NULL) return (ctf_set_errno(fp, ECTF_STRTAB)); if (idx > fp->ctf_nsyms) @@ -2053,7 +2053,7 @@ ctf_add_object(ctf_file_t *fp, ulong_t idx, ctf_id_t type) if (ctf_dsd_lookup(fp, idx) != NULL) return (ctf_set_errno(fp, ECTF_CONFLICT)); - if (symbase == NULL) + if (symbase == (uintptr_t)NULL) return (ctf_set_errno(fp, ECTF_STRTAB)); if (idx > fp->ctf_nsyms) |