@@ -53,14 +53,14 @@
 			ret_c[i++] = '%';
 			ret_c[i++] = (high > 9 ? high - 10 + 'A' : high + '0');
 			ret_c[i++] = (low  > 9 ? low  - 10 + 'A' : low  + '0');
 		}
 	}
-	ret_c[i] = '\0';
 
 	@try {
-		ret = [OFString stringWithCString: ret_c];
+		ret = [OFString stringWithCString: ret_c
+					   length: i];
 	} @finally {
 		free(ret_c);
 	}
 
 	return ret;
@@ -123,9 +123,8 @@
 	@try {
 		ret = [OFString stringWithCString: ret_c];
 	} @finally {
 		free(ret_c);
 	}
-
 	return ret;
 }
 @end