X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=serializer.cpp;h=d2f126c0aaa89fe3ee42833fa1b35894553ac75f;hb=82032c6bc29171a312f333ec44f226d532c03607;hp=f20c304de54e690a5c41852127da93b6b8c3c2bb;hpb=cbecd483f57c465b2ad6d3867c760c2e5b5e79aa;p=plocate

diff --git a/serializer.cpp b/serializer.cpp
index f20c304..d2f126c 100644
--- a/serializer.cpp
+++ b/serializer.cpp
@@ -60,7 +60,7 @@ void print_possibly_escaped(const string &str)
 			ptr += ret;
 			len -= ret;
 		}
-	} while (all_safe);
+	} while (all_safe && *ptr != '\0');
 
 	if (all_safe) {
 		printf("%s\n", str.c_str());
@@ -77,13 +77,14 @@ void print_possibly_escaped(const string &str)
 	mbtowc(nullptr, 0, 0);
 	ptr = str.data();
 	len = str.size();
-	for (;;) {
+	while (*ptr != '\0') {
 		int ret = mbtowc(nullptr, ptr, len);
 		if (ret == -1) {
 			// Malformed data.
 			printf("?");
 			++ptr;
 			--len;
+			continue;
 		} else if (ret == 0) {
 			break;  // EOF.
 		}