diff options
| author | Werner Koch <[email protected]> | 2006-12-06 10:16:50 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2006-12-06 10:16:50 +0000 |
| commit | 0173cd5a9810622e38b76123528e83024fb59a0c (patch) | |
| tree | b8c52436a3d30842f2c59cfcf273a7934432321f /g10/import.c | |
| parent | * keyedit.c (menu_clean): Show "already minimized" rather than (diff) | |
| download | gnupg-0173cd5a9810622e38b76123528e83024fb59a0c.tar.gz gnupg-0173cd5a9810622e38b76123528e83024fb59a0c.zip | |
Fixes for CVE-2006-6235
Diffstat (limited to 'g10/import.c')
| -rw-r--r-- | g10/import.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/g10/import.c b/g10/import.c index 8481d7beb..b3857fc0a 100644 --- a/g10/import.c +++ b/g10/import.c @@ -251,9 +251,12 @@ import( IOBUF inp, const char* fname,struct stats_s *stats, getkey_disable_caches(); if( !opt.no_armor ) { /* armored reading is not disabled */ - armor_filter_context_t *afx = xmalloc_clear( sizeof *afx ); + armor_filter_context_t *afx; + + afx = new_armor_context (); afx->only_keyblocks = 1; - iobuf_push_filter2( inp, armor_filter, afx, 1 ); + push_armor_filter (afx, inp); + release_armor_context (afx); } while( !(rc = read_block( inp, &pending_pkt, &keyblock) )) { |