aboutsummaryrefslogtreecommitdiffstats
path: root/src/gpgconf.c
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2011-05-26 14:01:26 +0000
committerMarcus Brinkmann <[email protected]>2011-05-26 14:01:26 +0000
commitb34add3fe438a693e236a835135bd11b4e177daa (patch)
tree8b66e12d5c62112f33d244340b96638ac30454d8 /src/gpgconf.c
parentFix I/O callback example. (diff)
downloadgpgme-b34add3fe438a693e236a835135bd11b4e177daa.tar.gz
gpgme-b34add3fe438a693e236a835135bd11b4e177daa.zip
Check context pointers for null pointer on entry points.
Diffstat (limited to 'src/gpgconf.c')
-rw-r--r--src/gpgconf.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/gpgconf.c b/src/gpgconf.c
index 3c9d16b5..f3411d51 100644
--- a/src/gpgconf.c
+++ b/src/gpgconf.c
@@ -94,8 +94,12 @@ gpgme_op_conf_load (gpgme_ctx_t ctx, gpgme_conf_comp_t *conf_p)
{
#ifdef ENABLE_GPGCONF
gpgme_error_t err;
- gpgme_protocol_t proto = ctx->protocol;
+ gpgme_protocol_t proto;
+ if (!ctx)
+ return gpg_error (GPG_ERR_INV_VALUE);
+
+ proto = ctx->protocol;
ctx->protocol = GPGME_PROTOCOL_GPGCONF;
err = _gpgme_op_reset (ctx, 1);
if (err)
@@ -116,8 +120,12 @@ gpgme_op_conf_save (gpgme_ctx_t ctx, gpgme_conf_comp_t comp)
{
#ifdef ENABLE_GPGCONF
gpgme_error_t err;
- gpgme_protocol_t proto = ctx->protocol;
+ gpgme_protocol_t proto;
+
+ if (!ctx)
+ return gpg_error (GPG_ERR_INV_VALUE);
+ proto = ctx->protocol;
ctx->protocol = GPGME_PROTOCOL_GPGCONF;
err = _gpgme_op_reset (ctx, 1);
if (err)