Attachment 2776 Details for Bug 11854 – Small problem, apr_app_init can be called multiple times, this patch also resets the initialized flag to prevent double-initialization.

[patch] Small problem, apr_app_init can be called multiple times, this patch also resets the initialized flag to prevent double-initialization.

fix_start.c.patch (text/plain), 1.17 KB, created by William A. Rowe Jr. on 2002-08-20 14:03:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: William A. Rowe Jr.

Created: 2002-08-20 14:03:34 UTC

Size: 1.17 KB

patch

obsolete

>Index: srclib/apr/misc/win32/start.c
>===================================================================
>RCS file: /home/cvs/apr/misc/win32/start.c,v
>retrieving revision 1.39
>diff -u -r1.39 start.c
>--- srclib/apr/misc/win32/start.c	10 Jul 2002 06:01:12 -0000	1.39
>+++ srclib/apr/misc/win32/start.c	20 Aug 2002 14:01:24 -0000
>@@ -133,6 +133,12 @@
>                                              const char * const * *argv, 
>                                              const char * const * *env)
> {
>+    apr_status_t rv = apr_initialize();
>+
>+    if (rv != APR_SUCCESS) {
>+        return rv;
>+    }
>+
> #if APR_HAS_UNICODE_FS
>     IF_WIN_OS_IS_UNICODE
>     {
>@@ -142,9 +148,11 @@
>         int dupenv;
> 
>         if (apr_app_init_complete) {
>-            return apr_initialize();
>+            return rv;
>         }
> 
>+        apr_app_init_complete = 1;
>+
>         sysstr = GetCommandLineW();
>         if (sysstr) {
>             wstrs = CommandLineToArgvW(sysstr, &wstrc);
>@@ -178,10 +186,9 @@
>             free(wenv);
>         }
> 
>-        apr_app_init_complete = 1;
>     }
> #endif
>-    return apr_initialize();
>+    return rv;
> }
> 
> static int initialized = 0;

Actions: View | Diff

Attachments on bug 11854: 2775 | 2776