You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by ja...@apache.org on 2015/10/24 07:45:51 UTC
svn commit: r1710309 - in /apr/apr/branches/1.5.x: strings/apr_fnmatch.c
threadproc/win32/proc.c user/win32/groupinfo.c user/win32/userinfo.c
Author: jailletc36
Date: Sat Oct 24 05:45:51 2015
New Revision: 1710309
URL: http://svn.apache.org/viewvc?rev=1710309&view=rev
Log:
Backport r1710307
Modified:
apr/apr/branches/1.5.x/strings/apr_fnmatch.c
apr/apr/branches/1.5.x/threadproc/win32/proc.c
apr/apr/branches/1.5.x/user/win32/groupinfo.c
apr/apr/branches/1.5.x/user/win32/userinfo.c
Modified: apr/apr/branches/1.5.x/strings/apr_fnmatch.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/strings/apr_fnmatch.c?rev=1710309&r1=1710308&r2=1710309&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/strings/apr_fnmatch.c (original)
+++ apr/apr/branches/1.5.x/strings/apr_fnmatch.c Sat Oct 24 05:45:51 2015
@@ -462,7 +462,7 @@ APR_DECLARE(apr_status_t) apr_match_glob
path = ".";
}
else {
- path = apr_pstrndup(p, pattern, idx - pattern);
+ path = apr_pstrmemdup(p, pattern, idx - pattern);
pattern = idx + 1;
}
Modified: apr/apr/branches/1.5.x/threadproc/win32/proc.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/threadproc/win32/proc.c?rev=1710309&r1=1710308&r2=1710309&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/threadproc/win32/proc.c (original)
+++ apr/apr/branches/1.5.x/threadproc/win32/proc.c Sat Oct 24 05:45:51 2015
@@ -486,7 +486,7 @@ APR_DECLARE(apr_status_t) apr_proc_creat
* 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_creat
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_creat
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;
Modified: apr/apr/branches/1.5.x/user/win32/groupinfo.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/user/win32/groupinfo.c?rev=1710309&r1=1710308&r2=1710309&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/user/win32/groupinfo.c (original)
+++ apr/apr/branches/1.5.x/user/win32/groupinfo.c Sat Oct 24 05:45:51 2015
@@ -37,11 +37,11 @@ APR_DECLARE(apr_status_t) apr_gid_get(ap
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 {
Modified: apr/apr/branches/1.5.x/user/win32/userinfo.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/user/win32/userinfo.c?rev=1710309&r1=1710308&r2=1710309&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/user/win32/userinfo.c (original)
+++ apr/apr/branches/1.5.x/user/win32/userinfo.c Sat Oct 24 05:45:51 2015
@@ -212,11 +212,11 @@ APR_DECLARE(apr_status_t) apr_uid_get(ap
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 {