| Message ID | 1427193695-4932-2-git-send-email-ciprian.barbu@linaro.org |
|---|---|
| State | Accepted |
| Commit | faa82f2a861e079dd5379cb31206d6f55b8385ca |
| Headers | show |
This patch appears to need rebasing, Will not apply: bill@ubuntu:~/linaro/ciprianpatch$ git am --reject ~/Mail/patchbox/1 Applying: example: odp_l2fwd: replace strtok_r with strtok and fix leaks Checking patch example/l2fwd/odp_l2fwd.c... error: while searching for: int if_count; /**< Number of interfaces to be used */ char **if_names; /**< Array of pointers to interface names */ int mode; /**< Packet IO mode */ } appl_args_t; /** error: patch failed: example/l2fwd/odp_l2fwd.c:73 Hunk #3 succeeded at 464 (offset 49 lines). Hunk #4 succeeded at 513 (offset 49 lines). Hunk #5 succeeded at 556 (offset 59 lines). Hunk #6 succeeded at 581 (offset 59 lines). Applying patch example/l2fwd/odp_l2fwd.c with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. Hunk #3 applied cleanly. Hunk #4 applied cleanly. Hunk #5 applied cleanly. Hunk #6 applied cleanly. Patch failed at 0001 example: odp_l2fwd: replace strtok_r with strtok and fix leaks The copy of the patch that failed is found in: /home/bill/linaro/ciprianpatch/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". bill@ubuntu:~/linaro/ciprianpatch$ On Tue, Mar 24, 2015 at 5:41 AM, Ciprian Barbu <ciprian.barbu@linaro.org> wrote: > The odp_l2fwd example leaks some strings allocated during parse_args. > https://bugs.linaro.org/show_bug.cgi?id=1117 > CID 56899: Resource leak (RESOURCE_LEAK) > > Signed-off-by: Ciprian Barbu <ciprian.barbu@linaro.org> > --- > example/l2fwd/odp_l2fwd.c | 30 +++++++++++++++--------------- > 1 file changed, 15 insertions(+), 15 deletions(-) > > diff --git a/example/l2fwd/odp_l2fwd.c b/example/l2fwd/odp_l2fwd.c > index d062a72..8ffb9dc 100644 > --- a/example/l2fwd/odp_l2fwd.c > +++ b/example/l2fwd/odp_l2fwd.c > @@ -14,7 +14,6 @@ > #define _POSIX_C_SOURCE 200112L > > #include <stdlib.h> > -#include <string.h> > #include <getopt.h> > #include <unistd.h> > #include <errno.h> > @@ -73,6 +72,7 @@ typedef struct { > int if_count; /**< Number of interfaces to be used */ > char **if_names; /**< Array of pointers to interface names > */ > int mode; /**< Packet IO mode */ > + char *if_str; /**< Storage for interface names */ > } appl_args_t; > > /** > @@ -415,6 +415,8 @@ int main(int argc, char *argv[]) > /* Master thread waits for other threads to exit */ > odph_linux_pthread_join(thread_tbl, num_workers); > > + free(gbl_args->appl.if_names); > + free(gbl_args->appl.if_str); > printf("Exit\n\n"); > > return 0; > @@ -462,7 +464,7 @@ static void parse_args(int argc, char *argv[], > appl_args_t *appl_args) > { > int opt; > int long_index; > - char *names, *str, *token, *save; > + char *token; > size_t len; > int i; > static struct option longopts[] = { > @@ -495,19 +497,19 @@ static void parse_args(int argc, char *argv[], > appl_args_t *appl_args) > } > len += 1; /* add room for '\0' */ > > - names = malloc(len); > - if (names == NULL) { > + appl_args->if_str = malloc(len); > + if (appl_args->if_str == NULL) { > usage(argv[0]); > exit(EXIT_FAILURE); > } > > /* count the number of tokens separated by ',' */ > - strcpy(names, optarg); > - for (str = names, i = 0;; str = NULL, i++) { > - token = strtok_r(str, ",", &save); > - if (token == NULL) > - break; > - } > + strcpy(appl_args->if_str, optarg); > + for (token = strtok(appl_args->if_str, ","), i = 0; > + token != NULL; > + token = strtok(NULL, ","), i++) > + ; > + > appl_args->if_count = i; > > if (appl_args->if_count == 0) { > @@ -520,11 +522,9 @@ static void parse_args(int argc, char *argv[], > appl_args_t *appl_args) > calloc(appl_args->if_count, sizeof(char *)); > > /* store the if names (reset names string) */ > - strcpy(names, optarg); > - for (str = names, i = 0;; str = NULL, i++) { > - token = strtok_r(str, ",", &save); > - if (token == NULL) > - break; > + strcpy(appl_args->if_str, optarg); > + for (token = strtok(appl_args->if_str, ","), i = 0; > + token != NULL; token = strtok(NULL, ","), > i++) { > appl_args->if_names[i] = token; > } > break; > -- > 1.8.3.2 > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/lng-odp >
diff --git a/example/l2fwd/odp_l2fwd.c b/example/l2fwd/odp_l2fwd.c index d062a72..8ffb9dc 100644 --- a/example/l2fwd/odp_l2fwd.c +++ b/example/l2fwd/odp_l2fwd.c @@ -14,7 +14,6 @@ #define _POSIX_C_SOURCE 200112L #include <stdlib.h> -#include <string.h> #include <getopt.h> #include <unistd.h> #include <errno.h> @@ -73,6 +72,7 @@ typedef struct { int if_count; /**< Number of interfaces to be used */ char **if_names; /**< Array of pointers to interface names */ int mode; /**< Packet IO mode */ + char *if_str; /**< Storage for interface names */ } appl_args_t; /** @@ -415,6 +415,8 @@ int main(int argc, char *argv[]) /* Master thread waits for other threads to exit */ odph_linux_pthread_join(thread_tbl, num_workers); + free(gbl_args->appl.if_names); + free(gbl_args->appl.if_str); printf("Exit\n\n"); return 0; @@ -462,7 +464,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) { int opt; int long_index; - char *names, *str, *token, *save; + char *token; size_t len; int i; static struct option longopts[] = { @@ -495,19 +497,19 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) } len += 1; /* add room for '\0' */ - names = malloc(len); - if (names == NULL) { + appl_args->if_str = malloc(len); + if (appl_args->if_str == NULL) { usage(argv[0]); exit(EXIT_FAILURE); } /* count the number of tokens separated by ',' */ - strcpy(names, optarg); - for (str = names, i = 0;; str = NULL, i++) { - token = strtok_r(str, ",", &save); - if (token == NULL) - break; - } + strcpy(appl_args->if_str, optarg); + for (token = strtok(appl_args->if_str, ","), i = 0; + token != NULL; + token = strtok(NULL, ","), i++) + ; + appl_args->if_count = i; if (appl_args->if_count == 0) { @@ -520,11 +522,9 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) calloc(appl_args->if_count, sizeof(char *)); /* store the if names (reset names string) */ - strcpy(names, optarg); - for (str = names, i = 0;; str = NULL, i++) { - token = strtok_r(str, ",", &save); - if (token == NULL) - break; + strcpy(appl_args->if_str, optarg); + for (token = strtok(appl_args->if_str, ","), i = 0; + token != NULL; token = strtok(NULL, ","), i++) { appl_args->if_names[i] = token; } break;
The odp_l2fwd example leaks some strings allocated during parse_args. https://bugs.linaro.org/show_bug.cgi?id=1117 CID 56899: Resource leak (RESOURCE_LEAK) Signed-off-by: Ciprian Barbu <ciprian.barbu@linaro.org> --- example/l2fwd/odp_l2fwd.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)