rev 593166 from trunk:

Fix DSO-related crash on z/OS caused by incorrect memory
allocation.

Submitted by: David Jones <oscaremma gmail.com>
Reviewed by:  trawick


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/0.9.x@593169 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 4 insertions, 1 deletions

diff --git a/CHANGES b/CHANGES
index f97561844..c534aa0d6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR 0.9.17
 
+  *) Fix DSO-related crash on z/OS caused by incorrect memory
+     allocation.  [David Jones <oscaremma gmail.com>]
+
   *) Define apr_ino_t in such a way that it doesn't change definition
      based on the library consumer's -D'efines to the filesystem.
      [Lucian Adrian Grijincu <lucian.grijincu gmail.com>]
diff --git a/dso/os390/dso.c b/dso/os390/dso.c
index 293d0653e..034ffe843 100644
--- a/dso/os390/dso.c
+++ b/dso/os390/dso.c
@@ -63,7 +63,7 @@ APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle,
     dllhandle *handle;
     int rc;
 
-    *res_handle = apr_pcalloc(ctx, sizeof(*res_handle));
+    *res_handle = apr_pcalloc(ctx, sizeof(**res_handle));
     (*res_handle)->pool = ctx;
     if ((handle = dllload(path)) != NULL) {
         (*res_handle)->handle  = handle;