philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace an alloca() call with new_malloc() / new_free()

Browse Source 
This also cleans up the code here a bit.
This commit is contained in:
Kevin Easton
2017-02-18 00:00:45 +11:00
parent e5b2a65fe2
commit 5574ff043b
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/lastlog.c
View File

@@ -614,18 +614,24 @@ int logmsg(unsigned long log_type, const char *from, int flag, const char *forma
lines = split_up_line(stripansicodes(convert_output_format(format, "%s %s %s %s", type, timestr, from, msglog_buffer)), 80); lines = split_up_line(stripansicodes(convert_output_format(format, "%s %s %s %s", type, timestr, from, msglog_buffer)), 80);
for ( ; *lines; lines++) for ( ; *lines; lines++)
{ {
char *local_copy; const size_t line_len = strlen(*lines);
int len = strlen(*lines) * 2 + 1; const size_t local_len = line_len * 2 + 1;
if (!*lines || !**lines) break;
local_copy = alloca(len);
strcpy(local_copy, *lines);
if (local_copy[strlen(local_copy)-1] == ALL_OFF) if (line_len > 0)
local_copy[strlen(local_copy)-1] = 0; {
if (logfile_line_mangler) char *local_copy = new_malloc(local_len);
mangle_line(local_copy, logfile_line_mangler, len);
if (*local_copy) strcpy(local_copy, *lines);
fprintf(logptr, "%s\n", local_copy);
if (local_copy[line_len - 1] == ALL_OFF)
local_copy[line_len - 1] = 0;
if (logfile_line_mangler)
mangle_line(local_copy, logfile_line_mangler, local_len);
if (*local_copy)
fprintf(logptr, "%s\n", local_copy);
new_free(&local_copy);
}
} }
fflush(logptr); fflush(logptr);
} }