[Mesa-dev] [PATCH 10/13] mesa: call atexit() only as needed

Emil Velikov emil.l.velikov at gmail.com
Tue Nov 7 11:54:50 UTC 2017


From: Emil Velikov <emil.velikov at collabora.com>

If the extra_extensions string is empty there's no need to call
atexit() - there's nothing to free.

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 src/mesa/main/extensions.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index ae663a1092a..d16b05507ff 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -245,8 +245,6 @@ _mesa_one_time_init_extension_overrides(void)
    int len;
    size_t offset;
 
-   atexit(free_unknown_extensions_strings);
-
    if (env_const == NULL) {
       return;
    }
@@ -302,9 +300,9 @@ _mesa_one_time_init_extension_overrides(void)
    len = strlen(extra_extensions);
    if (len == 0) {
       free(extra_extensions);
-      extra_extensions = NULL;
    } else if (extra_extensions[len - 1] == ' ') {
       extra_extensions[len - 1] = '\0';
+      atexit(free_unknown_extensions_strings);
    }
 }
 
-- 
2.14.1



More information about the mesa-dev mailing list