diff options
| author | jailletc36 <jailletc36@13f79535-47bb-0310-9956-ffa450edef68> | 2015-10-24 05:45:35 +0000 |
|---|---|---|
| committer | jailletc36 <jailletc36@13f79535-47bb-0310-9956-ffa450edef68> | 2015-10-24 05:45:35 +0000 |
| commit | 6e13a47d3464b4d94b15ecb91a82e695e0135ef5 (patch) | |
| tree | 5da87d498addab381e9166fa9001c1c64a5b801a | |
| parent | d9d91fe33592acfea378566ec0be0a19f979f489 (diff) | |
| download | libapr-6e13a47d3464b4d94b15ecb91a82e695e0135ef5.tar.gz | |
Backport r1710307
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1710308 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | strings/apr_fnmatch.c | 2 | ||||
| -rw-r--r-- | threadproc/win32/proc.c | 6 | ||||
| -rw-r--r-- | user/win32/groupinfo.c | 4 | ||||
| -rw-r--r-- | user/win32/userinfo.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/strings/apr_fnmatch.c b/strings/apr_fnmatch.c index c1c0e4af5..7dfa84699 100644 --- a/strings/apr_fnmatch.c +++ b/strings/apr_fnmatch.c @@ -462,7 +462,7 @@ APR_DECLARE(apr_status_t) apr_match_glob(const char *pattern, path = "."; } else { - path = apr_pstrndup(p, pattern, idx - pattern); + path = apr_pstrmemdup(p, pattern, idx - pattern); pattern = idx + 1; } diff --git a/threadproc/win32/proc.c b/threadproc/win32/proc.c index c9fa4dd92..b4dfd5f85 100644 --- a/threadproc/win32/proc.c +++ b/threadproc/win32/proc.c @@ -486,7 +486,7 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new, * XXX progname must be NULL if this is a 16 bit app running in WOW */ if (progname[0] == '\"') { - progname = apr_pstrndup(pool, progname + 1, strlen(progname) - 2); + progname = apr_pstrmemdup(pool, progname + 1, strlen(progname) - 2); } if (attr->cmdtype == APR_PROGRAM || attr->cmdtype == APR_PROGRAM_ENV) { @@ -546,7 +546,7 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new, return APR_EINVAL; } if (shellcmd[0] == '"') { - progname = apr_pstrndup(pool, shellcmd + 1, strlen(shellcmd) - 2); + progname = apr_pstrmemdup(pool, shellcmd + 1, strlen(shellcmd) - 2); } else { progname = shellcmd; @@ -588,7 +588,7 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new, return APR_EINVAL; } if (shellcmd[0] == '"') { - progname = apr_pstrndup(pool, shellcmd + 1, strlen(shellcmd) - 2); + progname = apr_pstrmemdup(pool, shellcmd + 1, strlen(shellcmd) - 2); } else { progname = shellcmd; diff --git a/user/win32/groupinfo.c b/user/win32/groupinfo.c index 585642f07..b53656962 100644 --- a/user/win32/groupinfo.c +++ b/user/win32/groupinfo.c @@ -37,11 +37,11 @@ APR_DECLARE(apr_status_t) apr_gid_get(apr_gid_t *gid, char *pos; if ((pos = strchr(groupname, '/'))) { - domain = apr_pstrndup(p, groupname, pos - groupname); + domain = apr_pstrmemdup(p, groupname, pos - groupname); groupname = pos + 1; } else if ((pos = strchr(groupname, '\\'))) { - domain = apr_pstrndup(p, groupname, pos - groupname); + domain = apr_pstrmemdup(p, groupname, pos - groupname); groupname = pos + 1; } else { diff --git a/user/win32/userinfo.c b/user/win32/userinfo.c index 12931ade6..c6b5084a5 100644 --- a/user/win32/userinfo.c +++ b/user/win32/userinfo.c @@ -212,11 +212,11 @@ APR_DECLARE(apr_status_t) apr_uid_get(apr_uid_t *uid, apr_gid_t *gid, char *pos; if ((pos = strchr(username, '/'))) { - domain = apr_pstrndup(p, username, pos - username); + domain = apr_pstrmemdup(p, username, pos - username); username = pos + 1; } else if ((pos = strchr(username, '\\'))) { - domain = apr_pstrndup(p, username, pos - username); + domain = apr_pstrmemdup(p, username, pos - username); username = pos + 1; } else { |