1 files changed, 6 insertions, 1 deletions
diff --git a/scd/app-help.c b/scd/app-help.c
index c6695635f..1c3c52b15 100644
--- a/scd/app-help.c
+++ b/scd/app-help.c
@@ -147,8 +147,13 @@ app_help_read_length_of_cert (int slot, int fid, size_t *r_certoff)
              is the certificate. */
           *r_certoff += hdrlen + objlen;
           if (*r_certoff > resultlen)
-            return 0; /* That should never happen. */
+            {
+              *r_certoff = 0;
+              return 0; /* That should never happen. */
+            }
         }
+      else
+        *r_certoff = 0;
     }
 
   return resultlen;