diff options
| author | David Shaw <[email protected]> | 2007-07-06 23:36:33 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2007-07-06 23:36:33 +0000 |
| commit | de50a5a1e79401f4caa1570ee2517d5e1461f278 (patch) | |
| tree | af61f3717e28e84e75a78d5e91402b458a47a755 | |
| parent | * mk-w32-dist: Remove underline markup from man pages. Reported (diff) | |
| download | gnupg-de50a5a1e79401f4caa1570ee2517d5e1461f278.tar.gz gnupg-de50a5a1e79401f4caa1570ee2517d5e1461f278.zip | |
* encode.c (encode_crypt): Missed one call to setup_plaintext_name().
This is bug#809.
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/encode.c | 18 |
2 files changed, 7 insertions, 16 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 6434c584b..898a7fa6b 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2007-07-06 David Shaw <[email protected]> + + * encode.c (encode_crypt): Missed one call to + setup_plaintext_name(). This is bug#809. + 2007-06-12 David Shaw <[email protected]> * sign.c (mk_notation_policy_etc): expect all sigs that this is diff --git a/g10/encode.c b/g10/encode.c index 251ea3e2c..0315a8dce 100644 --- a/g10/encode.c +++ b/g10/encode.c @@ -557,22 +557,8 @@ encode_crypt( const char *filename, STRLIST remusr, int use_symkey ) if(use_symkey && (rc=write_symkey_enc(symkey_s2k,symkey_dek,cfx.dek,out))) goto leave; - if (!opt.no_literal) { - /* setup the inner packet */ - if( filename || opt.set_filename ) { - char *s = make_basename( opt.set_filename ? opt.set_filename - : filename, - iobuf_get_real_fname( inp ) ); - pt = xmalloc( sizeof *pt + strlen(s) - 1 ); - pt->namelen = strlen(s); - memcpy(pt->name, s, pt->namelen ); - xfree(s); - } - else { /* no filename */ - pt = xmalloc( sizeof *pt - 1 ); - pt->namelen = 0; - } - } + if (!opt.no_literal) + pt=setup_plaintext_name(filename,inp); if (!iobuf_is_pipe_filename (filename) && *filename && !opt.textmode ) { |