[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/main/main.c trunk/main/main.c

[Pierre Joye]

pajoye                                   Thu, 20 Jan 2011 06:23:35 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=307610

Log:
- check if strdup succeeds

Changed paths:
    U   php/php-src/branches/PHP_5_3/main/main.c
    U   php/php-src/trunk/main/main.c

Modified: php/php-src/branches/PHP_5_3/main/main.c
===================================================================
--- php/php-src/branches/PHP_5_3/main/main.c    2011-01-20 01:59:14 UTC (rev 
307609)
+++ php/php-src/branches/PHP_5_3/main/main.c    2011-01-20 06:23:35 UTC (rev 
307610)
@@ -179,7 +179,9 @@
        }

        e = PG(disable_functions) = strdup(INI_STR("disable_functions"));
-
+       if (e == NULL) {
+               return;
+       }
        while (*e) {
                switch (*e) {
                        case ' ':
@@ -1672,8 +1674,9 @@
 {
 #ifdef PHP_WIN32
        if (!PG(com_initialized)) {
-               CoInitialize(NULL);
-               PG(com_initialized) = 1;
+               if (CoInitialize(NULL) == S_OK) {
+                       PG(com_initialized) = 1;
+               }
        }
 #endif
 }

Modified: php/php-src/trunk/main/main.c
===================================================================
--- php/php-src/trunk/main/main.c       2011-01-20 01:59:14 UTC (rev 307609)
+++ php/php-src/trunk/main/main.c       2011-01-20 06:23:35 UTC (rev 307610)
@@ -180,7 +180,9 @@
        }

        e = PG(disable_functions) = strdup(INI_STR("disable_functions"));
-
+       if (e == NULL) {
+               return;
+       }
        while (*e) {
                switch (*e) {
                        case ' ':
@@ -1715,8 +1717,9 @@
 {
 #ifdef PHP_WIN32
        if (!PG(com_initialized)) {
-               CoInitialize(NULL);
-               PG(com_initialized) = 1;
+               if (CoInitialize(NULL) == S_OK) {
+                       PG(com_initialized) = 1;
+               }
        }
 #endif
 }
@@ -1820,6 +1823,7 @@
        }
 }
 #endif
+EXTERN_C IMAGE_DOS_HEADER __ImageBase;

 /* {{{ php_module_startup
  */
@@ -1835,6 +1839,10 @@
        void ***tsrm_ls;
        php_core_globals *core_globals;
 #endif
+#ifdef PHP_WIN32
+       char module_path[MAX_PATH];
+#endif
+
 #if defined(PHP_WIN32) || (defined(NETWARE) && defined(USE_WINSOCK))
        WORD wVersionRequested = MAKEWORD(2, 0);
        WSADATA wsaData;
@@ -1854,7 +1862,15 @@
 #else
        php_os=PHP_OS;
 #endif
-
+       GetModuleFileName((HINSTANCE)&__ImageBase, module_path, MAX_PATH);
+       php_dirname(module_path, strlen(module_path));
+       {
+               char dll_dir[MAX_PATH];
+               sprintf(dll_dir, "%s\\%s", module_path, "..\\..\\deps\\bin");
+               SetDllDirectory(dll_dir);
+       }
+//     GetModuleFileName (NULL, module_path, MAX_PATH);
+//__debugbreak();
 #ifdef ZTS
        tsrm_ls = ts_resource(0);
 #endif


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php