babeltrace: fix poptGetOptArg memleak

[deliverable/babeltrace.git] / converter / babeltrace.c

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index b8caa6a0bba2c55b8f312d38eaa282d1e4cc508a..f590abdf7c4b0802db2767ff9cce64b45d19ab00 100644 (file)
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -134,7 +134,7 @@ static void usage(FILE *fp)
        fprintf(fp, "                                        (default: payload,context)\n");
        fprintf(fp, "  -f, --fields name1<,name2,...> Print additional fields:\n");
        fprintf(fp, "                                     all, trace, trace:hostname, trace:domain,\n");
-       fprintf(fp, "                                     trace:procname, trace:vpid, loglevel.\n");
+       fprintf(fp, "                                     trace:procname, trace:vpid, loglevel, emf, callsite.\n");
        fprintf(fp, "                                     (default: trace:hostname,trace:procname,trace:vpid)\n");
        fprintf(fp, "      --clock-cycles             Timestamp in cycles\n");
        fprintf(fp, "      --clock-offset seconds     Clock offset in seconds\n");
@@ -151,6 +151,7 @@ static void usage(FILE *fp)
 static int get_names_args(poptContext *pc)
 {
        char *str, *strlist, *strctx;
+       int ret = 0;
 
        opt_payload_field_names = 0;
        opt_context_field_names = 0;
@@ -178,15 +179,20 @@ static int get_names_args(poptContext *pc)
                        opt_payload_field_names = 0;
                } else {
                        fprintf(stderr, "[error] unknown field name type %s\n", str);
-                       return -EINVAL;
+                       free(strlist);
+                       ret = -EINVAL;
+                       goto end;
                }
        } while ((str = strtok_r(NULL, ",", &strctx)));
-       return 0;
+end:
+       free(strlist);
+       return ret;
 }
 
 static int get_fields_args(poptContext *pc)
 {
        char *str, *strlist, *strctx;
+       int ret = 0;
 
        strlist = (char *) poptGetOptArg(*pc);
        if (!strlist) {
@@ -209,12 +215,19 @@ static int get_fields_args(poptContext *pc)
                        opt_trace_vpid_field = 1;
                else if (!strcmp(str, "loglevel"))
                        opt_loglevel_field = 1;
+               else if (!strcmp(str, "emf"))
+                       opt_emf_field = 1;
+               else if (!strcmp(str, "callsite"))
+                       opt_callsite_field = 1;
                else {
                        fprintf(stderr, "[error] unknown field type %s\n", str);
-                       return -EINVAL;
+                       ret = -EINVAL;
+                       goto end;
                }
        } while ((str = strtok_r(NULL, ",", &strctx)));
-       return 0;
+end:
+       free(strlist);
+       return ret;
 }
 
 /*
@@ -275,10 +288,10 @@ static int parse_options(int argc, char **argv)
                        break;
                case OPT_CLOCK_OFFSET:
                {
-                       const char *str;
+                       char *str;
                        char *endptr;
 
-                       str = poptGetOptArg(pc);
+                       str = (char *) poptGetOptArg(pc);
                        if (!str) {
                                fprintf(stderr, "[error] Missing --clock-offset argument\n");
                                ret = -EINVAL;
@@ -289,8 +302,10 @@ static int parse_options(int argc, char **argv)
                        if (*endptr != '\0' || str == endptr || errno != 0) {
                                fprintf(stderr, "[error] Incorrect --clock-offset argument: %s\n", str);
                                ret = -EINVAL;
+                               free(str);
                                goto end;
                        }
+                       free(str);
                        break;
                }
                case OPT_CLOCK_SECONDS: