[packages/php.git] / php-5.2.17-bug-319457.patch

diff -up php-5.2.17/ext/oci8/oci8.c.bug-319457 php-5.2.17/ext/oci8/oci8.c
--- php-5.2.17/ext/oci8/oci8.c.bug-319457	2012-02-16 08:25:41.000000000 +0700
+++ php-5.2.17/ext/oci8/oci8.c	2012-02-16 08:26:55.000000000 +0700
@@ -1187,7 +1187,14 @@ open:
 			connection->is_persistent = 0;
 		} else {
 			connection = (php_oci_connection *) calloc(1, sizeof(php_oci_connection));
+			if (connection == NULL) {
+				return NULL;
+			}
 			connection->hash_key = zend_strndup(hashed_details.c, hashed_details.len);
+			if (connection->hash_key == NULL) {
+				free(connection);
+				return NULL;
+			}
 			connection->is_persistent = 1;
 		}
 	} else {
Commit	Line	Data
dcb8ab6c ER	1	diff -up php-5.2.17/ext/oci8/oci8.c.bug-319457 php-5.2.17/ext/oci8/oci8.c
	2	--- php-5.2.17/ext/oci8/oci8.c.bug-319457 2012-02-16 08:25:41.000000000 +0700
	3	+++ php-5.2.17/ext/oci8/oci8.c 2012-02-16 08:26:55.000000000 +0700
	4	@@ -1187,7 +1187,14 @@ open:
	5	connection->is_persistent = 0;
	6	} else {
	7	connection = (php_oci_connection *) calloc(1, sizeof(php_oci_connection));
	8	+ if (connection == NULL) {
	9	+ return NULL;
	10	+ }
	11	connection->hash_key = zend_strndup(hashed_details.c, hashed_details.len);
	12	+ if (connection->hash_key == NULL) {
	13	+ free(connection);
	14	+ return NULL;
	15	+ }
	16	connection->is_persistent = 1;
	17	}
	18	} else {