1 files changed, 6 insertions, 0 deletions
diff --git a/iconv/gconv_db.c b/iconv/gconv_db.c
index 2c66249..d5d075d 100644
--- a/iconv/gconv_db.c
+++ b/iconv/gconv_db.c
@@ -239,6 +239,7 @@ gen_steps (struct derivation_step *best, const char *toset,
 	    }
 	  free (result);
 	  *nsteps = 0;
+	  *handle = NULL;
 	  status = GCONV_NOCONV;
 	}
       else
@@ -247,6 +248,11 @@ gen_steps (struct derivation_step *best, const char *toset,
 	  status = GCONV_OK;
 	}
     }
+  else
+    {
+      *nsteps = 0;
+      *handle = NULL;
+    }
 
   return status;
 }