improve error handling in load_mime_config default tip

Wed, 17 Dec 2025 22:15:48 +0100

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Wed, 17 Dec 2025 22:15:48 +0100
changeset 658
7290604d846d
parent 657
f1469e3144a7

improve error handling in load_mime_config

src/server/config/mimeconf.c file | annotate | diff | comparison | revisions
--- a/src/server/config/mimeconf.c	Sun Dec 14 20:37:11 2025 +0100
+++ b/src/server/config/mimeconf.c	Wed Dec 17 22:15:48 2025 +0100
@@ -44,6 +44,10 @@
     }
     
     MimeConfig *conf = malloc(sizeof(MimeConfig));
+    if(!conf) {
+        return NULL;
+    }
+    memset(conf, 0, sizeof(MimeConfig));
     conf->parser.parse = mimeconf_parse;
     conf->directives_begin = NULL;
     conf->directives_end = NULL;
@@ -52,8 +56,8 @@
     if(r != 0) {
         ws_cfg_log(LOG_FAILURE, "Cannot parse mime config file %s", file);
         fclose(in);
+        free_mime_config(conf);
         free(conf);
-        // TODO: free
         return NULL;
     }
     

mercurial