mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-07-02 23:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1363 from N-R-K/alloc_check

Browse source 
check for some alloc failures
This commit is contained in:
Arun 2022-05-12 18:05:53 +05:30 committed by GitHub
parent e1e47f909f ba72fca69a
commit a3fbda02d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/nnn.c
View file

@ -1647,8 +1647,13 @@ static void invertselbuf(const int pathlen)
char *found; char *found;
int i, nmarked = 0, prev = 0; int i, nmarked = 0, prev = 0;
struct entry *dentp; struct entry *dentp;
selmark *marked = malloc(nselected * sizeof(selmark));
bool scan = FALSE; bool scan = FALSE;
selmark *marked = malloc(nselected * sizeof(selmark));
if (!marked) {
printwarn(NULL);
return;
}
/* First pass: inversion */ /* First pass: inversion */
for (i = 0; i < ndents; ++i) { for (i = 0; i < ndents; ++i) {
@ -5563,16 +5568,23 @@ static void dirwalk(char *path, int entnum, bool mountpoint)
refresh(); refresh();
} }
static void prep_threads(void) static bool prep_threads(void)
{ {
if (!g_state.duinit) { if (!g_state.duinit) {
/* drop MSB 1s */ /* drop MSB 1s */
threadbmp >>= (32 - NUM_DU_THREADS); threadbmp >>= (32 - NUM_DU_THREADS);
if (!core_blocks)
core_blocks = calloc(NUM_DU_THREADS, sizeof(blkcnt_t)); core_blocks = calloc(NUM_DU_THREADS, sizeof(blkcnt_t));
if (!core_data)
core_data = calloc(NUM_DU_THREADS, sizeof(thread_data)); core_data = calloc(NUM_DU_THREADS, sizeof(thread_data));
if (!core_files)
core_files = calloc(NUM_DU_THREADS, sizeof(ullong_t)); core_files = calloc(NUM_DU_THREADS, sizeof(ullong_t));
if (!core_blocks || !core_data || !core_files) {
printwarn(NULL);
return FALSE;
}
#ifndef __APPLE__ #ifndef __APPLE__
/* Increase current open file descriptor limit */ /* Increase current open file descriptor limit */
max_openfds(); max_openfds();
@ -5583,6 +5595,7 @@ static void prep_threads(void)
memset(core_data, 0, NUM_DU_THREADS * sizeof(thread_data)); memset(core_data, 0, NUM_DU_THREADS * sizeof(thread_data));
memset(core_files, 0, NUM_DU_THREADS * sizeof(ullong_t)); memset(core_files, 0, NUM_DU_THREADS * sizeof(ullong_t));
} }
return TRUE;
} }
/* Skip self and parent */ /* Skip self and parent */
@ -5627,7 +5640,8 @@ static int dentfill(char *path, struct entry **ppdents)
} else } else
memset(ihashbmp, 0, HASH_OCTETS << 3); memset(ihashbmp, 0, HASH_OCTETS << 3);
prep_threads(); if (!prep_threads())
goto exit;
attron(COLOR_PAIR(cfg.curctx + 1)); attron(COLOR_PAIR(cfg.curctx + 1));
} }
@ -5836,7 +5850,7 @@ static int dentfill(char *path, struct entry **ppdents)
} while ((dp = readdir(dirp))); } while ((dp = readdir(dirp)));
exit: exit:
if (cfg.blkorder) { if (g_state.duinit && cfg.blkorder) {
while (active_threads); while (active_threads);
attroff(COLOR_PAIR(cfg.curctx + 1)); attroff(COLOR_PAIR(cfg.curctx + 1));