--- gnupg-1.9.22/g10/openfile.c.cve-2006-6169	2006-06-20 10:33:00.000000000 -0600
+++ gnupg-1.9.22/g10/openfile.c	2006-11-30 08:38:45.000000000 -0700
@@ -145,8 +145,8 @@ ask_outfile_name( const char *name, size
 
     s = _("Enter new filename");
 
-    n = strlen(s) + namelen + 10;
     defname = name && namelen? make_printable_string( name, namelen, 0): NULL;
+    n = strlen(s) + (defname?strlen (defname):0) + 10;
     prompt = xmalloc(n);
     if( defname )
 	sprintf(prompt, "%s [%s]: ", s, defname );