diff options
| author | laforge <laforge> | 2002-03-14 11:35:58 +0000 |
|---|---|---|
| committer | laforge <laforge> | 2002-03-14 11:35:58 +0000 |
| commit | 01608a86ae513b512ec966845e86a8490dc502f8 (patch) | |
| tree | 32821b41042796995881aabc74f6821e7603b288 /iptables.c | |
| parent | b57c177708274e319680a5ac425fabbcbee7edb1 (diff) | |
Fix 'iptables -p !' bug (segfault when `!' used without argument)
Diffstat (limited to 'iptables.c')
| -rw-r--r-- | iptables.c | 25 |
1 files changed, 13 insertions, 12 deletions
@@ -476,14 +476,20 @@ add_command(int *cmd, const int newcmd, const int othercmds, int invert) } int -check_inverse(const char option[], int *invert) +check_inverse(const char option[], int *invert, int *optind, int argc) { if (option && strcmp(option, "!") == 0) { if (*invert) exit_error(PARAMETER_PROBLEM, "Multiple `!' flags not allowed"); - *invert = TRUE; + if (optind) { + *optind = *optind+1; + if (argc && *optind > argc) + exit_error(PARAMETER_PROBLEM, + "no argument following `!'"); + } + return TRUE; } return FALSE; @@ -1834,8 +1840,7 @@ int do_command(int argc, char *argv[], char **table, iptc_handle_t *handle) * Option selection */ case 'p': - if (check_inverse(optarg, &invert)) - optind++; + check_inverse(optarg, &invert, &optind, argc); set_option(&options, OPT_PROTOCOL, &fw.ip.invflags, invert); @@ -1854,8 +1859,7 @@ int do_command(int argc, char *argv[], char **table, iptc_handle_t *handle) break; case 's': - if (check_inverse(optarg, &invert)) - optind++; + check_inverse(optarg, &invert, &optind, argc); set_option(&options, OPT_SOURCE, &fw.ip.invflags, invert); shostnetworkmask = argv[optind-1]; @@ -1863,8 +1867,7 @@ int do_command(int argc, char *argv[], char **table, iptc_handle_t *handle) break; case 'd': - if (check_inverse(optarg, &invert)) - optind++; + check_inverse(optarg, &invert, &optind, argc); set_option(&options, OPT_DESTINATION, &fw.ip.invflags, invert); dhostnetworkmask = argv[optind-1]; @@ -1894,8 +1897,7 @@ int do_command(int argc, char *argv[], char **table, iptc_handle_t *handle) case 'i': - if (check_inverse(optarg, &invert)) - optind++; + check_inverse(optarg, &invert, &optind, argc); set_option(&options, OPT_VIANAMEIN, &fw.ip.invflags, invert); parse_interface(argv[optind-1], @@ -1905,8 +1907,7 @@ int do_command(int argc, char *argv[], char **table, iptc_handle_t *handle) break; case 'o': - if (check_inverse(optarg, &invert)) - optind++; + check_inverse(optarg, &invert, &optind, argc); set_option(&options, OPT_VIANAMEOUT, &fw.ip.invflags, invert); parse_interface(argv[optind-1], |