lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-07-19 07:03:12 +03:00
Code Activity

options: Fix NULL value handling.

Browse Source
This commit is contained in:
Andreas Schneider
2011-09-06 09:14:21 +02:00
parent 3105b3c205
commit ae1f87e37a
2 changed files with 67 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
src/options.c
View File

@ -376,15 +376,10 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
return -1; return -1;
} }
if (value == NULL) {
ssh_set_error_invalid(session, __FUNCTION__);
return -1;
}
switch (type) { switch (type) {
case SSH_OPTIONS_HOST: case SSH_OPTIONS_HOST:
v = value; v = value;
if (v[0] == '\0') { if (v == NULL || v[0] == '\0') {
ssh_set_error_invalid(session, __FUNCTION__); ssh_set_error_invalid(session, __FUNCTION__);
return -1; return -1;
} else { } else {
@ -419,7 +414,10 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
} }
break; break;
case SSH_OPTIONS_PORT: case SSH_OPTIONS_PORT:
{ if (value == NULL) {
ssh_set_error_invalid(session, __FUNCTION__);
return -1;
} else {
int *x = (int *) value; int *x = (int *) value;
if (*x <= 0) { if (*x <= 0) {
ssh_set_error_invalid(session, __FUNCTION__); ssh_set_error_invalid(session, __FUNCTION__);
@ -431,7 +429,7 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
break; break;
case SSH_OPTIONS_PORT_STR: case SSH_OPTIONS_PORT_STR:
v = value; v = value;
if (v[0] == '\0') { if (v == NULL || v[0] == '\0') {
ssh_set_error_invalid(session, __FUNCTION__); ssh_set_error_invalid(session, __FUNCTION__);
return -1; return -1;
} else { } else {
@ -454,7 +452,11 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
} }
break; break;
case SSH_OPTIONS_FD: case SSH_OPTIONS_FD:
{ if (value == NULL) {
session->fd = SSH_INVALID_SOCKET;
ssh_set_error_invalid(session, __FUNCTION__);
return -1;
} else {
socket_t *x = (socket_t *) value; socket_t *x = (socket_t *) value;
if (*x < 0) { if (*x < 0) {
session->fd = SSH_INVALID_SOCKET; session->fd = SSH_INVALID_SOCKET;
@ -467,7 +469,7 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
break; break;
case SSH_OPTIONS_BINDADDR: case SSH_OPTIONS_BINDADDR:
v = value; v = value;
if (v[0] == '\0') { if (v == NULL || v[0] == '\0') {
ssh_set_error_invalid(session, __FUNCTION__); ssh_set_error_invalid(session, __FUNCTION__);
return -1; return -1;
} }
@ -482,13 +484,16 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
case SSH_OPTIONS_USER: case SSH_OPTIONS_USER:
v = value; v = value;
SAFE_FREE(session->username); SAFE_FREE(session->username);
if (v[0] == '\0') { if (v == NULL) {
q = ssh_get_local_username(); q = ssh_get_local_username();
if (q == NULL) { if (q == NULL) {
ssh_set_error_oom(session); ssh_set_error_oom(session);
return -1; return -1;
} }
session->username = q; session->username = q;
} else if (v[0] == '\0') {
ssh_set_error_oom(session);
return -1;
} else { /* username provided */ } else { /* username provided */
session->username = strdup(value); session->username = strdup(value);
if (session->username == NULL) { if (session->username == NULL) {
@ -500,14 +505,18 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
case SSH_OPTIONS_SSH_DIR: case SSH_OPTIONS_SSH_DIR:
v = value; v = value;
SAFE_FREE(session->sshdir); SAFE_FREE(session->sshdir);
if (v[0] == '\0') { if (v == NULL) {
session->sshdir = ssh_path_expand_tilde("~/.ssh"); session->sshdir = ssh_path_expand_tilde("~/.ssh");
if (session->sshdir == NULL) { if (session->sshdir == NULL) {
return -1; return -1;
} }
} else if (v[0] == '\0') {
ssh_set_error_oom(session);
return -1;
} else { } else {
session->sshdir = ssh_path_expand_tilde(v); session->sshdir = ssh_path_expand_tilde(v);
if (session->sshdir == NULL) { if (session->sshdir == NULL) {
ssh_set_error_oom(session);
return -1; return -1;
} }
} }
@ -515,7 +524,7 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
case SSH_OPTIONS_IDENTITY: case SSH_OPTIONS_IDENTITY:
case SSH_OPTIONS_ADD_IDENTITY: case SSH_OPTIONS_ADD_IDENTITY:
v = value; v = value;
if (v[0] == '\0') { if (v == NULL || v[0] == '\0') {
ssh_set_error_invalid(session, __FUNCTION__); ssh_set_error_invalid(session, __FUNCTION__);
return -1; return -1;
} }
@ -531,16 +540,16 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
case SSH_OPTIONS_KNOWNHOSTS: case SSH_OPTIONS_KNOWNHOSTS:
v = value; v = value;
SAFE_FREE(session->knownhosts); SAFE_FREE(session->knownhosts);
if (v[0] == '\0') { if (v == NULL) {
if (session->sshdir == NULL) { session->knownhosts = ssh_path_expand_escape(session,
ssh_set_error(session, SSH_FATAL, "ssh_dir is not set"); "%d/known_hosts");
return -1;
}
session->knownhosts = ssh_path_expand_escape(session, "%d/known_hosts");
if (session->knownhosts == NULL) { if (session->knownhosts == NULL) {
ssh_set_error_oom(session); ssh_set_error_oom(session);
return -1; return -1;
} }
} else if (v[0] == '\0') {
ssh_set_error_invalid(session, __FUNCTION__);
return -1;
} else { } else {
session->knownhosts = strdup(v); session->knownhosts = strdup(v);
if (session->knownhosts == NULL) { if (session->knownhosts == NULL) {
@ -550,7 +559,10 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
} }
break; break;
case SSH_OPTIONS_TIMEOUT: case SSH_OPTIONS_TIMEOUT:
{ if (value == NULL) {
ssh_set_error_invalid(session, __FUNCTION__);
return -1;
} else {
long *x = (long *) value; long *x = (long *) value;
if (*x < 0) { if (*x < 0) {
ssh_set_error_invalid(session, __FUNCTION__); ssh_set_error_invalid(session, __FUNCTION__);
@ -561,7 +573,10 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
} }
break; break;
case SSH_OPTIONS_TIMEOUT_USEC: case SSH_OPTIONS_TIMEOUT_USEC:
{ if (value == NULL) {
ssh_set_error_invalid(session, __FUNCTION__);
return -1;
} else {
long *x = (long *) value; long *x = (long *) value;
if (*x < 0) { if (*x < 0) {
ssh_set_error_invalid(session, __FUNCTION__); ssh_set_error_invalid(session, __FUNCTION__);
@ -572,7 +587,10 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
} }
break; break;
case SSH_OPTIONS_SSH1: case SSH_OPTIONS_SSH1:
{ if (value == NULL) {
ssh_set_error_invalid(session, __FUNCTION__);
return -1;
} else {
int *x = (int *) value; int *x = (int *) value;
if (*x < 0) { if (*x < 0) {
ssh_set_error_invalid(session, __FUNCTION__); ssh_set_error_invalid(session, __FUNCTION__);
@ -583,7 +601,10 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
} }
break; break;
case SSH_OPTIONS_SSH2: case SSH_OPTIONS_SSH2:
{ if (value == NULL) {
ssh_set_error_invalid(session, __FUNCTION__);
return -1;
} else {
int *x = (int *) value; int *x = (int *) value;
if (*x < 0) { if (*x < 0) {
ssh_set_error_invalid(session, __FUNCTION__); ssh_set_error_invalid(session, __FUNCTION__);
@ -594,7 +615,10 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
} }
break; break;
case SSH_OPTIONS_LOG_VERBOSITY: case SSH_OPTIONS_LOG_VERBOSITY:
{ if (value == NULL) {
ssh_set_error_invalid(session, __FUNCTION__);
return -1;
} else {
int *x = (int *) value; int *x = (int *) value;
if (*x < 0) { if (*x < 0) {
ssh_set_error_invalid(session, __FUNCTION__); ssh_set_error_invalid(session, __FUNCTION__);
@ -606,7 +630,7 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
break; break;
case SSH_OPTIONS_LOG_VERBOSITY_STR: case SSH_OPTIONS_LOG_VERBOSITY_STR:
v = value; v = value;
if (v[0] == '\0') { if (v == NULL || v[0] == '\0') {
session->common.log_verbosity = 0; session->common.log_verbosity = 0;
ssh_set_error_invalid(session, __FUNCTION__); ssh_set_error_invalid(session, __FUNCTION__);
return -1; return -1;
@ -631,7 +655,7 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
break; break;
case SSH_OPTIONS_CIPHERS_C_S: case SSH_OPTIONS_CIPHERS_C_S:
v = value; v = value;
if (v[0] == '\0') { if (v == NULL || v[0] == '\0') {
ssh_set_error_invalid(session, __FUNCTION__); ssh_set_error_invalid(session, __FUNCTION__);
return -1; return -1;
} else { } else {
@ -641,7 +665,7 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
break; break;
case SSH_OPTIONS_CIPHERS_S_C: case SSH_OPTIONS_CIPHERS_S_C:
v = value; v = value;
if (v[0] == '\0') { if (v == NULL || v[0] == '\0') {
ssh_set_error_invalid(session, __FUNCTION__); ssh_set_error_invalid(session, __FUNCTION__);
return -1; return -1;
} else { } else {
@ -651,7 +675,7 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
break; break;
case SSH_OPTIONS_KEY_EXCHANGE: case SSH_OPTIONS_KEY_EXCHANGE:
v = value; v = value;
if (v[0] == '\0') { if (v == NULL || v[0] == '\0') {
ssh_set_error_invalid(session, __FUNCTION__); ssh_set_error_invalid(session, __FUNCTION__);
return -1; return -1;
} else { } else {
@ -661,7 +685,7 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
break; break;
case SSH_OPTIONS_COMPRESSION_C_S: case SSH_OPTIONS_COMPRESSION_C_S:
v = value; v = value;
if (v[0] == '\0') { if (v == NULL || v[0] == '\0') {
ssh_set_error_invalid(session, __FUNCTION__); ssh_set_error_invalid(session, __FUNCTION__);
return -1; return -1;
} else { } else {
@ -679,7 +703,7 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
break; break;
case SSH_OPTIONS_COMPRESSION_S_C: case SSH_OPTIONS_COMPRESSION_S_C:
v = value; v = value;
if (v[0] == '\0') { if (v == NULL || v[0] == '\0') {
ssh_set_error_invalid(session, __FUNCTION__); ssh_set_error_invalid(session, __FUNCTION__);
return -1; return -1;
} else { } else {
@ -697,7 +721,7 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
break; break;
case SSH_OPTIONS_COMPRESSION: case SSH_OPTIONS_COMPRESSION:
v = value; v = value;
if (v[0] == '\0') { if (v == NULL || v[0] == '\0') {
ssh_set_error_invalid(session, __FUNCTION__); ssh_set_error_invalid(session, __FUNCTION__);
return -1; return -1;
} }
@ -707,7 +731,10 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
return -1; return -1;
break; break;
case SSH_OPTIONS_COMPRESSION_LEVEL: case SSH_OPTIONS_COMPRESSION_LEVEL:
{ if (value == NULL) {
ssh_set_error_invalid(session, __FUNCTION__);
return -1;
} else {
int *x = (int *)value; int *x = (int *)value;
if (*x < 1 || *x > 9) { if (*x < 1 || *x > 9) {
ssh_set_error_invalid(session, __FUNCTION__); ssh_set_error_invalid(session, __FUNCTION__);
@ -717,7 +744,10 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
} }
break; break;
case SSH_OPTIONS_STRICTHOSTKEYCHECK: case SSH_OPTIONS_STRICTHOSTKEYCHECK:
{ if (value == NULL) {
ssh_set_error_invalid(session, __FUNCTION__);
return -1;
} else {
int *x = (int *) value; int *x = (int *) value;
session->StrictHostKeyChecking = (*x & 0xff) > 0 ? 1 : 0; session->StrictHostKeyChecking = (*x & 0xff) > 0 ? 1 : 0;
@ -726,7 +756,7 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
break; break;
case SSH_OPTIONS_PROXYCOMMAND: case SSH_OPTIONS_PROXYCOMMAND:
v = value; v = value;
if (v[0] == '\0') { if (v == NULL || v[0] == '\0') {
ssh_set_error_invalid(session, __FUNCTION__); ssh_set_error_invalid(session, __FUNCTION__);
return -1; return -1;
} else { } else {

8
tests/unittests/torture_options.c
View File

@ -46,12 +46,10 @@ static void torture_options_set_port(void **state) {
assert_true(session->port == 23); assert_true(session->port == 23);
rc = ssh_options_set(session, SSH_OPTIONS_PORT_STR, "five"); rc = ssh_options_set(session, SSH_OPTIONS_PORT_STR, "five");
assert_true(rc == 0); assert_true(rc == -1);
assert_true(session->port == 0);
rc = ssh_options_set(session, SSH_OPTIONS_PORT, NULL); rc = ssh_options_set(session, SSH_OPTIONS_PORT, NULL);
assert_true(rc == 0); assert_true(rc == -1);
assert_true(session->port == 22);
} }
static void torture_options_set_fd(void **state) { static void torture_options_set_fd(void **state) {
@ -64,7 +62,7 @@ static void torture_options_set_fd(void **state) {
assert_true(session->fd == fd); assert_true(session->fd == fd);
rc = ssh_options_set(session, SSH_OPTIONS_FD, NULL); rc = ssh_options_set(session, SSH_OPTIONS_FD, NULL);
assert_true(rc == 0); assert_true(rc == -1);
assert_true(session->fd == SSH_INVALID_SOCKET); assert_true(session->fd == SSH_INVALID_SOCKET);
} }