mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-28 13:51:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Late allocate memory for path pointers

Browse source
This commit is contained in:
Arun Prakash Jana 2020-02-02 19:10:35 +05:30
parent 6faab79ba9
commit 1614ce172b
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/nnn.c
View file

@ -157,6 +157,7 @@
#define DOT_FILTER_LEN 7 #define DOT_FILTER_LEN 7
#define ASCII_MAX 128 #define ASCII_MAX 128
#define EXEC_ARGS_MAX 8 #define EXEC_ARGS_MAX 8
#define LIST_FILES_MAX (1 << 16)
#define SCROLLOFF 3 #define SCROLLOFF 3
#define MIN_DISPLAY_COLS 10 #define MIN_DISPLAY_COLS 10
#define LONG_SIZE sizeof(ulong) #define LONG_SIZE sizeof(ulong)
@ -6134,8 +6135,8 @@ static char *load_input()
ssize_t i, chunk_count = 1, chunk = 512 * 1024, entries = 0; ssize_t i, chunk_count = 1, chunk = 512 * 1024, entries = 0;
char *input = malloc(sizeof(char) * chunk), *tmpdir = NULL; char *input = malloc(sizeof(char) * chunk), *tmpdir = NULL;
char cwd[PATH_MAX], *next, *tmp; char cwd[PATH_MAX], *next, *tmp;
size_t offsets[1 << 16]; size_t offsets[LIST_FILES_MAX];
char *paths[1 << 16]; char **paths = NULL;
ssize_t input_read, total_read = 0, off = 0; ssize_t input_read, total_read = 0, off = 0;
if (!input) { if (!input) {
@ -6168,7 +6169,7 @@ static char *load_input()
continue; continue;
} }
if (entries == (1 << 16)) if (entries == LIST_FILES_MAX)
goto malloc_1; goto malloc_1;
offsets[entries++] = off; offsets[entries++] = off;
@ -6186,7 +6187,7 @@ static char *load_input()
} }
if (off != total_read) { if (off != total_read) {
if (entries == (1 << 16)) if (entries == LIST_FILES_MAX)
goto malloc_1; goto malloc_1;
offsets[entries++] = off; offsets[entries++] = off;
@ -6197,6 +6198,10 @@ static char *load_input()
input[total_read] = '\0'; input[total_read] = '\0';
paths = malloc(entries * sizeof(char *));
if (!paths)
goto malloc_1;
for (i = 0; i < entries; ++i) for (i = 0; i < entries; ++i)
paths[i] = input + offsets[i]; paths[i] = input + offsets[i];
@ -6225,7 +6230,7 @@ static char *load_input()
if (entries == 1) { if (entries == 1) {
tmp = xmemrchr((uchar *)g_prefixpath, '/', strlen(g_prefixpath)); tmp = xmemrchr((uchar *)g_prefixpath, '/', strlen(g_prefixpath));
if (!tmp) if (!tmp)
return NULL; goto malloc_2;
*(tmp != g_prefixpath ? tmp : tmp + 1) = '\0'; *(tmp != g_prefixpath ? tmp : tmp + 1) = '\0';
} }
@ -6237,6 +6242,7 @@ malloc_2:
free(paths[i]); free(paths[i]);
malloc_1: malloc_1:
free(input); free(input);
free(paths);
return tmpdir; return tmpdir;
} }