Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-03-30 17:10:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[LOG2LINES] Replace overkill malloc() usage.

Browse source 
NOTE: Since the 'cache_name' and 'tmp_name' pointers move inside the
corresponding cached strings, separate cache buffers are needed.
This commit is contained in:
Serge Gautherie 2018-08-24 23:39:53 +02:00 committed by Hermès Bélusca-Maïto
parent 5e8e654dfd
commit f5f515c17c
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
2 changed files with 9 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sdk/tools/log2lines/cache.c
View file

@ -18,8 +18,10 @@
#include "log2lines.h" #include "log2lines.h"
static char *cache_name; static char CacheName[PATH_MAX];
static char *tmp_name; static char *cache_name = CacheName;
static char TmpName[PATH_MAX];
static char *tmp_name = TmpName;
static int static int
unpack_iso(char *dir, char *iso) unpack_iso(char *dir, char *iso)
@ -141,8 +143,6 @@ check_directory(int force)
return 1; return 1;
} }
} }
cache_name = malloc(PATH_MAX);
tmp_name = malloc(PATH_MAX);
strcpy(cache_name, opt_dir); strcpy(cache_name, opt_dir);
if (cleanable(opt_dir)) if (cleanable(opt_dir))
strcat(cache_name, ALT_PATH_STR CACHEFILE); strcat(cache_name, ALT_PATH_STR CACHEFILE);
@ -158,22 +158,15 @@ read_cache(void)
{ {
FILE *fr; FILE *fr;
LIST_MEMBER *pentry; LIST_MEMBER *pentry;
char *Line = NULL; char Line[LINESIZE + 1];
int result = 0; int result = 0;
Line = malloc(LINESIZE + 1);
if (!Line)
{
l2l_dbg(1, "Alloc Line failed\n");
return 1;
}
Line[LINESIZE] = '\0'; Line[LINESIZE] = '\0';
fr = fopen(cache_name, "r"); fr = fopen(cache_name, "r");
if (!fr) if (!fr)
{ {
l2l_dbg(1, "Open %s failed\n", cache_name); l2l_dbg(1, "Open %s failed\n", cache_name);
free(Line);
return 2; return 2;
} }
cache.phead = cache.ptail = NULL; cache.phead = cache.ptail = NULL;
@ -190,7 +183,6 @@ read_cache(void)
} }
fclose(fr); fclose(fr);
free(Line);
return result; return result;
} }
@ -198,7 +190,7 @@ int
create_cache(int force, int skipImageBase) create_cache(int force, int skipImageBase)
{ {
FILE *fr, *fw; FILE *fr, *fw;
char *Line = NULL, *Fname = NULL; char Line[LINESIZE + 1], *Fname = NULL;
int len, err; int len, err;
size_t ImageBase; size_t ImageBase;
@ -229,9 +221,6 @@ create_cache(int force, int skipImageBase)
} }
} }
Line = malloc(LINESIZE + 1);
if (!Line)
return 1;
Line[LINESIZE] = '\0'; Line[LINESIZE] = '\0';
remove(tmp_name); remove(tmp_name);
@ -243,7 +232,6 @@ create_cache(int force, int skipImageBase)
l2l_dbg(0, "Cannot list directory %s\n", opt_dir); l2l_dbg(0, "Cannot list directory %s\n", opt_dir);
l2l_dbg(1, "Failed to execute: '%s'\n", Line); l2l_dbg(1, "Failed to execute: '%s'\n", Line);
remove(tmp_name); remove(tmp_name);
free(Line);
return 2; return 2;
} }
l2l_dbg(0, "Creating cache ..."); l2l_dbg(0, "Creating cache ...");
@ -280,7 +268,6 @@ create_cache(int force, int skipImageBase)
fclose(fr); fclose(fr);
} }
remove(tmp_name); remove(tmp_name);
free(Line);
return 0; return 0;
} }

12
sdk/tools/log2lines/log2lines.c
View file

@ -410,9 +410,9 @@ translate_line(FILE *outFile, char *Line, char *path, char *LineOut)
static int static int
translate_files(FILE *inFile, FILE *outFile) translate_files(FILE *inFile, FILE *outFile)
{ {
char *Line = malloc(LINESIZE + 1); char Line[LINESIZE + 1];
char *path = malloc(LINESIZE + 1); char path[LINESIZE + 1];
char *LineOut = malloc(LINESIZE + 1); char LineOut[LINESIZE + 1];
int c; int c;
unsigned char ch; unsigned char ch;
int i = 0; int i = 0;
@ -420,8 +420,6 @@ translate_files(FILE *inFile, FILE *outFile)
const char *p = kdbg_prompt; const char *p = kdbg_prompt;
const char *p_eos = p + sizeof(KDBG_PROMPT) - 1; //end of string pos const char *p_eos = p + sizeof(KDBG_PROMPT) - 1; //end of string pos
if (Line && path && LineOut)
{
memset(Line, '\0', LINESIZE + 1); memset(Line, '\0', LINESIZE + 1);
if (opt_console) if (opt_console)
{ {
@ -536,7 +534,6 @@ translate_files(FILE *inFile, FILE *outFile)
log(outFile, "%s", Line); log(outFile, "%s", Line);
} }
} }
}
if (opt_Revision && (strstr(opt_Revision, "regscan") == opt_Revision)) if (opt_Revision && (strstr(opt_Revision, "regscan") == opt_Revision))
{ {
@ -555,9 +552,6 @@ translate_files(FILE *inFile, FILE *outFile)
if (logFile) if (logFile)
stat_print(logFile, &summ); stat_print(logFile, &summ);
} }
free(LineOut);
free(Line);
free(path);
return 0; return 0;
} }