From 90082b002d6d7a84cd6aaed2716edc18687dd8c1 Mon Sep 17 00:00:00 2001 From: Teodor Petrov Date: Mon, 27 Jul 2020 01:06:01 +0300 Subject: [PATCH] Fix configure errors when using GTK 2 and ASAN Memory leaks in the test programs run by configure when using GTK 2 result in configuration failures when using -fsanitize=address in {CXX,LD}FLAGS, so fix these leaks to allow configuring using "CXXFLAGS=-fsanitize=address LDFLAGS=-fsanitize=address" together with --with-gtk=2 (this already worked correctly with the default GTK 3). Closes https://github.com/wxWidgets/wxWidgets/pull/2001 --- build/aclocal/gtk-2.0.m4 | 2 ++ build/aclocal/gtk.m4 | 2 ++ configure | 6 ++++++ 3 files changed, 10 insertions(+) diff --git a/build/aclocal/gtk-2.0.m4 b/build/aclocal/gtk-2.0.m4 index 3c6b6dd8eb..533ebecfac 100644 --- a/build/aclocal/gtk-2.0.m4 +++ b/build/aclocal/gtk-2.0.m4 @@ -80,8 +80,10 @@ main () tmp_version = g_strdup("$min_gtk_version"); if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { printf("%s, bad version string\n", "$min_gtk_version"); + g_free(tmp_version); exit(1); } + g_free(tmp_version); if ((gtk_major_version != $gtk_config_major_version) || (gtk_minor_version != $gtk_config_minor_version) || diff --git a/build/aclocal/gtk.m4 b/build/aclocal/gtk.m4 index 6f6a4222f8..0a9961fb66 100644 --- a/build/aclocal/gtk.m4 +++ b/build/aclocal/gtk.m4 @@ -78,9 +78,11 @@ main () /* HP/UX 9 (%@#!) writes to sscanf strings */ tmp_version = g_strdup("$min_gtk_version"); if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + g_free(tmp_version); printf("%s, bad version string\n", "$min_gtk_version"); exit(1); } + g_free(tmp_version); if ((gtk_major_version != $gtk_config_major_version) || (gtk_minor_version != $gtk_config_minor_version) || diff --git a/configure b/configure index 0a6727e2ca..968e728974 100755 --- a/configure +++ b/configure @@ -23471,8 +23471,10 @@ main () tmp_version = g_strdup("$min_gtk_version"); if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { printf("%s, bad version string\n", "$min_gtk_version"); + g_free(tmp_version); exit(1); } + g_free(tmp_version); if ((gtk_major_version != $gtk_config_major_version) || (gtk_minor_version != $gtk_config_minor_version) || @@ -23997,9 +23999,11 @@ main () /* HP/UX 9 (%@#!) writes to sscanf strings */ tmp_version = g_strdup("$min_gtk_version"); if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + g_free(tmp_version); printf("%s, bad version string\n", "$min_gtk_version"); exit(1); } + g_free(tmp_version); if ((gtk_major_version != $gtk_config_major_version) || (gtk_minor_version != $gtk_config_minor_version) || @@ -24269,9 +24273,11 @@ main () /* HP/UX 9 (%@#!) writes to sscanf strings */ tmp_version = g_strdup("$min_gtk_version"); if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + g_free(tmp_version); printf("%s, bad version string\n", "$min_gtk_version"); exit(1); } + g_free(tmp_version); if ((gtk_major_version != $gtk_config_major_version) || (gtk_minor_version != $gtk_config_minor_version) ||