search: use quote() instead of mpd_sanitize_arg()

quote() rejects newlines.

Author: MaxKellermann

src/search.c

@@ -7,6 +7,7 @@
 #include <mpd/recv.h>
 #include "internal.h"
 #include "request.h"
+#include "quote.h"
 #include "iso8601.h"
 #include "check_tag.h"
 
@@ -92,25 +93,34 @@ mpd_search_add_constraint(struct mpd_connection *connection,
 	assert(name != NULL);
 	assert(value != NULL);
 
-	char *arg = mpd_sanitize_arg(value);
-	if (arg == NULL) {
-		mpd_error_code(&connection->error, MPD_ERROR_OOM);
+	const size_t name_length = strlen(name);
+
+	/* worst-case allocation */
+	const size_t size = 1 + name_length + 2 + strlen(value) * 2 + 2;
+	char *p = mpd_request_prepare_append(connection, size);
+	if (p == NULL)
 		return false;
-	}
 
-	const size_t add_length = 1 + strlen(name) + 2 + strlen(arg) + 1;
+	char *const end = p + size - 1;
+
+	*p++ = ' ';
+
+	memcpy(p, name, name_length);
+	p += name_length;
+
+	*p++ = ' ';
 
-	char *dest = mpd_request_prepare_append(connection, add_length);
-	if (dest == NULL) {
-		free(arg);
+	p = quote(p, end, value);
+	if (p == NULL) {
+		mpd_error_code(&connection->error, MPD_ERROR_ARGUMENT);
+		mpd_error_message(&connection->error, "bad string");
 		return false;
 	}
 
-	sprintf(dest, " %s \"%s\"", name, arg);
-
-	free(arg);
+	*p = '\0';
 	return true;
 }
+
 bool
 mpd_search_add_base_constraint(struct mpd_connection *connection,
 			       enum mpd_operator oper,
@@ -191,23 +201,24 @@ mpd_search_add_expression(struct mpd_connection *connection,
 	assert(connection != NULL);
 	assert(expression != NULL);
 
-	char *arg = mpd_sanitize_arg(expression);
-	if (arg == NULL) {
-		mpd_error_code(&connection->error, MPD_ERROR_OOM);
+	/* worst-case allocation */
+	const size_t size = 2 + strlen(expression) * 2 + 2;
+	char *p = mpd_request_prepare_append(connection, size);
+	if (p == NULL)
 		return false;
-	}
 
-	const size_t add_length = 2 + strlen(arg) + 1;
+	char *const end = p + size - 1;
+
+	*p++ = ' ';
 
-	char *dest = mpd_request_prepare_append(connection, add_length);
-	if (dest == NULL) {
-		free(arg);
+	p = quote(p, end, expression);
+	if (p == NULL) {
+		mpd_error_code(&connection->error, MPD_ERROR_ARGUMENT);
+		mpd_error_message(&connection->error, "bad string");
 		return false;
 	}
 
-	sprintf(dest, " \"%s\"", arg);
-
-	free(arg);
+	*p = '\0';
 	return true;
 }
 
@@ -306,22 +317,31 @@ mpd_search_add_db_songs_to_playlist(struct mpd_connection *connection,
 	if (!mpd_request_begin(connection)) 
 		return false;
 
-	char *arg = mpd_sanitize_arg(playlist_name);
-	if (arg == NULL) {
-		mpd_error_code(&connection->error, MPD_ERROR_OOM);
-		return false;
-	}
+	static const char *const prefix = "searchaddpl ";
+	const size_t prefix_length = strlen(prefix);
 
-	const size_t len = 15 + strlen(arg) + 2;
-	connection->request = malloc(len);
+	/* worst-case allocation */
+	const size_t size = prefix_length + 1 + strlen(playlist_name) * 2 + 3;
+	char *p = connection->request = malloc(size);
 	if (connection->request == NULL) {
-		free(arg);
 		mpd_error_code(&connection->error, MPD_ERROR_OOM);
 		return false;
 	}
 
-	snprintf(connection->request, len, "searchaddpl \"%s\" ", arg);
+	char *const end = p + size - 1;
+
+	memcpy(p, prefix, prefix_length);
+	p += prefix_length;
+
+	p = quote(p, end, playlist_name);
+	if (p == NULL) {
+		mpd_request_cancel(connection);
+		mpd_error_code(&connection->error, MPD_ERROR_ARGUMENT);
+		mpd_error_message(&connection->error, "bad string");
+		return false;
+	}
 
-	free(arg);
+	*p++ = ' ';
+	*p = '\0';
 	return true;
 }