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

Merge pull request #147 from plieven/destroy_segfault2

Browse Source 
init: fix segfault in iscsi_destroy_context
This commit is contained in:
Ronnie Sahlberg
2015-03-19 06:18:43 -07:00
parent 373d5883d4 ea2bcfd308
commit d33e41c9d4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/init.c
View File

@@ -295,7 +295,7 @@ iscsi_destroy_context(struct iscsi_context *iscsi)
/* If an error happened during connect/login, we don't want to /* If an error happened during connect/login, we don't want to
call any of the callbacks. call any of the callbacks.
*/ */
if (iscsi->is_loggedin) { if (iscsi->is_loggedin && pdu->callback != NULL) {
pdu->callback(iscsi, SCSI_STATUS_CANCELLED, NULL, pdu->callback(iscsi, SCSI_STATUS_CANCELLED, NULL,
pdu->private_data); pdu->private_data);
} }
@@ -307,7 +307,7 @@ iscsi_destroy_context(struct iscsi_context *iscsi)
/* If an error happened during connect/login, we don't want to /* If an error happened during connect/login, we don't want to
call any of the callbacks. call any of the callbacks.
*/ */
if (iscsi->is_loggedin) { if (iscsi->is_loggedin && pdu->callback != NULL) {
pdu->callback(iscsi, SCSI_STATUS_CANCELLED, NULL, pdu->callback(iscsi, SCSI_STATUS_CANCELLED, NULL,
pdu->private_data); pdu->private_data);
} }