ZendMM can't fail, omit checks

Author: NattyNarwhal

ext/odbc/php_odbc.c

@@ -2183,47 +2183,27 @@ int odbc_sqlconnect(odbc_connection **conn, char *db, char *uid, char *pwd, int
 				char *uid_quoted = NULL, *pwd_quoted = NULL;
 				bool should_quote_uid = !php_odbc_connstr_is_quoted(uid) && php_odbc_connstr_should_quote(uid);
 				bool should_quote_pwd = !php_odbc_connstr_is_quoted(pwd) && php_odbc_connstr_should_quote(pwd);
-				bool connection_string_fail = false;
 				if (should_quote_uid) {
 					size_t estimated_length = php_odbc_connstr_estimate_quote_length(uid);
 					uid_quoted = emalloc(estimated_length);
-					if (!uid_quoted) {
-						connection_string_fail = true;
-						goto connection_string_fail;
-					}
 					php_odbc_connstr_quote(uid_quoted, uid, estimated_length);
 				} else {
 					uid_quoted = uid;
 				}
 				if (should_quote_pwd) {
 					size_t estimated_length = php_odbc_connstr_estimate_quote_length(pwd);
 					pwd_quoted = emalloc(estimated_length);
-					if (!pwd_quoted) {
-						connection_string_fail = true;
-						goto connection_string_fail;
-					}
 					php_odbc_connstr_quote(pwd_quoted, pwd, estimated_length);
 				} else {
 					pwd_quoted = pwd;
 				}
 				spprintf(&ldb, 0, "%s;UID=%s;PWD=%s", db, uid_quoted, pwd_quoted);
-connection_string_fail:
 				if (uid_quoted && should_quote_uid) {
 					efree(uid_quoted);
 				}
 				if (pwd_quoted && should_quote_pwd) {
 					efree(pwd_quoted);
 				}
-				/*
-				 * In the PDO version, we fail, but we don't
-				 * really have the facility for that, so fall
-				 * back to the old unquoted case. Note that
-				 * the success case hasn't been allocated, so
-				 * it should be safe.
-				 */
-				if (connection_string_fail) {
-					spprintf(&ldb, 0, "%s;UID=%s;PWD=%s", db, uid, pwd);
-				}
 			} else {
 				ldb_len = strlen(db)+1;
 				ldb = (char*) emalloc(ldb_len);

ext/pdo_odbc/odbc_driver.c

@@ -497,25 +497,16 @@ static int pdo_odbc_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /* {{{
 			char *uid = NULL, *pwd = NULL;
 			bool should_quote_uid = !php_odbc_connstr_is_quoted(dbh->username) && php_odbc_connstr_should_quote(dbh->username);
 			bool should_quote_pwd = !php_odbc_connstr_is_quoted(dbh->password) && php_odbc_connstr_should_quote(dbh->password);
-			bool connection_string_fail = false;
 			if (should_quote_uid) {
 				size_t estimated_length = php_odbc_connstr_estimate_quote_length(dbh->username);
 				uid = emalloc(estimated_length);
-				if (!uid) {
-					connection_string_fail = true;
-					goto connection_string_fail;
-				}
 				php_odbc_connstr_quote(uid, dbh->username, estimated_length);
 			} else {
 				uid = dbh->username;
 			}
 			if (should_quote_pwd) {
 				size_t estimated_length = php_odbc_connstr_estimate_quote_length(dbh->password);
 				pwd = emalloc(estimated_length);
-				if (!pwd) {
-					connection_string_fail = true;
-					goto connection_string_fail;
-				}
 				php_odbc_connstr_quote(pwd, dbh->password, estimated_length);
 			} else {
 				pwd = dbh->password;
@@ -524,25 +515,15 @@ static int pdo_odbc_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /* {{{
 				+ strlen(uid) + strlen(pwd)
 				+ strlen(";UID=;PWD=") + 1;
 			char *dsn = pemalloc(new_dsn_size, dbh->is_persistent);
-			if (dsn == NULL) {
-				connection_string_fail = true;
-				/* XXX: Do we inform the caller? */
-				goto connection_string_fail;
-			}
 			snprintf(dsn, new_dsn_size, "%s;UID=%s;PWD=%s", dbh->data_source, uid, pwd);
 			pefree((char*)dbh->data_source, dbh->is_persistent);
 			dbh->data_source = dsn;
-			/* Convoluted label to handle freeing in this scope */
-connection_string_fail:
 			if (uid && should_quote_uid) {
 				efree(uid);
 			}
 			if (pwd && should_quote_pwd) {
 				efree(pwd);
 			}
-			if (connection_string_fail) {
-				goto fail;
-			}
 		}
 
 		rc = SQLDriverConnect(H->dbc, NULL, (SQLCHAR *) dbh->data_source, strlen(dbh->data_source),