jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 05:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Windows: replace strdup with xdr_alloc in callback processing

Browse Source 
The CRT allocator cannot be used for memory that will be freed
by afsrpc.dll.  Use xdr_alloc() instead.

Reviewed-on: http://gerrit.openafs.org/6439
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
(cherry picked from commit 19f1e0f7cf40c3da1d49c789358bd814f7e3b3eb)

Change-Id: Ie2359b4df312d090f0579ecd6d50ee197b51d68a
Reviewed-on: http://gerrit.openafs.org/6820
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>
This commit is contained in:
Jeffrey Altman 2011-12-28 17:07:01 -05:00 committed by Jeffrey Altman
parent 97e5b174b3
commit e942f4cfa0
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/WINNT/afsd/cm_callback.c
View File

@ -1136,15 +1136,21 @@ GetCellCommon(afs_int32 a_cellnum, char **a_name, serverList *a_hosts)
afs_int32 sn;
cm_cell_t * cellp;
cm_serverRef_t * serverRefp;
size_t len;
cellp = cm_FindCellByID(a_cellnum, CM_FLAG_NOPROBE);
if (!cellp) {
*a_name = strdup("");
*a_name = (char *)xdr_alloc(sizeof(char));
if (*a_name)
*a_name = '\0';
return 0;
}
lock_ObtainRead(&cm_serverLock);
*a_name = strdup(cellp->name);
len = strlen(cellp->name)+1;
*a_name = (char *)xdr_alloc(len);
if (*a_name)
memcpy(*a_name, cellp->name, len);
for ( sn = 0, serverRefp = cellp->vlServersp;
sn < AFSMAXCELLHOSTS && serverRefp;
@ -1387,6 +1393,7 @@ int SRXAFSCB_GetLocalCell(struct rx_call *callp, char **a_name)
struct rx_peer *peerp;
unsigned long host = 0;
unsigned short port = 0;
size_t len;
if (cm_shutdown)
return 1;
@ -1400,7 +1407,10 @@ int SRXAFSCB_GetLocalCell(struct rx_call *callp, char **a_name)
ntohl(host), ntohs(port));
if (cm_data.rootCellp) {
t_name = strdup(cm_data.rootCellp->name);
len = strlen(cm_data.rootCellp->name) + 1;
t_name = (char *)xdr_alloc(len);
if (t_name)
memcpy(t_name, cm_data.rootCellp->name, len);
} else {
t_name = (char *)xdr_alloc(1);
t_name[0] = '\0';