diff options
| author | Ciprian Barbu <ciprian.barbu@linaro.org> | 2015-03-25 13:58:01 +0200 |
|---|---|---|
| committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2015-03-27 16:30:46 +0300 |
| commit | 241b3cf90f2eb5ce83c12c748bfa6add41143908 (patch) | |
| tree | 3cff47e77b38232a6ed86973946839a210ca2049 /example | |
| parent | e746eac76fa8ded9f44ff2dbd71bd0bf3b3c145f (diff) | |
example: odp_ipsec: replace strtok_r with strtok and fix leaks
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 <ciprian.barbu@linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>
Reviewed-by: Mike Holmes <mike.holmes@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Diffstat (limited to 'example')
| -rw-r--r-- | example/ipsec/odp_ipsec.c | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index 82ed0cb..56e9aa8 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -14,7 +14,6 @@ /* enable strtok */ #define _POSIX_C_SOURCE 200112L #include <stdlib.h> -#include <string.h> #include <getopt.h> #include <unistd.h> @@ -57,6 +56,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; /** @@ -1274,6 +1274,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; @@ -1290,10 +1292,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; @@ -1335,19 +1334,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) { @@ -1360,11 +1359,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; |