imi415
/
openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

server/telnet: Check malloc() return values 

Change-Id: I598bd2dd5a65c0d1a8745bde41763057c4427a31
Signed-off-by: Marc Schink <openocd-dev@marcschink.de>
Reviewed-on: http://openocd.zylin.com/3412
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
This commit is contained in:
Marc Schink 2016-04-13 10:29:50 +02:00 committed by Freddie Chopin
parent 0f65e36ee1
commit 54908d9fb9
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/server/telnet_server.c
View File

@ -207,10 +207,17 @@ static void telnet_save_history(struct telnet_connection *t_con)
static int telnet_new_connection(struct connection *connection)
{
struct telnet_connection *telnet_connection = malloc(sizeof(struct telnet_connection));
struct telnet_connection *telnet_connection;
struct telnet_service *telnet_service = connection->service->priv;
int i;
telnet_connection = malloc(sizeof(struct telnet_connection));
if (!telnet_connection) {
LOG_ERROR("Failed to allocate telnet connection.");
return ERROR_FAIL;
}
connection->priv = telnet_connection;
/* initialize telnet connection information */
@ -619,7 +626,14 @@ int telnet_init(char *banner)
return ERROR_OK;
}
struct telnet_service *telnet_service = malloc(sizeof(struct telnet_service));
struct telnet_service *telnet_service;
telnet_service = malloc(sizeof(struct telnet_service));
if (!telnet_service) {
LOG_ERROR("Failed to allocate telnet service.");
return ERROR_FAIL;
}
telnet_service->banner = banner;