Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd380d08

Browse files
committed
Fix some null pointer dereferences in LDAP auth code
An LDAP URL without a host name such as "ldap://" or without a base DNsuch as "ldap://localhost" would cause a crash when reading pg_hba.conf.If no binddn is configured, an error message might end up trying to print anull pointer, which could crash on some platforms.Author: Thomas Munro <thomas.munro@enterprisedb.com>Reviewed-by: Michael Paquier <michael.paquier@gmail.com>
1 parent859662c commitd380d08

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

‎src/backend/libpq/auth.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2205,7 +2205,8 @@ CheckLDAPAuth(Port *port)
22052205
{
22062206
ereport(LOG,
22072207
(errmsg("could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": %s",
2208-
port->hba->ldapbinddn,port->hba->ldapserver,ldap_err2string(r))));
2208+
port->hba->ldapbinddn ?port->hba->ldapbinddn :"",
2209+
port->hba->ldapserver,ldap_err2string(r))));
22092210
returnSTATUS_ERROR;
22102211
}
22112212

‎src/backend/libpq/hba.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1488,9 +1488,11 @@ parse_hba_auth_opt(char *name, char *val, HbaLine *hbaline, int line_num)
14881488
return false;
14891489
}
14901490

1491-
hbaline->ldapserver=pstrdup(urldata->lud_host);
1491+
if (urldata->lud_host)
1492+
hbaline->ldapserver=pstrdup(urldata->lud_host);
14921493
hbaline->ldapport=urldata->lud_port;
1493-
hbaline->ldapbasedn=pstrdup(urldata->lud_dn);
1494+
if (urldata->lud_dn)
1495+
hbaline->ldapbasedn=pstrdup(urldata->lud_dn);
14941496

14951497
if (urldata->lud_attrs)
14961498
hbaline->ldapsearchattribute=pstrdup(urldata->lud_attrs[0]);/* only use first one */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp