nvram: fix memory leak
Fix memory leak on nvram_open() and nvram_open_rdonly(). For nvram_open(), the 'fd' should be closed on error, and mmap_area should be unmap when nvram magic can not be found. For nvram_open_rdonly(), the 'file' variable should free before return. Once nvram_find_mtd() return successfully, it will allocate memory to save mtd device string. Signed-off-by: BangLang Huang <banglang.huang@foxmail.com>
This commit is contained in:
parent
e622b30730
commit
1948d8e08c
2 changed files with 10 additions and 3 deletions
|
@ -27,13 +27,17 @@
|
|||
|
||||
static nvram_handle_t * nvram_open_rdonly(void)
|
||||
{
|
||||
const char *file = nvram_find_staging();
|
||||
char *file = nvram_find_staging();
|
||||
|
||||
if( file == NULL )
|
||||
file = nvram_find_mtd();
|
||||
|
||||
if( file != NULL )
|
||||
return nvram_open(file, NVRAM_RO);
|
||||
if( file != NULL ) {
|
||||
nvram_handle_t *h = nvram_open(file, NVRAM_RO);
|
||||
if( strcmp(file, NVRAM_STAGING) )
|
||||
free(file);
|
||||
return h;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
@ -380,7 +380,9 @@ nvram_handle_t * nvram_open(const char *file, int rdonly)
|
|||
|
||||
if( offset < 0 )
|
||||
{
|
||||
munmap(mmap_area, nvram_part_size);
|
||||
free(mtd);
|
||||
close(fd);
|
||||
return NULL;
|
||||
}
|
||||
else if( (h = malloc(sizeof(nvram_handle_t))) != NULL )
|
||||
|
@ -410,6 +412,7 @@ nvram_handle_t * nvram_open(const char *file, int rdonly)
|
|||
}
|
||||
|
||||
free(mtd);
|
||||
close(fd);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue