Ticket #1320: mod_simple_vhost-calloc-return-value-checks.patch

src/mod_simple_vhost.c

@@ -43 +43 @@
         UNUSED(srv);
 
         p = calloc(1, sizeof(*p));
+        if (p == NULL)
+                return NULL;
 
         p->doc_root = buffer_init();
 
@@ -97 +99 @@
         if (!p) return HANDLER_ERROR;
 
         p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *));
+        if (p->config_storage == NULL)
+                return HANDLER_ERROR;
 
         for (i = 0; i < srv->config_context->used; i++) {
                 plugin_config *s;
 
                 s = calloc(1, sizeof(plugin_config));
+                if (s == NULL)
+                        return HANDLER_ERROR;
 
                 s->server_root = buffer_init();
                 s->default_host = buffer_init();
@@ -225 +231 @@
         plugin_data *p = p_data;
 
         /*
-         * cache the last successfull translation from hostname (authority) to docroot
+         * cache the last successful translation from hostname (authority) to docroot
          * - this saves us a stat() call
          *
          */