If pk is NULL, the backend would segfault when accessing ->algo and the

following NULL check was never reached.

This problem was found by Coccinelle (null_ref.cocci from coccicheck).

Marti Raudsepp

diff --git a/contrib/pgcrypto/pgp-pubenc.c b/contrib/pgcrypto/pgp-pubenc.c
index 4b4d1bfb44c422d4742e07780fee9545e16862bb..943d2e49f57d5d1141f6cdb994bfe85835766baa 100644 (file)
--- a/contrib/pgcrypto/pgp-pubenc.c
+++ b/contrib/pgcrypto/pgp-pubenc.c
@@ -199,7 +199,7 @@ pgp_write_pubenc_sesskey(PGP_Context *ctx, PushFilter *dst)
    PGP_PubKey *pk = ctx->pub_key;
    uint8       ver = 3;
    PushFilter *pkt = NULL;
-   uint8       algo = pk->algo;
+   uint8       algo;
 
    if (pk == NULL)
    {
@@ -207,6 +207,8 @@ pgp_write_pubenc_sesskey(PGP_Context *ctx, PushFilter *dst)
        return PXE_BUG;
    }
 
+   algo = pk->algo;
+
    /*
     * now write packet
     */