diff --git a/src/kstd/CString.cc b/src/kstd/CString.cc
index 8732f59..a896351 100644
--- a/src/kstd/CString.cc
+++ b/src/kstd/CString.cc
@@ -15,9 +15,9 @@ namespace CString {
 size_t
 length(char *str)
 {
-    char *end = str;
-    while (end++ != '\0') { }
-    return end - str;
+    size_t i;
+    for (i = 0; str[i] != '\0'; i++) { }
+    return i;
 }