remove obsolete patches noticed by wiz
This commit is contained in:
parent
9e76215ab8
commit
758f015796
2 changed files with 0 additions and 61 deletions
|
@ -1,38 +0,0 @@
|
|||
$NetBSD: patch-bc,v 1.1 2010/05/17 17:58:13 drochner Exp $
|
||||
|
||||
--- src/plugins/pgpinline/pgpinline.c.orig 2009-02-23 16:55:51.000000000 +0000
|
||||
+++ src/plugins/pgpinline/pgpinline.c
|
||||
@@ -583,9 +583,14 @@ static gboolean pgpinline_sign(MimeInfo
|
||||
|
||||
/* get content node from message */
|
||||
msgcontent = (MimeInfo *) mimeinfo->node->children->data;
|
||||
- if (msgcontent->type == MIMETYPE_MULTIPART)
|
||||
+ if (msgcontent->type == MIMETYPE_MULTIPART) {
|
||||
+ if (!msgcontent->node->children) {
|
||||
+ debug_print("msgcontent->node->children NULL, bailing\n");
|
||||
+ privacy_set_error(_("Malformed message"));
|
||||
+ return FALSE;
|
||||
+ }
|
||||
msgcontent = (MimeInfo *) msgcontent->node->children->data;
|
||||
-
|
||||
+ }
|
||||
/* get rid of quoted-printable or anything */
|
||||
procmime_decode_content(msgcontent);
|
||||
|
||||
@@ -768,9 +773,14 @@ static gboolean pgpinline_encrypt(MimeIn
|
||||
|
||||
/* get content node from message */
|
||||
msgcontent = (MimeInfo *) mimeinfo->node->children->data;
|
||||
- if (msgcontent->type == MIMETYPE_MULTIPART)
|
||||
+ if (msgcontent->type == MIMETYPE_MULTIPART) {
|
||||
+ if (!msgcontent->node->children) {
|
||||
+ debug_print("msgcontent->node->children NULL, bailing\n");
|
||||
+ privacy_set_error(_("Malformed message"));
|
||||
+ return FALSE;
|
||||
+ }
|
||||
msgcontent = (MimeInfo *) msgcontent->node->children->data;
|
||||
-
|
||||
+ }
|
||||
/* get rid of quoted-printable or anything */
|
||||
procmime_decode_content(msgcontent);
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
$NetBSD: patch-bd,v 1.1 2010/05/17 17:58:13 drochner Exp $
|
||||
|
||||
--- src/gtk/sslcertwindow.c.orig 2009-09-28 07:04:13.000000000 +0000
|
||||
+++ src/gtk/sslcertwindow.c
|
||||
@@ -267,12 +267,15 @@ static gboolean sslcert_ask_hook(gpointe
|
||||
{
|
||||
SSLCertHookData *hookdata = (SSLCertHookData *)source;
|
||||
|
||||
- if (prefs_common.skip_ssl_cert_check)
|
||||
- return TRUE;
|
||||
-
|
||||
if (hookdata == NULL) {
|
||||
return FALSE;
|
||||
}
|
||||
+
|
||||
+ if (prefs_common.skip_ssl_cert_check) {
|
||||
+ hookdata->accept = TRUE;
|
||||
+ return TRUE;
|
||||
+ }
|
||||
+
|
||||
if (hookdata->old_cert == NULL) {
|
||||
if (hookdata->expired)
|
||||
hookdata->accept = sslcertwindow_ask_expired_cert(hookdata->cert);
|
Loading…
Reference in a new issue