[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pdo_odbc/pdo_odbc.c branches/PHP_5_4/ext/pdo_odbc/pdo_odbc.c trunk/ext/pdo_odbc/pdo_odbc.c

[Pierre Joye]

pajoye                                   Thu, 28 Jul 2011 10:37:04 +0000

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

Log:
- Fix #55301 (pdo_odbc part) check if malloc succeded

Bug: https://bugs.php.net/55301 (error getting bug information)
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/pdo_odbc/pdo_odbc.c
    U   php/php-src/branches/PHP_5_4/ext/pdo_odbc/pdo_odbc.c
    U   php/php-src/trunk/ext/pdo_odbc/pdo_odbc.c

Modified: php/php-src/branches/PHP_5_3/ext/pdo_odbc/pdo_odbc.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_odbc/pdo_odbc.c        2011-07-28 
10:34:16 UTC (rev 313827)
+++ php/php-src/branches/PHP_5_3/ext/pdo_odbc/pdo_odbc.c        2011-07-28 
10:37:04 UTC (rev 313828)
@@ -98,6 +98,9 @@
                char *instance = INI_STR("pdo_odbc.db2_instance_name");
                if (instance) {
                        char *env = malloc(sizeof("DB2INSTANCE=") + 
strlen(instance));
+                       if (!env) {
+                               return FAILURE;
+                       }
                        strcpy(env, "DB2INSTANCE=");
                        strcat(env, instance);
                        putenv(env);

Modified: php/php-src/branches/PHP_5_4/ext/pdo_odbc/pdo_odbc.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo_odbc/pdo_odbc.c        2011-07-28 
10:34:16 UTC (rev 313827)
+++ php/php-src/branches/PHP_5_4/ext/pdo_odbc/pdo_odbc.c        2011-07-28 
10:37:04 UTC (rev 313828)
@@ -98,6 +98,9 @@
                char *instance = INI_STR("pdo_odbc.db2_instance_name");
                if (instance) {
                        char *env = malloc(sizeof("DB2INSTANCE=") + 
strlen(instance));
+                       if (!env) {
+                               return FAILURE;
+                       }
                        strcpy(env, "DB2INSTANCE=");
                        strcat(env, instance);
                        putenv(env);

Modified: php/php-src/trunk/ext/pdo_odbc/pdo_odbc.c
===================================================================
--- php/php-src/trunk/ext/pdo_odbc/pdo_odbc.c   2011-07-28 10:34:16 UTC (rev 
313827)
+++ php/php-src/trunk/ext/pdo_odbc/pdo_odbc.c   2011-07-28 10:37:04 UTC (rev 
313828)
@@ -98,6 +98,9 @@
                char *instance = INI_STR("pdo_odbc.db2_instance_name");
                if (instance) {
                        char *env = malloc(sizeof("DB2INSTANCE=") + 
strlen(instance));
+                       if (!env) {
+                               return FAILURE;
+                       }
                        strcpy(env, "DB2INSTANCE=");
                        strcat(env, instance);
                        putenv(env);


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