github-repos/rinetd
1
0
Fork 0
mirror of https://github.com/samhocevar/rinetd.git synced 2025-04-26 04:50:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of safeRealloc().

Browse Source 
This function was only used in one place, had a memory leak, and is not
type-safe. It’s better to avoid it altogether.
This commit is contained in:
Sam Hocevar 2016-01-12 11:44:32 +01:00
parent 401a67b569
commit e69b28d9a0
1 changed files with 7 additions and 21 deletions

28
rinetd.c
View File

@ -147,13 +147,6 @@ char *pidLogFileName = 0;
int logFormatCommon = 0;
FILE *logFile = 0;
/* If 'newsize' bytes can be allocated, *data is set to point
to them, the previous data is copied, and 1 is returned.
If 'size' bytes cannot be allocated, *data is UNCHANGED,
and 0 is returned. */
static int safeRealloc(void **data, int oldsize, int newsize);
/*
se: (se)rver sockets
re: (re)mote sockets
@ -975,11 +968,15 @@ void handleAccept(int i)
if (cnx == NULL) {
o = coTotal;
coTotal *= 2;
if (!safeRealloc((void **)&coInfo, sizeof(ConnectionInfo) * o,
sizeof(ConnectionInfo) * coTotal))
{
ConnectionInfo *newCoInfo = malloc(sizeof(ConnectionInfo) * coTotal);
if (!newCoInfo) {
goto shortage;
}
memcpy(newCoInfo, coInfo, sizeof(ConnectionInfo) * o);
free(coInfo);
coInfo = newCoInfo;
for (int j = o; j < coTotal; ++j) {
memset(&coInfo[j], 0, sizeof(coInfo[j]));
coInfo[j].coClosed = 1;
@ -1224,17 +1221,6 @@ RETSIGTYPE hup(int s)
}
#endif /* WIN32 */
static int safeRealloc(void **data, int oldsize, int newsize)
{
void *newData = malloc(newsize + 1);
if (!newData) {
return 0;
}
memcpy(newData, *data, newsize < oldsize ? newsize : oldsize);
*data = newData;
return 1;
}
void RegisterPID(void)
{
FILE *pid_file;