summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavi <davi@13f79535-47bb-0310-9956-ffa450edef68>2007-06-29 23:25:41 +0000
committerdavi <davi@13f79535-47bb-0310-9956-ffa450edef68>2007-06-29 23:25:41 +0000
commitd165f5672665bb9de4e05df23e95f5b6c413737a (patch)
treed80812b66720e578c92e046e16e89420c6724009
parent11c4bf1651e23ebca5b534f45ec42713f1379563 (diff)
downloadlibapr-d165f5672665bb9de4e05df23e95f5b6c413737a.tar.gz
apr_gid_name and apr_uid_name return null on Win98 which causes the test to fail
an ABTS_PTR_NOTNULL assertion, however the test will continue after failing that assertion which will cause a NULL pointer dereference in subsequent apr_gid_get or apr_uid_get call. Submitted by: Curt Arnold PR: 42318 git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@552060 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--test/testuser.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/test/testuser.c b/test/testuser.c
index 2029bea84..e75782e90 100644
--- a/test/testuser.c
+++ b/test/testuser.c
@@ -44,6 +44,9 @@ static void username(abts_case *tc, void *data)
apr_uid_name_get(&uname, uid, p));
ABTS_PTR_NOTNULL(tc, uname);
+ if (uname == NULL)
+ return;
+
APR_ASSERT_SUCCESS(tc, "apr_uid_get failed",
apr_uid_get(&retreived_uid, &retreived_gid, uname, p));
@@ -87,6 +90,9 @@ static void groupname(abts_case *tc, void *data)
apr_gid_name_get(&gname, gid, p));
ABTS_PTR_NOTNULL(tc, gname);
+ if (gname == NULL)
+ return;
+
APR_ASSERT_SUCCESS(tc, "apr_gid_get failed",
apr_gid_get(&retreived_gid, gname, p));