Fix crash if empty certificate is provided in PKI list

pull/7/head
Timothy Pearson 5 years ago
parent c3ddf69f51
commit 47c8c58690

@ -1069,6 +1069,10 @@ int LDAPManager::updateUserInfo(LDAPUserInfo user, TQString *errstr) {
for (it = user.pkiCertificates.begin(); it != user.pkiCertificates.end(); ++it) { for (it = user.pkiCertificates.begin(); it != user.pkiCertificates.end(); ++it) {
PKICertificateEntry certificateData = *it; PKICertificateEntry certificateData = *it;
// Don't attempt to load empty certificates
if (certificateData.second.size() < 1)
continue;
TQCString ssldata(certificateData.second); TQCString ssldata(certificateData.second);
ssldata[certificateData.second.size()] = 0; ssldata[certificateData.second.size()] = 0;
ssldata.replace("-----BEGIN CERTIFICATE-----", ""); ssldata.replace("-----BEGIN CERTIFICATE-----", "");
@ -4750,6 +4754,10 @@ int LDAPManager::generatePKICRL(int expirydays, LDAPRealmConfig realmcfg, TQStri
for (it = user.pkiCertificates.begin(); it != user.pkiCertificates.end(); ++it) { for (it = user.pkiCertificates.begin(); it != user.pkiCertificates.end(); ++it) {
PKICertificateEntry certificateData = *it; PKICertificateEntry certificateData = *it;
// Don't attempt to load empty certificates
if (certificateData.second.size() < 1)
continue;
TQCString ssldata(certificateData.second); TQCString ssldata(certificateData.second);
ssldata[certificateData.second.size()] = 0; ssldata[certificateData.second.size()] = 0;
ssldata.replace("-----BEGIN CERTIFICATE-----", ""); ssldata.replace("-----BEGIN CERTIFICATE-----", "");

Loading…
Cancel
Save