From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 19 Jul 2017 07:37:25 +0000 (+0300)
Subject: cassandra: Fix read/write buffer overflows after adding CASSANDRA_QUERY_TYPE_READ_MORE
X-Git-Tag: 2.2.32.rc1~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75c14416cde26410d8e055a98f185d494c11547f;p=thirdparty%2Fdovecot%2Fcore.git

cassandra: Fix read/write buffer overflows after adding CASSANDRA_QUERY_TYPE_READ_MORE
---

diff --git a/src/lib-sql/driver-cassandra.c b/src/lib-sql/driver-cassandra.c
index a8ff14b4de..13b814edc6 100644
--- a/src/lib-sql/driver-cassandra.c
+++ b/src/lib-sql/driver-cassandra.c
@@ -58,12 +58,13 @@ enum cassandra_query_type {
 	CASSANDRA_QUERY_TYPE_READ,
 	CASSANDRA_QUERY_TYPE_READ_MORE,
 	CASSANDRA_QUERY_TYPE_WRITE,
-	CASSANDRA_QUERY_TYPE_DELETE
+	CASSANDRA_QUERY_TYPE_DELETE,
+
+	CASSANDRA_QUERY_TYPE_COUNT
 };
-#define CASSANDRA_QUERY_TYPE_COUNT 3
 
 static const char *cassandra_query_type_names[CASSANDRA_QUERY_TYPE_COUNT] = {
-	"read", "write", "delete"
+	"read", "read-more", "write", "delete"
 };
 
 struct cassandra_callback {
@@ -1008,6 +1009,8 @@ static int driver_cassandra_send_query(struct cassandra_result *result)
 		result->consistency = db->delete_consistency;
 		result->fallback_consistency = db->delete_fallback_consistency;
 		break;
+	case CASSANDRA_QUERY_TYPE_COUNT:
+		i_unreached();
 	}
 
 	if (driver_cassandra_want_fallback_query(result))