From 2a00c06dd5f5210915baf742cc5e4975c2f4e913 Mon Sep 17 00:00:00 2001
From: Gleb Natapov <gleb@scylladb.com>
Date: Tue, 3 May 2016 17:04:20 +0300
Subject: [PATCH] query: fix non full clustering key deserialization

Clustering key prefix may have less columns than described in schema.
Deserailiaztion should stop when end of buffer is reached.

Message-Id: <20160503140420.GP23113@scylladb.com>
---
 query-result-set.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/query-result-set.cc b/query-result-set.cc
index 3c71b78e8e..f940b976b5 100644
--- a/query-result-set.cc
+++ b/query-result-set.cc
@@ -141,6 +141,9 @@ result_set_builder::deserialize(const clustering_key& key)
     std::unordered_map<sstring, data_value> cells;
     auto i = key.begin(*_schema);
     for (auto&& col : _schema->clustering_key_columns()) {
+        if (i == key.end(*_schema)) {
+            break;
+        }
         cells.emplace(col.name_as_text(), col.type->deserialize_value(*i));
         ++i;
     }