From: Ilia Alshanetsky <iliaa@php.net>
Date: Mon, 16 Jul 2007 18:00:18 +0000 (+0000)
Subject: Fixed a possible crash inside the constructor
X-Git-Tag: php-5.2.4RC1~135
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39c17058488080377eedbb1b91e896c47ec12929;p=php

Fixed a possible crash inside the constructor
---

diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index cffc9863dd..2dddb57eeb 100755
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -364,23 +364,9 @@ static PHP_METHOD(PDO, dbh_constructor)
 		php_error_docref(NULL TSRMLS_CC, E_ERROR, "out of memory");
 	}
 
-	if (options) {
-		zval **attr_value;
-		char *str_key;
-		long long_key;
-			
-		zend_hash_internal_pointer_reset(Z_ARRVAL_P(options));
-		while (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(options), (void**)&attr_value) 
-			&& HASH_KEY_IS_LONG == zend_hash_get_current_key(Z_ARRVAL_P(options), &str_key, &long_key, 0)) {
-				
-			pdo_dbh_attribute_set(dbh, long_key, *attr_value TSRMLS_CC);
-			zend_hash_move_forward(Z_ARRVAL_P(options));
-		}
-	}
-
 	if (!call_factory) {
 		/* we got a persistent guy from our cache */
-		return;
+		goto options;
 	}
 
 	if (driver->db_handle_factory(dbh, options TSRMLS_CC)) {
@@ -404,8 +390,22 @@ static PHP_METHOD(PDO, dbh_constructor)
 		}
 
 		dbh->driver = driver;
+options:
+		if (options) {
+			zval **attr_value;
+			char *str_key;
+			long long_key;
+			
+			zend_hash_internal_pointer_reset(Z_ARRVAL_P(options));
+			while (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(options), (void**)&attr_value) 
+				&& HASH_KEY_IS_LONG == zend_hash_get_current_key(Z_ARRVAL_P(options), &str_key, &long_key, 0)) {
+				
+				pdo_dbh_attribute_set(dbh, long_key, *attr_value TSRMLS_CC);
+				zend_hash_move_forward(Z_ARRVAL_P(options));
+			}
+		}
 
-		return;	
+		return;
 	}
 
 	/* the connection failed; things will tidy up in free_storage */