Module Name: src
Committed By: christos
Date: Sun Sep 6 17:06:20 UTC 2020
Modified Files:
src/external/bsd/iscsi/dist/src/lib: initiator.c
Log Message:
fix null argument
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/iscsi/dist/src/lib/initiator.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/iscsi/dist/src/lib/initiator.c
diff -u src/external/bsd/iscsi/dist/src/lib/initiator.c:1.10 src/external/bsd/iscsi/dist/src/lib/initiator.c:1.11
--- src/external/bsd/iscsi/dist/src/lib/initiator.c:1.10 Mon Mar 16 20:57:54 2020
+++ src/external/bsd/iscsi/dist/src/lib/initiator.c Sun Sep 6 13:06:20 2020
@@ -906,7 +906,8 @@ iscsi_initiator_start(iscsi_initiator_t
}
iscsi_trace(TRACE_ISCSI_DEBUG, "initializing initiator\n");
iscsi_trace(TRACE_ISCSI_DEBUG,
- "target config filename to read from:%s\n", gfilename);
+ "target config filename to read from: %s\n", gfilename
+ ? gfilename : "(null)");
port = atoi(iscsi_initiator_getvar(ini, "target port"));
if (get_target_config(iscsi_initiator_getvar(ini,
"target hostname"), port) != 0) {
@@ -3714,7 +3715,9 @@ ii_initiator_init(const char *hostname,
USE_ARG(address_family);
iscsi_trace(TRACE_ISCSI_DEBUG, "initializing initiator\n");
- iscsi_trace(TRACE_ISCSI_DEBUG, "target config filename to read from:%s\n", gfilename);
+ iscsi_trace(TRACE_ISCSI_DEBUG,
+ "target config filename to read from: %s\n", gfilename ?
+ gfilename : "(null)");
if (get_target_config(hostname, port) != 0) {
iscsi_err(__FILE__, __LINE__, "Error getting target configuration from config file\n");
return -1;
