diff options
Diffstat (limited to 'glusterfsd/src')
| -rw-r--r-- | glusterfsd/src/glusterfsd.c | 24 | 
1 files changed, 13 insertions, 11 deletions
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index e85db1d3507..f1b7d742fbc 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -1241,19 +1241,21 @@ parse_opts(int key, char *arg, struct argp_state *state)          case ARGP_BRICK_PORT_KEY:              n = 0; -            port_str = strtok_r(arg, ",", &tmp_str); -            if (gf_string2uint_base10(port_str, &n) == 0) { -                cmd_args->brick_port = n; -                port_str = strtok_r(NULL, ",", &tmp_str); -                if (port_str) { -                    if (gf_string2uint_base10(port_str, &n) == 0) { -                        cmd_args->brick_port2 = n; -                        break; +            if (arg != NULL) { +                port_str = strtok_r(arg, ",", &tmp_str); +                if (gf_string2uint_base10(port_str, &n) == 0) { +                    cmd_args->brick_port = n; +                    port_str = strtok_r(NULL, ",", &tmp_str); +                    if (port_str) { +                        if (gf_string2uint_base10(port_str, &n) == 0) { +                            cmd_args->brick_port2 = n; +                            break; +                        } +                        argp_failure(state, -1, 0, +                                     "wrong brick (listen) port %s", arg);                      } -                    argp_failure(state, -1, 0, "wrong brick (listen) port %s", -                                 arg); +                    break;                  } -                break;              }              argp_failure(state, -1, 0, "unknown brick (listen) port %s", arg);  | 
