http://linux.die.net/man/3/strtok_r string.h is no longer needed
On 11 March 2015 at 09:52, Ciprian Barbu <[email protected]> wrote: > The odp_ipsec 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 <[email protected]> > --- > example/ipsec/odp_ipsec.c | 30 ++++++++++++++---------------- > 1 file changed, 14 insertions(+), 16 deletions(-) > > diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c > index 98160ba..d14670d 100644 > --- a/example/ipsec/odp_ipsec.c > +++ b/example/ipsec/odp_ipsec.c > @@ -57,6 +57,7 @@ typedef struct { > char **if_names; /**< Array of pointers to interface names > */ > crypto_api_mode_e mode; /**< Crypto API preferred mode */ > odp_pool_t pool; /**< Buffer pool for packet IO */ > + char *if_str; /**< Storage for interface names */ > } appl_args_t; > > /** > @@ -1328,6 +1329,8 @@ main(int argc, char *argv[]) > odph_linux_pthread_join(thread_tbl, num_workers); > } > > + free(args->appl.if_names); > + free(args->appl.if_str); > printf("Exit\n\n"); > > return 0; > @@ -1344,10 +1347,7 @@ static void parse_args(int argc, char *argv[], > appl_args_t *appl_args) > { > int opt; > int long_index; > - char *names; > - char *str; > char *token; > - char *save; > size_t len; > int rc = 0; > int i; > @@ -1389,19 +1389,19 @@ static void parse_args(int argc, char *argv[], > appl_args_t *appl_args) > } > len += 1; /* add room for '\0' */ > > - names = malloc(len); > - if (NULL == names) { > + 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 (NULL == token) > - 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 (0 == appl_args->if_count) { > @@ -1414,11 +1414,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 (NULL == token) > - 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 > [email protected] > http://lists.linaro.org/mailman/listinfo/lng-odp > -- Mike Holmes Technical Manager - Linaro Networking Group Linaro.org <http://www.linaro.org/> *│ *Open source software for ARM SoCs
_______________________________________________ lng-odp mailing list [email protected] http://lists.linaro.org/mailman/listinfo/lng-odp
