UTILS: Check that an iscsi url was provided on the command line before strdup()ing it

This commit is contained in:
Ronnie Sahlberg
2013-07-20 09:01:38 -07:00
parent cc02faabb0
commit c172e12968
5 changed files with 15 additions and 5 deletions

View File

@@ -302,7 +302,9 @@ int main(int argc, char *argv[])
iscsi_set_log_fn(iscsi, iscsi_log_to_stderr); iscsi_set_log_fn(iscsi, iscsi_log_to_stderr);
} }
url = strdup(argv[optind]); if (argv[optind] != NULL) {
url = strdup(argv[optind]);
}
if (url == NULL) { if (url == NULL) {
fprintf(stderr, "You must specify the URL\n"); fprintf(stderr, "You must specify the URL\n");
print_usage(); print_usage();

View File

@@ -380,7 +380,9 @@ int main(int argc, char *argv[])
memset(&state, 0, sizeof(state)); memset(&state, 0, sizeof(state));
url = strdup(argv[optind]); if (argv[optind] != NULL) {
url = strdup(argv[optind]);
}
if (url == NULL) { if (url == NULL) {
fprintf(stderr, "You must specify iscsi target portal.\n"); fprintf(stderr, "You must specify iscsi target portal.\n");
print_usage(); print_usage();

View File

@@ -125,7 +125,9 @@ int main(int argc, char *argv[])
iscsi_set_log_level(iscsi, debug); iscsi_set_log_level(iscsi, debug);
} }
url = strdup(argv[optind]); if (argv[optind] != NULL) {
url = strdup(argv[optind]);
}
if (url == NULL) { if (url == NULL) {
fprintf(stderr, "You must specify the URL\n"); fprintf(stderr, "You must specify the URL\n");
print_usage(); print_usage();

View File

@@ -138,7 +138,9 @@ int main(int argc, char *argv[])
iscsi_set_log_fn(iscsi, iscsi_log_to_stderr); iscsi_set_log_fn(iscsi, iscsi_log_to_stderr);
} }
url = strdup(argv[optind]); if (argv[optind] != NULL) {
url = strdup(argv[optind]);
}
if (url == NULL) { if (url == NULL) {
fprintf(stderr, "You must specify the URL\n"); fprintf(stderr, "You must specify the URL\n");
print_usage(); print_usage();

View File

@@ -396,7 +396,9 @@ int main(int argc, char *argv[])
exit(0); exit(0);
} }
url = strdup(argv[optind]); if (argv[optind] != NULL) {
url = strdup(argv[optind]);
}
if (url == NULL) { if (url == NULL) {
fprintf(stderr, "You must specify the URL\n"); fprintf(stderr, "You must specify the URL\n");
print_usage(); print_usage();