Check for end of string properly when length given

Ed-von-Schleck · Dec 7, 2015 · c112c4e · c112c4e
1 parent 7bf707f
commit c112c4e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/shoco.c b/shoco.c
@@ -92,7 +92,7 @@ size_t shoco_compress(const char * const shoco_restrict original, size_t strlen,
   const char * const in_end = original + strlen;
 
   while ((*in != '\0')) {
-    if (strlen && (in > in_end))
+    if (strlen && (in == in_end))
       break;
 
     // find the longest string of known successors
@@ -103,7 +103,7 @@ size_t shoco_compress(const char * const shoco_restrict original, size_t strlen,
 
     rest = in_end - in;
     for (n_consecutive = 1; n_consecutive <= MAX_SUCCESSOR_N; ++n_consecutive) {
-      if (strlen && (n_consecutive > rest))
+      if (strlen && (n_consecutive == rest))
         break;
 
       current_index = chr_ids_by_chr[(unsigned char)in[n_consecutive]];

diff --git a/tests.c b/tests.c
@@ -41,6 +41,10 @@ int main() {
   assert(ret == 1);
   assert(buf_4[1] == 'x');
 
+  ret = shoco_compress("t\x80", 1, buf_4, 4);
+  assert(ret == 1);
+  assert(buf_4[1] == 'x');
+
   buf_4[1] = 'y';
   ret = shoco_compress("test", 1, buf_4, 1);
   assert(ret == 1);