epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

asLib more string size...

Browse Source
This commit is contained in:
Michael Davidsaver
2019-06-05 11:40:50 +02:00
parent a83a85af7c
commit 048975ccc7
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/libcom/src/as/asLib.h
View File

@@ -170,8 +170,8 @@ typedef struct uag{
} UAG;
/*Defs for Host Access Groups*/
typedef struct{
ELLNODE node;
char *host;
ELLNODE node;
char host[1];
} HAGNAME;
typedef struct hag{
ELLNODE node;

6
modules/libcom/src/as/asLibRoutines.c
View File

@@ -1211,8 +1211,7 @@ static long asHagAddHost(HAG *phag,const char *host)
if (!phag) return 0;
if(!asCheckClientIP) {
size_t i, len = strlen(host);
phagname = asCalloc(1, sizeof(HAGNAME) + len + 1);
phagname->host = (char *)(phagname + 1);
phagname = asCalloc(1, sizeof(HAGNAME) + len);
for (i = 0; i < len; i++) {
phagname->host[i] = (char)tolower((int)host[i]);
}
@@ -1226,14 +1225,13 @@ static long asHagAddHost(HAG *phag,const char *host)
errlogPrintf("ACF: Unable to resolve host '%s'\n", host);
phagname = asCalloc(1, sizeof(HAGNAME) + sizeof(unresolved)+strlen(host));
phagname = asCalloc(1, sizeof(HAGNAME) + sizeof(unresolved)-1+strlen(host));
strcpy(phagname->host, unresolved);
strcat(phagname->host, host);
} else {
ip = ntohl(addr.sin_addr.s_addr);
phagname = asCalloc(1, sizeof(HAGNAME) + 24);
phagname->host = (char *)(phagname + 1);
epicsSnprintf(phagname->host, 24,
"%u.%u.%u.%u",
(ip>>24)&0xff,