admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #389 from likunyur/likunyu

Browse Source 
aros_compat: Add check after malloc allocation
This commit is contained in:
Ronnie Sahlberg
2022-12-14 20:15:19 +10:00
committed by GitHub
parent be9e2d70cb c0fdc4655a
commit 2f30d3acee
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
aros/aros_compat.c
View File

@@ -48,6 +48,9 @@ struct addrinfo **res)
struct sockaddr_in *sin; struct sockaddr_in *sin;
sin = malloc(sizeof(struct sockaddr_in)); sin = malloc(sizeof(struct sockaddr_in));
if (!sin)
return -1;
sin->sin_len = sizeof(struct sockaddr_in); sin->sin_len = sizeof(struct sockaddr_in);
sin->sin_family=AF_INET; sin->sin_family=AF_INET;
@@ -60,6 +63,8 @@ struct addrinfo **res)
} }
*res = malloc(sizeof(struct addrinfo)); *res = malloc(sizeof(struct addrinfo));
if (!*res)
return -2;
(*res)->ai_family = AF_INET; (*res)->ai_family = AF_INET;
(*res)->ai_addrlen = sizeof(struct sockaddr_in); (*res)->ai_addrlen = sizeof(struct sockaddr_in);

4
lib/connect.c
View File

@@ -469,6 +469,10 @@ static int reconnect(struct iscsi_context *iscsi, int force)
tmp_iscsi->old_iscsi = iscsi->old_iscsi; tmp_iscsi->old_iscsi = iscsi->old_iscsi;
} else { } else {
tmp_iscsi->old_iscsi = malloc(sizeof(struct iscsi_context)); tmp_iscsi->old_iscsi = malloc(sizeof(struct iscsi_context));
if (!tmp_iscsi->old_iscsi) {
free(tmp_iscsi);
return -1;
}
memcpy(tmp_iscsi->old_iscsi, iscsi, sizeof(struct iscsi_context)); memcpy(tmp_iscsi->old_iscsi, iscsi, sizeof(struct iscsi_context));
} }
memcpy(iscsi, tmp_iscsi, sizeof(struct iscsi_context)); memcpy(iscsi, tmp_iscsi, sizeof(struct iscsi_context));