diff --git a/src/core/misc.c b/src/core/misc.c
index 03fcce59..9db32aa5 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -728,16 +728,17 @@ int expand_escape(const char **data)
 char *escape_string(const char *str, const char *what)
 {
 	const char *p;
-	char *ret;
+	char *ret, *escaped;
 
 	ret = g_malloc(strlen(str) * 2 + 1);
-	for (p = str; *p != '\0'; p++, ret++) {
+	escaped = ret;
+	for (p = str; *p != '\0'; p++, escaped++) {
 		if (strchr(what, *p) != NULL) {
-			*ret++ = '\\';
+			*escaped++ = '\\';
 		}
-		*ret = *p;
+		*escaped = *p;
 	}
-	*ret = '\0';
+	*escaped = '\0';
 
 	return ret;
 }