From 35fb0955cc7b373bcc830a7b8e478539114e38c1 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Wed, 29 Nov 2006 19:21:18 +0000 Subject: [PATCH] 2006-11-29 Marcus Brinkmann * engine-gpgsm.c (gpgsm_new): Check return value of assuan_pipe_connect. --- trunk/gpgme/ChangeLog | 3 +++ trunk/gpgme/engine-gpgsm.c | 3 ++- trunk/gpgme/gpgme.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog index b158718..71efca6 100644 --- a/trunk/gpgme/ChangeLog +++ b/trunk/gpgme/ChangeLog @@ -1,5 +1,8 @@ 2006-11-29 Marcus Brinkmann + * engine-gpgsm.c (gpgsm_new): Check return value of + assuan_pipe_connect. + * rungpg.c: Include . (gpg_new): Support --display, --ttyname, --ttytype, --lc-ctype and --lc-messages. Fixes issue 734. diff --git a/trunk/gpgme/engine-gpgsm.c b/trunk/gpgme/engine-gpgsm.c index 44dbd1f..82b3fa8 100644 --- a/trunk/gpgme/engine-gpgsm.c +++ b/trunk/gpgme/engine-gpgsm.c @@ -406,7 +406,8 @@ gpgsm_new (void **engine, const char *file_name, const char *home_dir, err = assuan_pipe_connect (&gpgsm->assuan_ctx, file_name ? file_name : _gpgme_get_gpgsm_path (), argv, child_fds); - /* FIXME: Check error. */ + if (err) + goto leave; /* We need to know the fd used by assuan for reads. We do this by using the assumption that the first returned fd from diff --git a/trunk/gpgme/gpgme.h b/trunk/gpgme/gpgme.h index ac66242..6251a2f 100644 --- a/trunk/gpgme/gpgme.h +++ b/trunk/gpgme/gpgme.h @@ -72,7 +72,7 @@ extern "C" { AM_PATH_GPGME macro) check that this header matches the installed library. Warning: Do not edit the next line. configure will do that for you! */ -#define GPGME_VERSION "1.1.3-cvs1179" +#define GPGME_VERSION "1.1.3-cvs1188" -- 2.26.2