From 2aad8d4fff920e14e68386ebc63783bc1dbc1d8b Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Fri, 15 Apr 2005 17:05:47 +0000 Subject: [PATCH] 2005-04-15 [colin] 1.9.6cvs36 * src/plugins/pgpmime/pgpmime.c Fix bus error on 64bit. Spotted by macallan1888@gmail.com --- ChangeLog-gtk2.claws | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/plugins/pgpmime/pgpmime.c | 4 ++-- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index a748a089f..934de2252 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,9 @@ +2005-04-15 [colin] 1.9.6cvs36 + + * src/plugins/pgpmime/pgpmime.c + Fix bus error on 64bit. Spotted by + macallan1888@gmail.com + 2005-04-15 [colin] 1.9.6cvs35 * src/prefs_account.c diff --git a/PATCHSETS b/PATCHSETS index 560df89e6..8cdfcc691 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -452,3 +452,4 @@ ( cvs diff -u -r 1.149.2.22 -r 1.149.2.23 src/inc.c; ) > 1.9.6cvs33.patchset ( cvs diff -u -r 1.105.2.21 -r 1.105.2.22 src/prefs_account.c; ) > 1.9.6cvs34.patchset ( cvs diff -u -r 1.105.2.22 -r 1.105.2.23 src/prefs_account.c; ) > 1.9.6cvs35.patchset +( cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/plugins/pgpmime/pgpmime.c; ) > 1.9.6cvs36.patchset diff --git a/configure.ac b/configure.ac index f7687ef43..a77033664 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=6 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=35 +EXTRA_VERSION=36 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/plugins/pgpmime/pgpmime.c b/src/plugins/pgpmime/pgpmime.c index fbc1346e9..a2487fd63 100644 --- a/src/plugins/pgpmime/pgpmime.c +++ b/src/plugins/pgpmime/pgpmime.c @@ -417,7 +417,7 @@ gboolean pgpmime_sign(MimeInfo *mimeinfo, PrefsAccount *account) gchar *boundary, *sigcontent; GpgmeCtx ctx; GpgmeData gpgtext, gpgsig; - guint len; + size_t len; struct passphrase_cb_info_s info; memset (&info, 0, sizeof info); @@ -505,7 +505,7 @@ gboolean pgpmime_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data) MimeInfo *msgcontent, *encmultipart, *newinfo; FILE *fp; gchar *boundary, *enccontent; - guint len; + size_t len; gchar *textstr; GpgmeData gpgtext, gpgenc; gchar **recipients, **nextrecp; -- 2.25.1