PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-10 09:49:05 +00:00
Code Issues Projects Releases Wiki Activity

Change a little over 10 malloc()s and realloc()s to their safe_* equivalents (which let's us get rid a two checks on the returned mem elsewhere in the code).

Browse Source
This commit is contained in:
kris
2007-02-25 15:43:56 +00:00
parent 031e8907eb
commit f221d54908
6 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
utils.cc
View File

@@ -312,8 +312,8 @@ else if (num_elem < 65536)
bpe = sizeof(unsigned short);
else bpe = sizeof(unsigned int);
bytes = (unsigned char *) malloc(bpe * num_elem);
tmp = (unsigned char *) malloc(elem_sz);
bytes = (unsigned char *) safe_malloc(bpe * num_elem);
tmp = (unsigned char *) safe_malloc(elem_sz);
get_random_bytes(bytes, bpe * num_elem);
cptr = bytes;
@@ -406,7 +406,7 @@ int arg_parse(const char *command, char ***argv) {
if (Strncpy(mycommand, command, 4096) == -1) {
return -1;
}
myargv = (char **) malloc((MAX_PARSE_ARGS + 2) * sizeof(char *));
myargv = (char **) safe_malloc((MAX_PARSE_ARGS + 2) * sizeof(char *));
memset(myargv, 0, (MAX_PARSE_ARGS+2) * sizeof(char *));
myargv[0] = (char *) 0x123456; /* Integrity checker */
myargv++;