2005-04-15 [colin] 1.9.6cvs36

	* src/plugins/pgpmime/pgpmime.c
		Fix bus error on 64bit. Spotted by
		macallan1888@gmail.com

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index a748a089f1f4a3a3f693771f75c70dcabf2aff3e..934de2252e349a9043f3e32587ced7abbd9c66e9 100644 (file)
--- 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 560df89e62981c76672e0c0e824106cf5123700b..8cdfcc691271dbeabd1195c55cf98223d9f79a76 100644 (file)
--- 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 f7687ef434e27a4daaa3a77e526add27b9ed8ec7..a770336641d21bf4c788dddebd79f66c19e257a8 100644 (file)
--- 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 fbc1346e9aaf452e5c63ef2b4c0a6ceecbe21069..a2487fd6368001720dbd3083534f2850b8016304 100644 (file)
--- 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;