fix apr_get_userdata(): return NULL if the userdata hash table isn't there

git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60902 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 2 deletions

diff --git a/misc/unix/start.c b/misc/unix/start.c
index e9eedb3d8..d589d2777 100644
--- a/misc/unix/start.c
+++ b/misc/unix/start.c
@@ -91,7 +91,7 @@ apr_status_t apr_set_userdata(const void *data, const char *key,
 {
     int keylen = strlen(key);
 
-    if (!cont->prog_data)
+    if (cont->prog_data == NULL)
         cont->prog_data = apr_make_hash(cont);
 
     if (apr_hash_get(cont->prog_data, key, keylen) == NULL){
@@ -108,7 +108,10 @@ apr_status_t apr_set_userdata(const void *data, const char *key,
 
 apr_status_t apr_get_userdata(void **data, const char *key, apr_pool_t *cont)
 {
-    (*data) = apr_hash_get(cont->prog_data, key, strlen(key));
+    if (cont->prog_data == NULL)
+        *data = NULL;
+    else
+        *data = apr_hash_get(cont->prog_data, key, strlen(key));
     return APR_SUCCESS;
 }