sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "binfmt: Fix memory leak in ELF loader"

Browse Source 
This reverts commit 23d57be21b79531f1ecaf4882bae62a8153ede4a.
This commit is contained in:
Masayuki Ishikawa 2022-07-20 21:26:30 +09:00 committed by Petro Karashchenko
parent 43f0555bfb
commit aecdcb316b
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
binfmt/elf.c
View File

@ -277,10 +277,9 @@ static int elf_loadbinary(FAR struct binary_s *binp,
up_addrenv_clone(&loadinfo.addrenv, &binp->addrenv); up_addrenv_clone(&loadinfo.addrenv, &binp->addrenv);
#else #else
binp->alloc[0] = (FAR void *)loadinfo.textalloc; binp->alloc[0] = (FAR void *)loadinfo.textalloc;
binp->alloc[1] = (FAR void *)loadinfo.dataalloc;
#ifdef CONFIG_BINFMT_CONSTRUCTORS #ifdef CONFIG_BINFMT_CONSTRUCTORS
binp->alloc[2] = loadinfo.ctoralloc; binp->alloc[1] = loadinfo.ctoralloc;
binp->alloc[3] = loadinfo.dtoralloc; binp->alloc[2] = loadinfo.dtoralloc;
#endif #endif
#endif #endif

2
include/nuttx/binfmt/binfmt.h
View File

@ -39,7 +39,7 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
#define BINFMT_NALLOC 4 #define BINFMT_NALLOC 3
/**************************************************************************** /****************************************************************************
* Public Types * Public Types