From f847ab286b6955e371f08e5536a8fcb83362e714 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 24 Jun 2019 16:40:22 +0200 Subject: [PATCH] Engine should be destroyed through RAII here (fix invalid free). --- teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp b/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp index 8c21ecc80f..07838b53aa 100644 --- a/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp +++ b/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp @@ -16,7 +16,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example"); -XBT_ATTRIB_NORETURN static void usage(const char* binaryName, const char* defaultSend, const char* defaultRecv) +static void usage(const char* binaryName, const char* defaultSend, const char* defaultRecv) { std::fprintf(stderr, "Usage: %s examples/platforms/cluster_backbone.xml \n" "where spec is a list of letters giving the kind of tests you want to see.\n" @@ -40,7 +40,6 @@ XBT_ATTRIB_NORETURN static void usage(const char* binaryName, const char* defaul "Example 1: %s examples/platforms/cluster_backbone.xml rRiIdD rrrrrr # testing all send functions\n" "Default specs: %s %s (all possible pairs)\n", binaryName, binaryName, defaultSend, defaultRecv); - exit(1); } static void sender(std::vector args) @@ -165,8 +164,10 @@ int main(int argc, char* argv[]) std::vector argRecv{specRecv.c_str()}; simgrid::s4u::Engine e(&argc, argv); - if (argc < 2) + if (argc < 2) { usage(argv[0], specSend.c_str(), specRecv.c_str()); + return 1; + } e.load_platform(argv[1]); -- 2.20.1