From 0173cd5a9810622e38b76123528e83024fb59a0c Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Wed, 6 Dec 2006 10:16:50 +0000
Subject: Fixes for CVE-2006-6235

---
 g10/gpg.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'g10/gpg.c')

diff --git a/g10/gpg.c b/g10/gpg.c
index dde5c6e56..846842054 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1753,7 +1753,7 @@ main (int argc, char **argv )
     int may_coredump;
     strlist_t sl, remusr= NULL, locusr=NULL;
     strlist_t nrings=NULL, sec_nrings=NULL;
-    armor_filter_context_t afx;
+    armor_filter_context_t *afx = NULL;
     int detached_sig = 0;
     FILE *configfp = NULL;
     char *configname = NULL;
@@ -3826,8 +3826,8 @@ main (int argc, char **argv )
 
 	    if( !opt.no_armor ) {
 		if( use_armor_filter( a ) ) {
-		    memset( &afx, 0, sizeof afx);
-		    iobuf_push_filter( a, armor_filter, &afx );
+		    afx = new_armor_context ();
+		    push_armor_filter (afx, a);
 		}
 	    }
 	    if( cmd == aListPackets ) {
@@ -3843,6 +3843,7 @@ main (int argc, char **argv )
       }
 
     /* cleanup */
+    release_armor_context (afx);
     FREE_STRLIST(remusr);
     FREE_STRLIST(locusr);
     g10_exit(0);
-- 
cgit v1.2.3