Fix exit before parsing options

- The function destroy_global_config was called from normal_exit even
  if init_global_config hadn't been called before, such as when ltrace
  was run with no command line arguments.  This led to crashes.  We
  avoided similar crashes due to exit from init_global_config by
  calling _Exit instead.

- Instead, schedule execution of destroy_global_config only after it
  is known that init_global_config was successful.  Replace the clumsy
  _Exit calls again by plain exit.

1 files changed, 10 insertions, 12 deletions

diff --git a/prototype.c b/prototype.c
index 23fc7a5..60aa5c6 100644
--- a/prototype.c
+++ b/prototype.c
@@ -621,6 +621,13 @@ protolib_cache_protolib(struct protolib_cache *cache,
 	return rc;
 }
 
+static void
+destroy_global_config(void)
+{
+	protolib_cache_destroy(&g_protocache);
+	protolib_destroy(&legacy_typedefs);
+}
+
 void
 init_global_config(void)
 {
@@ -641,22 +648,13 @@ init_global_config(void)
 		fprintf(stderr,
 			"Couldn't initialize aliases `addr' and `file'.\n");
 
-		/* Since global config was not yet initialized, do an
-		 * early exit.  */
-		fflush(stderr);
-		_Exit(1);
+		exit(1);
 	}
 
 	if (protolib_cache_init(&g_protocache, NULL) < 0) {
 		fprintf(stderr, "Couldn't init prototype cache\n");
-		fflush(stderr);
-		_Exit(1);
+		exit(1);
 	}
-}
 
-void
-destroy_global_config(void)
-{
-	protolib_cache_destroy(&g_protocache);
-	protolib_destroy(&legacy_typedefs);
+	atexit(destroy_global_config);
 }