GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix segv in printf like functions.

Browse Source
This commit is contained in:
Werner Koch 2009-12-01 11:00:27 +00:00
parent 56af8b77e6
commit dce41d1ffa
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ChangeLog
View File

@ -1,3 +1,12 @@
2009-12-01 Werner Koch <wk@g10code.com>
* gpgme-tool.c (GT_GCC_A_SENTINEL, GT_GCC_A_PRINTF): New.
(gt_write_status): Use sentinel.
(argp_error, log_error): Use printf attribute.
(argp_parse): Remove extra argument to argp_error.
(_gt_progress_cb, gt_get_engine_info, gt_get_keylist_mode)
(gt_result): Add NULL arg.
2009-11-26 Marcus Brinkmann <marcus@g10code.de> 2009-11-26 Marcus Brinkmann <marcus@g10code.de>
* opassuan.c (opassuan_start): Allocate result structure before * opassuan.c (opassuan_start): Allocate result structure before

37
src/gpgme-tool.c
View File

@ -39,6 +39,21 @@
#include "gpgme.h" #include "gpgme.h"
/* GCC attributes. */
#if __GNUC__ >= 4
# define GT_GCC_A_SENTINEL(a) __attribute__ ((sentinel(a)))
#else
# define GT_GCC_A_SENTINEL(a)
#endif
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 )
# define GT_GCC_A_PRINTF(f, a) __attribute__ ((format (printf,f,a)))
#else
# define GT_GCC_A_PRINTF(f, a)
#endif
#ifndef HAVE_ARGP_H #ifndef HAVE_ARGP_H
/* Minimal argp implementation. */ /* Minimal argp implementation. */
@ -135,6 +150,11 @@ struct argp
| ARGP_HELP_DOC | ARGP_HELP_BUG_ADDR) | ARGP_HELP_DOC | ARGP_HELP_BUG_ADDR)
void argp_error (const struct argp_state *state,
const char *fmt, ...) GT_GCC_A_PRINTF(2, 3);
char * char *
_argp_pname (char *name) _argp_pname (char *name)
{ {
@ -397,7 +417,7 @@ argp_parse (const struct argp *argp, int argc,
rc = argp->parser (ARGP_KEY_ARGS, NULL, &state); rc = argp->parser (ARGP_KEY_ARGS, NULL, &state);
if (rc == ARGP_ERR_UNKNOWN) if (rc == ARGP_ERR_UNKNOWN)
{ {
argp_error (&state, "Too many arguments", state.argv[idx]); argp_error (&state, "Too many arguments");
goto argperror; goto argperror;
} }
if (! rc && state.next == old_next) if (! rc && state.next == old_next)
@ -450,6 +470,10 @@ argp_parse (const struct argp *argp, int argc,
FILE *log_stream; FILE *log_stream;
char *program_name = "gpgme-tool"; char *program_name = "gpgme-tool";
void log_error (int status, gpg_error_t errnum,
const char *fmt, ...) GT_GCC_A_PRINTF(3,4);
void void
log_init (void) log_init (void)
{ {
@ -518,7 +542,8 @@ typedef struct gpgme_tool *gpgme_tool_t;
/* Forward declaration. */ /* Forward declaration. */
void gt_write_status (gpgme_tool_t gt, status_t status, ...); void gt_write_status (gpgme_tool_t gt,
status_t status, ...) GT_GCC_A_SENTINEL(0);
void void
_gt_progress_cb (void *opaque, const char *what, _gt_progress_cb (void *opaque, const char *what,
@ -528,7 +553,7 @@ _gt_progress_cb (void *opaque, const char *what,
char buf[100]; char buf[100];
snprintf (buf, sizeof (buf), "0x%02x %i %i", type, current, total); snprintf (buf, sizeof (buf), "0x%02x %i %i", type, current, total);
gt_write_status (gt, STATUS_PROGRESS, what, buf); gt_write_status (gt, STATUS_PROGRESS, what, buf, NULL);
} }
@ -763,7 +788,7 @@ gt_get_engine_info (gpgme_tool_t gt, gpgme_protocol_t proto)
gt_write_status (gt, STATUS_ENGINE, gt_write_status (gt, STATUS_ENGINE,
gpgme_get_protocol_name (info->protocol), gpgme_get_protocol_name (info->protocol),
info->file_name, info->version, info->file_name, info->version,
info->req_version, info->home_dir); info->req_version, info->home_dir, NULL);
info = info->next; info = info->next;
} }
return 0; return 0;
@ -896,7 +921,7 @@ gt_get_keylist_mode (gpgme_tool_t gt)
modes[idx++] = NULL; modes[idx++] = NULL;
gt_write_status (gt, STATUS_KEYLIST_MODE, modes[0], modes[1], modes[2], gt_write_status (gt, STATUS_KEYLIST_MODE, modes[0], modes[1], modes[2],
modes[3], modes[4], modes[5], modes[6]); modes[3], modes[4], modes[5], modes[6], NULL);
return 0; return 0;
} }
@ -1117,7 +1142,7 @@ gt_result (gpgme_tool_t gt, unsigned int flags)
while (invrec) while (invrec)
{ {
gt_write_status (gt, STATUS_ENCRYPT_RESULT, "invalid_recipient", gt_write_status (gt, STATUS_ENCRYPT_RESULT, "invalid_recipient",
invrec->fpr, invrec->reason); invrec->fpr, invrec->reason, NULL);
invrec = invrec->next; invrec = invrec->next;
} }
} }