Skip to content

ext/odbc: Get the exact length for quoted connection string components #21892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NattyNarwhal merged 2 commits into from
Apr 29, 2026
Merged

ext/odbc: Get the exact length for quoted connection string components #21892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff708a4
ext/odbc: get exact length for quoted connection strings
NattyNarwhal Apr 27, 2026
b64de4e
ext/odbc: rename function now that it gets the exact length rather th…
NattyNarwhal Apr 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/odbc/odbc_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ PHP_FUNCTION(odbc_connection_string_quote)
Z_PARAM_STR(str)
ZEND_PARSE_PARAMETERS_END();

size_t new_size = php_odbc_connstr_estimate_quote_length(ZSTR_VAL(str));
size_t new_size = php_odbc_connstr_get_quoted_length(ZSTR_VAL(str));
zend_string *new_string = zend_string_alloc(new_size, 0);
php_odbc_connstr_quote(ZSTR_VAL(new_string), ZSTR_VAL(str), new_size);
/* reset length */
Expand Down
12 changes: 6 additions & 6 deletions ext/odbc/php_odbc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1951,9 +1951,9 @@ bool odbc_sqlconnect(zval *zv, char *db, char *uid, char *pwd, int cur_opt, bool
if (use_uid_arg) {
should_quote_uid = !php_odbc_connstr_is_quoted(uid) && php_odbc_connstr_should_quote(uid);
if (should_quote_uid) {
size_t estimated_length = php_odbc_connstr_estimate_quote_length(uid);
uid_quoted = emalloc(estimated_length);
php_odbc_connstr_quote(uid_quoted, uid, estimated_length);
size_t quoted_length = php_odbc_connstr_get_quoted_length(uid);
uid_quoted = emalloc(quoted_length);
php_odbc_connstr_quote(uid_quoted, uid, quoted_length);
} else {
uid_quoted = uid;
}
Expand All @@ -1966,9 +1966,9 @@ bool odbc_sqlconnect(zval *zv, char *db, char *uid, char *pwd, int cur_opt, bool
if (use_pwd_arg) {
should_quote_pwd = !php_odbc_connstr_is_quoted(pwd) && php_odbc_connstr_should_quote(pwd);
if (should_quote_pwd) {
size_t estimated_length = php_odbc_connstr_estimate_quote_length(pwd);
pwd_quoted = emalloc(estimated_length);
php_odbc_connstr_quote(pwd_quoted, pwd, estimated_length);
size_t quoted_length = php_odbc_connstr_get_quoted_length(pwd);
pwd_quoted = emalloc(quoted_length);
php_odbc_connstr_quote(pwd_quoted, pwd, quoted_length);
} else {
pwd_quoted = pwd;
}
Expand Down
12 changes: 6 additions & 6 deletions ext/pdo_odbc/odbc_driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,9 +548,9 @@ static int pdo_odbc_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /* {{{
if (use_uid_arg) {
should_quote_uid = !php_odbc_connstr_is_quoted(dbh->username) && php_odbc_connstr_should_quote(dbh->username);
if (should_quote_uid) {
size_t estimated_length = php_odbc_connstr_estimate_quote_length(dbh->username);
uid = emalloc(estimated_length);
php_odbc_connstr_quote(uid, dbh->username, estimated_length);
size_t quoted_length = php_odbc_connstr_get_quoted_length(dbh->username);
uid = emalloc(quoted_length);
php_odbc_connstr_quote(uid, dbh->username, quoted_length);
} else {
uid = dbh->username;
}
Expand All @@ -565,9 +565,9 @@ static int pdo_odbc_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /* {{{
if (use_pwd_arg) {
should_quote_pwd = !php_odbc_connstr_is_quoted(dbh->password) && php_odbc_connstr_should_quote(dbh->password);
if (should_quote_pwd) {
size_t estimated_length = php_odbc_connstr_estimate_quote_length(dbh->password);
pwd = emalloc(estimated_length);
php_odbc_connstr_quote(pwd, dbh->password, estimated_length);
size_t quoted_length = php_odbc_connstr_get_quoted_length(dbh->password);
pwd = emalloc(quoted_length);
php_odbc_connstr_quote(pwd, dbh->password, quoted_length);
} else {
pwd = dbh->password;
}
Expand Down
16 changes: 12 additions & 4 deletions main/php_odbc_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,20 @@ PHPAPI bool php_odbc_connstr_should_quote(const char *str)
}

/**
* Estimates the worst-case scenario for a quoted version of a string's size.
* Gets the length of a string after it has been quoted.
*/
PHPAPI size_t php_odbc_connstr_estimate_quote_length(const char *in_str)
PHPAPI size_t php_odbc_connstr_get_quoted_length(const char *in_str)
{
/* Assume all '}'. Include '{,' '}', and the null terminator too */
return (strlen(in_str) * 2) + 3;
/* Start with including the quotes ({}) and the null terminator */
size_t size = 3;
/* Scan the string like strlen, doubling each } character. */
while (*in_str) {
size++;
if (*in_str++ == '}') {
size++;
}
}
return size;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion main/php_odbc_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@

PHPAPI bool php_odbc_connstr_is_quoted(const char *str);
PHPAPI bool php_odbc_connstr_should_quote(const char *str);
PHPAPI size_t php_odbc_connstr_estimate_quote_length(const char *in_str);
PHPAPI size_t php_odbc_connstr_get_quoted_length(const char *in_str);
PHPAPI size_t php_odbc_connstr_quote(char *out_str, const char *in_str, size_t out_str_size);
Loading