[incubator-nuttx] branch master updated: Revert "binfmt: Fix memory leak in ELF loader"

[pk...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new aecdcb316b Revert "binfmt: Fix memory leak in ELF loader"
aecdcb316b is described below

commit aecdcb316b296fc7251da4d9f19e9831151a872d
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Wed Jul 20 21:26:30 2022 +0900

    Revert "binfmt: Fix memory leak in ELF loader"
    
    This reverts commit 23d57be21b79531f1ecaf4882bae62a8153ede4a.
---
 binfmt/elf.c                  | 5 ++---
 include/nuttx/binfmt/binfmt.h | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/binfmt/elf.c b/binfmt/elf.c
index ef225ec06e..85fbe300aa 100644
--- a/binfmt/elf.c
+++ b/binfmt/elf.c
@@ -277,10 +277,9 @@ static int elf_loadbinary(FAR struct binary_s *binp,
   up_addrenv_clone(&loadinfo.addrenv, &binp->addrenv);
 #else
   binp->alloc[0]  = (FAR void *)loadinfo.textalloc;
-  binp->alloc[1]  = (FAR void *)loadinfo.dataalloc;
 #ifdef CONFIG_BINFMT_CONSTRUCTORS
-  binp->alloc[2]  = loadinfo.ctoralloc;
-  binp->alloc[3]  = loadinfo.dtoralloc;
+  binp->alloc[1]  = loadinfo.ctoralloc;
+  binp->alloc[2]  = loadinfo.dtoralloc;
 #endif
 #endif
 
diff --git a/include/nuttx/binfmt/binfmt.h b/include/nuttx/binfmt/binfmt.h
index e730551628..8c17d8f53b 100644
--- a/include/nuttx/binfmt/binfmt.h
+++ b/include/nuttx/binfmt/binfmt.h
@@ -39,7 +39,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define BINFMT_NALLOC 4
+#define BINFMT_NALLOC 3
 
 /****************************************************************************
  * Public Types