From e7f58ab193f71250071a80b730189d8850bd80d7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 3 Jun 2020 05:12:21 -0500 Subject: [PATCH] Fix a few more potential crashes when attempting to load empty certificates --- src/userconfigdlg.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/userconfigdlg.cpp b/src/userconfigdlg.cpp index 2fac3d6..f42325c 100644 --- a/src/userconfigdlg.cpp +++ b/src/userconfigdlg.cpp @@ -402,6 +402,10 @@ void UserConfigDialog::downloadPKICertificate() { for (it = m_user.pkiCertificates.begin(); it != m_user.pkiCertificates.end(); ++it) { PKICertificateEntry certificateData = *it; + // Don't attempt to load empty certificates + if (certificateData.second.size() < 1) + continue; + TQCString ssldata(certificateData.second); ssldata[certificateData.second.size()] = 0; ssldata.replace("-----BEGIN CERTIFICATE-----", ""); @@ -444,6 +448,10 @@ void UserConfigDialog::revokePKICertificate() { for (it = m_user.pkiCertificates.begin(); it != m_user.pkiCertificates.end(); ++it) { PKICertificateEntry certificateData = *it; + // Don't attempt to load empty certificates + if (certificateData.second.size() < 1) + continue; + TQCString ssldata(certificateData.second); ssldata[certificateData.second.size()] = 0; ssldata.replace("-----BEGIN CERTIFICATE-----", "");