2005-10-19 [colin] 1.9.15cvs77
* src/plugins/pgpinline/pgpinline.c * src/plugins/pgpmime/pgpmime.c Check that my_tmpfile() doesn't return NULL
This commit is contained in:
parent
b450e8dddb
commit
7e1e27da3a
5 changed files with 33 additions and 1 deletions
|
@ -1,3 +1,10 @@
|
|||
2005-10-19 [colin] 1.9.15cvs77
|
||||
|
||||
* src/plugins/pgpinline/pgpinline.c
|
||||
* src/plugins/pgpmime/pgpmime.c
|
||||
Check that my_tmpfile() doesn't
|
||||
return NULL
|
||||
|
||||
2005-10-19 [colin] 1.9.15cvs76
|
||||
|
||||
* src/common/utils.c
|
||||
|
|
|
@ -913,3 +913,4 @@
|
|||
( cvs diff -u -r 1.213.2.64 -r 1.213.2.65 src/folder.c; cvs diff -u -r 1.207.2.74 -r 1.207.2.75 src/folderview.c; ) > 1.9.15cvs74.patchset
|
||||
( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 sylpheed-claws.desktop; cvs diff -u -r 1.155.2.33 -r 1.155.2.34 src/Makefile.am; cvs diff -u -r 1.207.2.75 -r 1.207.2.76 src/folderview.c; cvs diff -u -r 1.115.2.60 -r 1.115.2.61 src/main.c; cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/wizard.c; ) > 1.9.15cvs75.patchset
|
||||
( cvs diff -u -r 1.382.2.184 -r 1.382.2.185 src/compose.c; cvs diff -u -r 1.36.2.45 -r 1.36.2.46 src/common/utils.c; cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/plugins/pgpmime/pgpmime.c; ) > 1.9.15cvs76.patchset
|
||||
( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpinline/pgpinline.c; cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/plugins/pgpmime/pgpmime.c; ) > 1.9.15cvs77.patchset
|
||||
|
|
|
@ -11,7 +11,7 @@ MINOR_VERSION=9
|
|||
MICRO_VERSION=15
|
||||
INTERFACE_AGE=0
|
||||
BINARY_AGE=0
|
||||
EXTRA_VERSION=76
|
||||
EXTRA_VERSION=77
|
||||
EXTRA_RELEASE=
|
||||
EXTRA_GTK2_VERSION=
|
||||
|
||||
|
|
|
@ -401,6 +401,10 @@ static gboolean pgpinline_sign(MimeInfo *mimeinfo, PrefsAccount *account)
|
|||
procmime_decode_content(msgcontent);
|
||||
|
||||
fp = my_tmpfile();
|
||||
if (fp == NULL) {
|
||||
perror("my_tmpfile");
|
||||
return FALSE;
|
||||
}
|
||||
procmime_write_mimeinfo(msgcontent, fp);
|
||||
rewind(fp);
|
||||
|
||||
|
@ -514,6 +518,10 @@ static gboolean pgpinline_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
|
|||
procmime_decode_content(msgcontent);
|
||||
|
||||
fp = my_tmpfile();
|
||||
if (fp == NULL) {
|
||||
perror("my_tmpfile");
|
||||
return FALSE;
|
||||
}
|
||||
procmime_write_mimeinfo(msgcontent, fp);
|
||||
rewind(fp);
|
||||
|
||||
|
|
|
@ -196,6 +196,10 @@ static gint pgpmime_check_signature(MimeInfo *mimeinfo)
|
|||
parent = procmime_mimeinfo_parent(mimeinfo);
|
||||
|
||||
fp = g_fopen(parent->data.filename, "rb");
|
||||
if (fp == NULL) {
|
||||
perror("my_tmpfile");
|
||||
return 0;
|
||||
}
|
||||
g_return_val_if_fail(fp != NULL, SIGNATURE_INVALID);
|
||||
|
||||
boundary = g_hash_table_lookup(parent->typeparameters, "boundary");
|
||||
|
@ -404,6 +408,10 @@ gboolean pgpmime_sign(MimeInfo *mimeinfo, PrefsAccount *account)
|
|||
gchar *test_msg;
|
||||
|
||||
fp = my_tmpfile();
|
||||
if (fp == NULL) {
|
||||
perror("my_tmpfile");
|
||||
return FALSE;
|
||||
}
|
||||
procmime_write_mimeinfo(mimeinfo, fp);
|
||||
rewind(fp);
|
||||
|
||||
|
@ -439,6 +447,10 @@ gboolean pgpmime_sign(MimeInfo *mimeinfo, PrefsAccount *account)
|
|||
|
||||
/* write message content to temporary file */
|
||||
fp = my_tmpfile();
|
||||
if (fp == NULL) {
|
||||
perror("my_tmpfile");
|
||||
return FALSE;
|
||||
}
|
||||
procmime_write_mimeinfo(sigmultipart, fp);
|
||||
rewind(fp);
|
||||
|
||||
|
@ -561,6 +573,10 @@ gboolean pgpmime_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
|
|||
|
||||
/* write message content to temporary file */
|
||||
fp = my_tmpfile();
|
||||
if (fp == NULL) {
|
||||
perror("my_tmpfile");
|
||||
return FALSE;
|
||||
}
|
||||
procmime_write_mimeinfo(encmultipart, fp);
|
||||
rewind(fp);
|
||||
|
||||
|
|
Loading…
Reference in a new issue