aboutsummaryrefslogtreecommitdiffstats
path: root/src/import.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/import.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/import.c')
-rw-r--r--src/import.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/import.c b/src/import.c
index 784ce165..3bc74413 100644
--- a/src/import.c
+++ b/src/import.c
@@ -289,6 +289,9 @@ gpgme_op_import_start (gpgme_ctx_t ctx, gpgme_data_t keydata)
TRACE_BEG1 (DEBUG_CTX, "gpgme_op_import_start", ctx,
"keydata=%p", keydata);
+ if (!ctx)
+ return TRACE_ERR (gpg_error (GPG_ERR_INV_VALUE));
+
err = _gpgme_op_import_start (ctx, 0, keydata);
return TRACE_ERR (err);
}
@@ -303,6 +306,9 @@ gpgme_op_import (gpgme_ctx_t ctx, gpgme_data_t keydata)
TRACE_BEG1 (DEBUG_CTX, "gpgme_op_import", ctx,
"keydata=%p", keydata);
+ if (!ctx)
+ return TRACE_ERR (gpg_error (GPG_ERR_INV_VALUE));
+
err = _gpgme_op_import_start (ctx, 1, keydata);
if (!err)
err = _gpgme_wait_one (ctx);
@@ -365,6 +371,10 @@ gpgme_op_import_keys_start (gpgme_ctx_t ctx, gpgme_key_t *keys)
gpg_error_t err;
TRACE_BEG (DEBUG_CTX, "gpgme_op_import_keys_start", ctx);
+
+ if (!ctx)
+ return TRACE_ERR (gpg_error (GPG_ERR_INV_VALUE));
+
if (_gpgme_debug_trace () && keys)
{
int i = 0;
@@ -400,6 +410,10 @@ gpgme_op_import_keys (gpgme_ctx_t ctx, gpgme_key_t *keys)
gpgme_error_t err;
TRACE_BEG (DEBUG_CTX, "gpgme_op_import_keys", ctx);
+
+ if (!ctx)
+ return TRACE_ERR (gpg_error (GPG_ERR_INV_VALUE));
+
if (_gpgme_debug_trace () && keys)
{
int i = 0;