diff options
| author | DJ Hoffman <dj.hoffman@joyent.com> | 2014-06-13 10:58:34 -0700 |
|---|---|---|
| committer | DJ Hoffman <dj.hoffman@joyent.com> | 2014-06-13 10:58:34 -0700 |
| commit | 9c8327afa8bab87bf0c263b4b462556f2a936089 (patch) | |
| tree | ab70d11fb754a3b8d0aa450d1194a3da758f049c | |
| parent | 3d496fef322b05e3ff9f833ce5599c1181c7f509 (diff) | |
| download | illumos-joyent-9c8327afa8bab87bf0c263b4b462556f2a936089.tar.gz | |
OS-3103 lx_ldb_get_dyns32 doesn't properly handle NULL pointer inputs (back out)
| -rw-r--r-- | usr/src/lib/brand/lx/librtld_db/common/lx_librtld_db.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr/src/lib/brand/lx/librtld_db/common/lx_librtld_db.c b/usr/src/lib/brand/lx/librtld_db/common/lx_librtld_db.c index 49be6a9a03..86163df25e 100644 --- a/usr/src/lib/brand/lx/librtld_db/common/lx_librtld_db.c +++ b/usr/src/lib/brand/lx/librtld_db/common/lx_librtld_db.c @@ -205,10 +205,8 @@ lx_ldb_get_dyns32(rd_helper_data_t rhd, * success and pass back the unmolested dynamic elements that * we've already obtained. */ - if(dynpp != NULL) - *dynpp = dynp; - if(dynpp_sz != NULL) - *dynpp_sz = dynp_sz; + *dynpp = dynp; + *dynpp_sz = dynp_sz; ndyns = dynp_sz / sizeof (Elf32_Dyn); /* If this isn't a dynamic object, there's nothing left todo */ |