pidgin/pidgin

Fix use of uninitialised memory if running non-debug-enabled versions of glib
release-2.x.y
2017-02-19, Eion Robb
d51eda86db9e
Parents 9f4a1085a774
Children e85451478ebe
Fix use of uninitialised memory if running non-debug-enabled versions of glib
1 files changed, 4 insertions(+), 4 deletions(-)
  • +4 -4
    libpurple/plugins/ssl/ssl-nss.c
    • --- a/libpurple/plugins/ssl/ssl-nss.c Sat Feb 18 17:47:37 2017 +0000
    +++ b/libpurple/plugins/ssl/ssl-nss.c Sun Feb 19 03:30:18 2017 +0000
    @@ -1010,6 +1010,7 @@
    {
    CERTCertificate *crt_dat;
    PRTime nss_activ, nss_expir;
    + SECStatus cert_times_success;
    g_return_val_if_fail(crt, FALSE);
    g_return_val_if_fail(crt->scheme == &x509_nss, FALSE);
    @@ -1019,10 +1020,9 @@
    /* Extract the times into ugly PRTime thingies */
    /* TODO: Maybe this shouldn't throw an error? */
    - g_return_val_if_fail(
    - SECSuccess == CERT_GetCertTimes(crt_dat,
    - &nss_activ, &nss_expir),
    - FALSE);
    + cert_times_success = CERT_GetCertTimes(crt_dat,
    + &nss_activ, &nss_expir);
    + g_return_val_if_fail(cert_times_success == SECSuccess, FALSE);
    /* NSS's native PRTime type *almost* corresponds to time_t; however,
    it measures *microseconds* since the epoch, not seconds. Hence