lib/libadminutil/srvutil.c | 3 +++
lib/libadmsslutil/srvutilssl.c | 2 ++
2 files changed, 5 insertions(+)
New commits:
commit 5590b3e0a62f40d723e4a794e4763db73f1cb6f6
Author: Nathan Kinder <nkinder(a)redhat.com>
Date: Fri Apr 15 14:50:55 2011 -0700
Bug 697116 - Need to check if admldapGetISIEDN() returns NULL
cov#10768,10767,10764
There are a number of places where we don't check if the pointer
returned by admldapGetISIEDN() is NULL before dereferencing it.
We should check for NULL and avoid the dereference.
diff --git a/lib/libadminutil/srvutil.c b/lib/libadminutil/srvutil.c
index 1b963e3..c275008 100644
--- a/lib/libadminutil/srvutil.c
+++ b/lib/libadminutil/srvutil.c
@@ -38,6 +38,8 @@ getServerDNList(AdmldapInfo info)
AttrNameList nl;
isie = admldapGetISIEDN(info);
+ if (!isie) goto err;
+
/*
* ISIE sample:
* isie: cn=<NAME> Administration Server, cn=Server Group,
cn=myhost.example.com,
ou=example.com, o=NetscapeRoot
@@ -157,6 +159,7 @@ getInstalledServerDNList(AdmldapInfo info)
int errorCode = 0;
isie = admldapGetISIEDN(info);
+ if (!isie) goto done;
domainDN=strchr(isie, ',');
if (!domainDN) goto done;
diff --git a/lib/libadmsslutil/srvutilssl.c b/lib/libadmsslutil/srvutilssl.c
index 7bb2cfa..c890e89 100644
--- a/lib/libadmsslutil/srvutilssl.c
+++ b/lib/libadmsslutil/srvutilssl.c
@@ -36,6 +36,7 @@ getServerDNListSSL(AdmldapInfo info)
AttrNameList nl;
isie = admldapGetISIEDN(info);
+ if (!isie) goto err;
/*
* ISIE sample:
* isie: cn=<NAME> Administration Server, cn=Server Group,
cn=myhost.example.com,
ou=example.com, o=NetscapeRoot
@@ -109,6 +110,7 @@ getInstalledServerDNListSSL(AdmldapInfo info)
AttributeList resultList;
isie = admldapGetISIEDN(info);
+ if (!isie) goto err;
domainDN=strchr(isie, ',');
if (!domainDN) goto err;