diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5377ce5..1a5266a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Configure
-      run: cmake -B _build -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+      run: cmake -B _build -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DMDNS_BUILD_TESTS=ON
 
     - name: Build
       run: cmake --build _build --config ${{ matrix.build_type }}
diff --git a/.gitignore b/.gitignore
index 343c19a..9fffa48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -189,6 +189,7 @@ pip-log.txt
 ###############
 
 #Project builds
+/_build/
 lib/**
 bin/**
 dist/**
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50f1f05..a44cffa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.5)
 project(mdns VERSION 1.4.2 LANGUAGES C)
 
 option(MDNS_BUILD_EXAMPLE "build example" ON)
+option(MDNS_BUILD_TESTS "build tests" OFF)
 
 # Set the output of the libraries and executables.
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
@@ -32,6 +33,18 @@ if(MDNS_BUILD_EXAMPLE)
   target_link_libraries(${PROJECT_NAME}_example ${PROJECT_NAME})
 endif()
 
+# ##############################################################################
+# tests
+# ##############################################################################
+
+if(MDNS_BUILD_TESTS)
+  if(${CMAKE_VERSION} VERSION_LESS 3.14)
+    message(FATAL_ERROR "MDNS_BUILD_TESTS requires CMake 3.14 or newer")
+  endif()
+  enable_testing()
+  add_subdirectory(tests)
+endif()
+
 # ##############################################################################
 # install
 # ##############################################################################
diff --git a/mdns.h b/mdns.h
index d0794bf..f141fc4 100644
--- a/mdns.h
+++ b/mdns.h
@@ -739,6 +739,8 @@ mdns_string_make(void* buffer, size_t capacity, void* data, const char* name, si
                  mdns_string_table_t* string_table) {
 	size_t last_pos = 0;
 	size_t remain = capacity - MDNS_POINTER_DIFF(data, buffer);
+	if (!name || !length)
+		return 0;
 	if (name[length - 1] == '.')
 		--length;
 	while (last_pos < length) {
@@ -1073,8 +1075,12 @@ mdns_query_send(int sock, mdns_record_type_t type, const char* name, size_t leng
 static inline int
 mdns_multiquery_send(int sock, const mdns_query_t* query, size_t count, void* buffer, size_t capacity,
                      uint16_t query_id) {
-	if (!count || (capacity < (sizeof(struct mdns_header_t) + (6 * count))))
+	if (!query || !count || (capacity < (sizeof(struct mdns_header_t) + (6 * count))))
 		return -1;
+	for (size_t iq = 0; iq < count; ++iq) {
+		if (!query[iq].name || !query[iq].length)
+			return -1;
+	}
 
 	// Ask for a unicast response since it's a one-shot query
 	uint16_t rclass = MDNS_CLASS_IN | MDNS_UNICAST_RESPONSE;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644
index 0000000..1c9a757
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1,15 @@
+include(FetchContent)
+
+set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build static libraries" FORCE)
+set(UNIT_TESTING OFF CACHE BOOL "Build cmocka unit tests" FORCE)
+set(WITH_EXAMPLES OFF CACHE BOOL "Build cmocka examples" FORCE)
+
+FetchContent_Declare(
+  cmocka
+  URL https://cmocka.org/files/1.1/cmocka-1.1.7.tar.xz
+  URL_HASH SHA256=810570eb0b8d64804331f82b29ff47c790ce9cd6b163e98d47a4807047ecad82)
+FetchContent_MakeAvailable(cmocka)
+
+add_executable(mdns_parse_test mdns_parse_test.c)
+target_link_libraries(mdns_parse_test PRIVATE mdns::mdns cmocka::cmocka)
+add_test(NAME mdns_parse COMMAND mdns_parse_test)
diff --git a/tests/mdns_parse_test.c b/tests/mdns_parse_test.c
new file mode 100644
index 0000000..3224a34
--- /dev/null
+++ b/tests/mdns_parse_test.c
@@ -0,0 +1,114 @@
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <cmocka.h>
+
+#include "mdns.h"
+
+struct parsed_record {
+	int callback_count;
+	mdns_entry_type_t entry;
+	uint16_t query_id;
+	uint16_t type;
+	uint16_t rclass;
+	uint32_t ttl;
+	char name[64];
+	size_t name_length;
+	struct sockaddr_in address;
+	int address_parsed;
+};
+
+static int
+capture_record(int sock, const struct sockaddr* from, size_t addrlen, mdns_entry_type_t entry,
+               uint16_t query_id, uint16_t rtype, uint16_t rclass, uint32_t ttl, const void* data,
+               size_t size, size_t name_offset, size_t name_length, size_t record_offset,
+               size_t record_length, void* user_data) {
+	struct parsed_record* record = user_data;
+	mdns_string_t name;
+
+	(void)sock;
+	(void)from;
+	(void)addrlen;
+	(void)name_length;
+
+	++record->callback_count;
+	record->entry = entry;
+	record->query_id = query_id;
+	record->type = rtype;
+	record->rclass = rclass;
+	record->ttl = ttl;
+	name = mdns_string_extract(data, size, &name_offset, record->name, sizeof(record->name));
+	record->name_length = name.length;
+	record->address_parsed =
+	    mdns_record_parse_a(data, size, record_offset, record_length, &record->address) != NULL;
+	return 0;
+}
+
+static void
+test_parses_simple_a_response(void** state) {
+	static const uint8_t packet[] = {
+	    0x00, 0x00, /* Query ID */
+	    0x84, 0x00, /* Response and authoritative-answer flags */
+	    0x00, 0x00, /* Questions */
+	    0x00, 0x01, /* Answer records */
+	    0x00, 0x00, /* Authority records */
+	    0x00, 0x00, /* Additional records */
+	    0x04, 'h',  'o',  's',  't', 0x05, 'l', 'o', 'c', 'a', 'l', 0x00, /* host.local. */
+	    0x00, 0x01,                                                       /* A record */
+	    0x80, 0x01,             /* Cache flush and class IN */
+	    0x00, 0x00, 0x00, 0x78, /* TTL: 120 seconds */
+	    0x00, 0x04,             /* Record data length */
+	    0xc0, 0xa8, 0x01, 0x2a, /* 192.168.1.42 */
+	};
+	static const uint8_t expected_address[] = {0xc0, 0xa8, 0x01, 0x2a};
+	struct parsed_record record = {0};
+	size_t offset = 12;
+	uint16_t query_id = mdns_ntohs(packet);
+	size_t answer_count = mdns_ntohs(packet + 6);
+	size_t parsed;
+
+	(void)state;
+
+	parsed = mdns_records_parse(-1, NULL, 0, packet, sizeof(packet), &offset, MDNS_ENTRYTYPE_ANSWER,
+	                            query_id, answer_count, capture_record, &record);
+
+	assert_int_equal(parsed, 1);
+	assert_int_equal(offset, sizeof(packet));
+	assert_int_equal(record.callback_count, 1);
+	assert_int_equal(record.entry, MDNS_ENTRYTYPE_ANSWER);
+	assert_int_equal(record.query_id, 0);
+	assert_int_equal(record.type, MDNS_RECORDTYPE_A);
+	assert_int_equal(record.rclass, MDNS_CACHE_FLUSH | MDNS_CLASS_IN);
+	assert_int_equal(record.ttl, 120);
+	assert_int_equal(record.name_length, strlen("host.local."));
+	assert_memory_equal(record.name, "host.local.", record.name_length);
+	assert_true(record.address_parsed);
+	assert_int_equal(record.address.sin_family, AF_INET);
+	assert_memory_equal(&record.address.sin_addr, expected_address, sizeof(expected_address));
+}
+
+static void
+test_query_send_rejects_empty_name_without_touching_buffer(void** state) {
+	uint8_t buffer[128];
+	uint8_t expected[sizeof(buffer)];
+
+	(void)state;
+	memset(buffer, 0xa5, sizeof(buffer));
+	memcpy(expected, buffer, sizeof(buffer));
+	assert_int_equal(mdns_query_send(-1, MDNS_RECORDTYPE_PTR, "", 0, buffer, sizeof(buffer), 1),
+	                 -1);
+	assert_memory_equal(buffer, expected, sizeof(buffer));
+}
+
+int
+main(void) {
+	const struct CMUnitTest tests[] = {
+	    cmocka_unit_test(test_parses_simple_a_response),
+	    cmocka_unit_test(test_query_send_rejects_empty_name_without_touching_buffer),
+	};
+
+	return cmocka_run_group_tests(tests, NULL, NULL);
+}