Fixed password reassembling function reporting an incorrect candidate in some cases when the correct candidate has zero length

OpenCL/inc_common.cl

@@ -2267,7 +2267,7 @@ DECLSPEC int hc_enc_next (PRIVATE_AS hc_enc_t *hc_enc, PRIVATE_AS const u32 *src
 
       hc_enc->pos = src_len;
 
-      return dst_pos;
+      return -1;
     }
 
     if (hc_enc_validate_utf8 (src_buf, src_pos, extraBytesToRead) == 0)
@@ -2276,7 +2276,7 @@ DECLSPEC int hc_enc_next (PRIVATE_AS hc_enc_t *hc_enc, PRIVATE_AS const u32 *src
 
       hc_enc->pos = src_len;
 
-      return dst_pos;
+      return -1;
     }
 
     u32 ch = 0;
@@ -2413,7 +2413,7 @@ DECLSPEC int hc_enc_next_global (PRIVATE_AS hc_enc_t *hc_enc, GLOBAL_AS const u3
 
       hc_enc->pos = src_len;
 
-      return dst_pos;
+      return -1;
     }
 
     if (hc_enc_validate_utf8_global (src_buf, src_pos, extraBytesToRead) == 0)
@@ -2422,7 +2422,7 @@ DECLSPEC int hc_enc_next_global (PRIVATE_AS hc_enc_t *hc_enc, GLOBAL_AS const u3
 
       hc_enc->pos = src_len;
 
-      return dst_pos;
+      return -1;
     }
 
     u32 ch = 0;

docs/changes.txt

@@ -47,6 +47,7 @@
 - Fixed missing option flag OPTS_TYPE_SUGGEST_KG for hash-mode 11600 to inform the user about possible false positives in this mode
 - Fixed optimized (-O) candidate generation with --stdout and -a 7
 - Fixed password limit in optimized kernel for hash-mode 10700
+- Fixed password reassembling function reporting an incorrect candidate in some cases when the correct candidate has zero length
 - Fixed undefined function call to hc_byte_perm_S() in hash-mode 17010 on non-CUDA compute devices
 - Fixed usage of --rule-right (-k) in -a 7 with optimized (-O) kernels
 - Fixed Unit Test early exit on luks test file download/extract failure