X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=fe7d39fa49b5b13d1fc7185c9f36e0a9c714ac8d;hp=30b655d8dd938a67c878699b9be1bcd8b6fc10b1;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hpb=d0d82191bdac8626adf2489b89279f47805282ea

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 30b655d8..fe7d39fa 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -16,6 +16,14 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #define _GNU_SOURCE
@@ -48,12 +56,15 @@
 
 #define DEFAULT_FILE_ARRAY_SIZE	1
 
-/*
- * casting these to const char * to please libpopt. It allocates memory
- * behind our back (this is of course not documented).
- */
 static char *opt_input_format, *opt_output_format;
 
+/*
+ * We are not freeing opt_input_paths ipath elements when exiting from
+ * main() for backward compatibility with libpop 0.13, which does not
+ * allocate copies for arguments returned by poptGetArg(), and for
+ * general compatibility with the documented behavior. This is known to
+ * cause a small memory leak with libpop 0.16.
+ */
 static GPtrArray *opt_input_paths;
 static char *opt_output_path;
 
@@ -91,7 +102,10 @@ enum {
 /*
  * We are _not_ using POPT_ARG_STRING ability to store directly into
  * variables, because we want to cast the return to non-const, which is
- * not possible without using poptGetOptArg explicitly.
+ * not possible without using poptGetOptArg explicitly. This helps us
+ * controlling memory allocation correctly without making assumptions
+ * about undocumented behaviors. poptGetOptArg is documented as
+ * requiring the returned const char * to be freed by the caller.
  */
 static struct poptOption long_options[] = {
 	/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
@@ -249,7 +263,7 @@ static int parse_options(int argc, char **argv)
 {
 	poptContext pc;
 	int opt, ret = 0;
-	char *ipath;
+	const char *ipath;
 
 	if (argc == 1) {
 		usage(stdout);
@@ -360,7 +374,7 @@ static int parse_options(int argc, char **argv)
 	}
 
 	do {
-		ipath = (char *) poptGetArg(pc);
+		ipath = poptGetArg(pc);
 		if (ipath)
 			g_ptr_array_add(opt_input_paths, (gpointer) ipath);
 	} while (ipath);
@@ -453,7 +467,6 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 
 	GArray *trace_ids;
 	int ret = 0;
-	int i;
 
 	/* Should lock traversed_paths mutex here if used in multithread */
 
@@ -464,6 +477,8 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 
 	/* Process the array if ntfw did not return a fatal error */
 	if (ret >= 0) {
+		int i;
+
 		for (i = 0; i < traversed_paths->len; i++) {
 			GString *trace_path = g_ptr_array_index(traversed_paths,
 								i);
@@ -672,10 +687,6 @@ end:
 	free(opt_input_format);
 	free(opt_output_format);
 	free(opt_output_path);
-	for (i = 0; i < opt_input_paths->len; i++) {
-		char *ipath = g_ptr_array_index(opt_input_paths, i);
-		free(ipath);
-	}
 	g_ptr_array_free(opt_input_paths, TRUE);
 	if (partial_error)
 		exit(EXIT_FAILURE);