diff --git a/g10/keygen.c b/g10/keygen.c
index cf34d8f99..d3de98d32 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -4308,6 +4308,7 @@ read_parameter_file (ctrl_t ctrl, const char *fname )
     para = NULL;
     maxlen = 1024;
     line = NULL;
+    nline = 0;
     while ( iobuf_read_line (fp, &line, &nline, &maxlen) ) {
 	char *keyword, *value;
 
diff --git a/g10/textfilter.c b/g10/textfilter.c
index 96666cf17..3e68900bb 100644
--- a/g10/textfilter.c
+++ b/g10/textfilter.c
@@ -163,8 +163,8 @@ copy_clearsig_text( IOBUF out, IOBUF inp, gcry_md_hd_t md,
 		    int escape_dash, int escape_from)
 {
     unsigned int maxlen;
-    byte *buffer = NULL;    /* malloced buffer */
-    unsigned int bufsize;   /* and size of this buffer */
+    byte *buffer = NULL;      /* malloced buffer */
+    unsigned int bufsize = 0; /* and size of this buffer */
     unsigned int n;
     int truncated = 0;
     int pending_lf = 0;