gpg: Fix searching for mail addresses in keyrings.

[gnupg2.git] / tools / gpgconf-comp.c

diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index a25b5136ee39d83f01be5dadf4cab3315e856a3e..180fd65c29aa998fccf2e16c8f0196f2a8e779c2 100644 (file)
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -2641,6 +2641,8 @@ change_options_file (gc_component_t component, gc_backend_t backend,
   if (res < 0 && errno != ENOENT)
     {
       xfree (dest_filename);
+      xfree (src_filename);
+      xfree (orig_filename);
       return -1;
     }
   if (res < 0)
@@ -3326,6 +3328,8 @@ gc_component_change_options (int component, estream_t in, estream_t out,
 
           change_one_value (option, runtime, flags, new_value, 0);
         }
+      if (length < 0 || gpgrt_ferror (in))
+       gc_error (1, errno, "error reading stream 'in'");
     }
 
   /* Now that we have collected and locally verified the changes,