From: Pierre Joye <pajoye@php.net>
Date: Thu, 28 Jul 2011 10:37:04 +0000 (+0000)
Subject: - Fix #55301 (pdo_odbc part) check if malloc succeded
X-Git-Tag: php-5.4.0alpha3~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f28c4eb113df5a6d9a6f37204d271cb578bfce8;p=php

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

diff --git a/ext/pdo_odbc/pdo_odbc.c b/ext/pdo_odbc/pdo_odbc.c
index 69ac263ac7..bc71aada53 100755
--- a/ext/pdo_odbc/pdo_odbc.c
+++ b/ext/pdo_odbc/pdo_odbc.c
@@ -98,6 +98,9 @@ PHP_MINIT_FUNCTION(pdo_odbc)
 		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);