Commit 55542219 authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

Ensure that ap_server_conf always points to valid data or is NULL. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1080784 13f79535-47bb-0310-9956-ffa450edef68
parent f5c80663

server/main.c

+4 −0
Changes for server/main.c: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -620,6 +620,8 @@ int main(int argc, const char * const argv[]) 
    if (!ap_server_conf) {

        destroy_and_exit_process(process, 1);

    }

    apr_pool_cleanup_register(pconf, &ap_server_conf, ap_pool_cleanup_set_null,

                              NULL);

    apr_hook_sort_all();



    if (ap_run_pre_config(pconf, plog, ptemp) != OK) {
@@ -706,6 +708,8 @@ int main(int argc, const char * const argv[]) 
        if (!ap_server_conf) {

            destroy_and_exit_process(process, 1);

        }

        apr_pool_cleanup_register(pconf, &ap_server_conf,

                                  ap_pool_cleanup_set_null, NULL);

        apr_hook_sort_all();



        if (ap_run_pre_config(pconf, plog, ptemp) != OK) {