emo/sysklogd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Applied Openwall paranoia patches to improve crunch_list().

Browse Source
This commit is contained in:
Joey Schulze 2004-04-29 10:39:55 +00:00
parent d7a30653a9
commit 669d9991b7
1 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
syslogd.c
View File

@ -450,6 +450,9 @@ static char sccsid[] = "@(#)syslogd.c 5.27 (Berkeley) 10/10/88";
* Sat Apr 17 18:03:05 2004: Steve Grubb <linux_4ever@yahoo.com> * Sat Apr 17 18:03:05 2004: Steve Grubb <linux_4ever@yahoo.com>
* Correct memory allocation for for commandline arguments in * Correct memory allocation for for commandline arguments in
* crunch_list(). * crunch_list().
*
* Thu Apr 29 12:38:39 2004: Solar Designer <solar@openwall.com>
* Applied Openwall paranoia patches to improve crunch_list().
*/ */
@ -1263,30 +1266,26 @@ char **
crunch_list(list) crunch_list(list)
char *list; char *list;
{ {
int count, i; int i, m, n;
char *p, *q; char *p, *q;
char **result = NULL; char **result = NULL;
p = list; p = list;
/* strip off trailing delimiters */ /* strip off trailing delimiters */
while (p[strlen(p)-1] == LIST_DELIMITER) { while (*p && p[strlen(p)-1] == LIST_DELIMITER)
count--;
p[strlen(p)-1] = '\0'; p[strlen(p)-1] = '\0';
}
/* cut off leading delimiters */ /* cut off leading delimiters */
while (p[0] == LIST_DELIMITER) { while (p[0] == LIST_DELIMITER)
count--;
p++; p++;
}
/* count delimiters to calculate elements */ /* count delimiters to calculate the number of elements */
for (count=i=0; p[i]; i++) for (n = i = 0; p[i]; i++)
if (p[i] == LIST_DELIMITER) count++; if (p[i] == LIST_DELIMITER) n++;
if ((result = (char **)malloc(sizeof(char *) * (count+2))) == NULL) { if ((result = (char **)malloc(sizeof(char *) * (n + 2))) == NULL) {
printf ("Sorry, can't get enough memory, exiting.\n"); printf ("Sorry, can't get enough memory, exiting.\n");
exit(0); exit(1);
} }
/* /*
@ -1294,30 +1293,28 @@ crunch_list(list)
* characters are different from any delimiters, * characters are different from any delimiters,
* so we don't have to care about this. * so we don't have to care about this.
*/ */
count = 0; m = 0;
while ((q=strchr(p, LIST_DELIMITER))) { while ((q = strchr(p, LIST_DELIMITER)) && m < n) {
result[count] = (char *) malloc((q - p + 1) * sizeof(char)); result[m] = (char *) malloc((q - p + 1) * sizeof(char));
if (result[count] == NULL) { if (result[m] == NULL) {
printf ("Sorry, can't get enough memory, exiting.\n"); printf ("Sorry, can't get enough memory, exiting.\n");
exit(0); exit(1);
} }
strncpy(result[count], p, q - p); memcpy(result[m], p, q - p);
result[count][q - p] = '\0'; result[m][q - p] = '\0';
p = q; p++; p = q; p++;
count++; m++;
} }
if ((result[count] = \ if ((result[m] = strdup(p)) == NULL) {
(char *)malloc(sizeof(char) * strlen(p) + 1)) == NULL) {
printf ("Sorry, can't get enough memory, exiting.\n"); printf ("Sorry, can't get enough memory, exiting.\n");
exit(0); exit(1);
} }
strcpy(result[count],p); result[++m] = NULL;
result[++count] = NULL;
#if 0 #if 0
count=0; m = 0;
while (result[count]) while (result[m])
dprintf ("#%d: %s\n", count, StripDomains[count++]); dprintf ("#%d: %s\n", m, result[m++]);
#endif #endif
return result; return result;
} }