* When downloading a signed message, and processing it, we use

     body->nested.part instead of b->nested.part in the
     do_detached_signature_verify function, and save its body and mime
     headers in create_local_cache. Now all signed messages should
     verify correctly.

   * Protect against potential crash bug in write_passfile function by
     checking if text != NULL. text can only be null if there are no
     passwords to save. We assume we could get write_passfile called
     with null arguments, so this is just to protect that.

   * Add handling of corner cases to several functions by initializing some
     variables. Reported and patched by James Jerkins.

   * When selecting the certificate/key pair to encrypt/decrypt the password
     file choose it in this order:
	- if -pwdcertdir is given look for certificates there, if nothing
	  there, we bail out;
	- otherwise we look in the default directory, if anything there
	  and it matches to be a key/cert pair, we use it;
	- otherwise we check if smime_init() has been called. If not
	  we call it;
	- we check if a key/cert pair has been found with smime initialized,
	  if so, use it and copy it to the default directory;
	- if not, check if there is anything in the default smime directories
	  (.alpine-smime/private and .alpine-smime/public), and in this
	  case copy it to the default.
	- otherwise we bail. We will eventually create a certificate/key
	  pair for the user;
	- finally, if we called smime_init(), we call smime_deinit().

	Throughout this process, if smime_init() was not called before
	we tried to get the cert/key pair we exit this process without
	ps_global->smime->inited set, so that other process that need
	to call smime_init() get the right structure initialized. This is
	done because we might pick a cert/key pair to decrypt the password
	file.

1 files changed, 3 insertions, 5 deletions

diff --git a/pith/filter.c b/pith/filter.c
index d22b1215..c60416b1 100644
--- a/pith/filter.c
+++ b/pith/filter.c
@@ -3696,7 +3696,6 @@ html_pop(FILTER_S *fd, ELPROP_S *ep)
 
     for(tp = HANDLERS(fd); tp && ep != EL(tp); tp = tp->below){
 	HANDLER_S *tp2;
-	ELPROP_S  *ep2;
 	
 	dprint((3, "-- html error: bad nesting: given /%s expected /%s", ep->element, EL(tp)->element));
 	/* if no evidence of opening tag, ignore given closing tag */
@@ -6931,7 +6930,7 @@ rss_title(HANDLER_S *hd, int ch, int cmd)
 	    RSS_ITEM_S *rip;
 
 	    if(feed){
-		if(rip = feed->items){
+		if((rip = feed->items) != NULL){
 		    for(; rip->next; rip = rip->next)
 		      ;
 
@@ -7025,7 +7024,7 @@ rss_link(HANDLER_S *hd, int ch, int cmd)
 	    RSS_ITEM_S *rip;
 
 	    if(feed){
-		if(rip = feed->items){
+		if((rip = feed->items) != NULL){
 		    for(; rip->next; rip = rip->next)
 		      ;
 
@@ -7078,7 +7077,7 @@ rss_description(HANDLER_S *hd, int ch, int cmd)
 	    RSS_ITEM_S *rip;
 
 	    if(feed){
-		if(rip = feed->items){
+		if((rip = feed->items) != NULL){
 		    for(; rip->next; rip = rip->next)
 		      ;
 
@@ -8886,7 +8885,6 @@ void *
 gf_html2plain_rss_opt(RSS_FEED_S **feedp, int flags)
 {
     HTML_OPT_S *op;
-    int		margin_l, margin_r;
 
     op = (HTML_OPT_S *) fs_get(sizeof(HTML_OPT_S));
     memset(op, 0, sizeof(HTML_OPT_S));