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

apps/nshlib: Fix error handling in 'cat' command. On a failure to allocate memory, a file was not being closed. From Bruno Herrera.

Browse Source
This commit is contained in:
Bruno Herrera 2015-08-30 18:23:25 -06:00 committed by Gregory Nutt
parent ed2ccad735
commit 321924c0a5
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog.txt
View File

@ -1417,4 +1417,6 @@
initialized the network (2015-08-26). initialized the network (2015-08-26).
* apps/nettest: Extend test so that can be performed using the local * apps/nettest: Extend test so that can be performed using the local
loopback device (2015-08-26). loopback device (2015-08-26).
* apps/nshlib: Fix error handling in 'cat' command. On a failure to
allocate memory, a file ws not being closed. From Bruno Herrera
(2015-08-26).

1
nshlib/nsh_fscmds.c
View File

@ -439,6 +439,7 @@ static int cat_common(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
buffer = (FAR char *)malloc(IOBUFFERSIZE); buffer = (FAR char *)malloc(IOBUFFERSIZE);
if(buffer == NULL) if(buffer == NULL)
{ {
(void)close(fd);
nsh_output(vtbl, g_fmtcmdfailed, cmd, "malloc", NSH_ERRNO); nsh_output(vtbl, g_fmtcmdfailed, cmd, "malloc", NSH_ERRNO);
return ERROR; return ERROR;
} }