On Tue, 17 Sep 2013, Oliver wrote:
> From: Oliver Smith <oliver@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
>
> This reworks the argument parsing functionality of ipset to handle
> quote-delimited lines in such a way that they are considered to be a
> single argument.
>
> This commit is necessary for ipset to successfully restore sets that
> have comments.
>
> Signed-off-by: Oliver Smith <oliver@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
> ---
> src/ipset.c | 40 +++++++++++++++++++++++++++++++++-------
> 1 file changed, 33 insertions(+), 7 deletions(-)
>
> diff --git a/src/ipset.c b/src/ipset.c
> index 4f308da..d9d609c 100644
> --- a/src/ipset.c
> +++ b/src/ipset.c
> @@ -159,20 +159,44 @@ ipset_print_file(const char *fmt, ...)
> static void
> build_argv(char *buffer)
> {
> - char *ptr;
> + char *ptr, *tmp;
> int i;
>
> /* Reset */
> - for (i = 1; i < newargc; i++)
> + for (i = 1; i < newargc; i++) {
> + if(newargv[i])
> + free(newargv[i]);
> newargv[i] = NULL;
> + }
> newargc = 1;
>
> ptr = strtok(buffer, " \t\r\n");
> - newargv[newargc++] = ptr;
> + newargv[newargc] = calloc(strlen(ptr) + 1, sizeof(*ptr));
> + ipset_strlcpy(newargv[newargc++], ptr, strlen(ptr) + 1);
> while ((ptr = strtok(NULL, " \t\r\n")) != NULL) {
> - if ((newargc + 1) < (int)(sizeof(newargv)/sizeof(char *)))
> - newargv[newargc++] = ptr;
> - else {
> + if ((newargc + 1) < (int)(sizeof(newargv)/sizeof(char *))) {
> + tmp = newargv[newargc] = calloc(strlen(ptr) + 1,
> + sizeof(*ptr));
> + if(*ptr == '"') {
> + ipset_strlcpy(tmp, ptr + 1, (strlen(ptr) + 1) *
> + sizeof(*ptr));
> + ipset_strlcat(tmp, " ", (strlen(ptr) + 1) *
> + sizeof(*ptr));
> + while((ptr = strtok(NULL, "\"")) != NULL) {
> + if(*ptr == '\n' || *ptr == '\r')
> + continue;
> + tmp = realloc(tmp, (strlen(tmp) +
> + strlen(ptr) + 1) *
> + sizeof(*ptr));
> + ipset_strlcat(tmp, ptr, (strlen(tmp) +
> + strlen(ptr) + 1) *
> + sizeof(*ptr));
> + }
Why is there the inside while loop? We look for a single closing quote.
Also, I'd better like to see an error reported if the closing quote is
missing instead of silently accepting it.
> + } else
> + ipset_strlcpy(tmp, ptr, (strlen(ptr) + 1) *
> + sizeof(*ptr));
> + newargv[newargc++] = tmp;
> + } else {
> exit_error(PARAMETER_PROBLEM,
> "Line is too long to parse.");
> return;
> @@ -195,7 +219,8 @@ restore(char *argv0)
>
> /* Initialize newargv/newargc */
> newargc = 0;
> - newargv[newargc++] = argv0;
> + newargv[newargc] = calloc(strlen(argv0) + 1, sizeof(*argv0));
> + ipset_strlcpy(newargv[newargc++], argv0, strlen(argv0) + 1);
> if (filename) {
> fd = fopen(filename, "r");
> if (!fd) {
> @@ -232,6 +257,7 @@ restore(char *argv0)
> if (ret < 0)
> handle_error();
>
> + free(newargv[0]);
> return ret;
> }
>
> --
> 1.8.3.2
Best regards,
Jozsef
-
E-mail : kadlec@xxxxxxxxxxxxxxxxx, kadlecsik.jozsef@xxxxxxxxxxxxx
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences
H-1525 Budapest 114, POB. 49, Hungary
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
