- Always check if enough space to write.

- Split large initSortData method.
- make buffer resizing explicit and readable.
- Make a better initial estimate for buffer size.

1 files changed, 2 insertions, 1 deletions

diff --git a/vespalib/src/vespa/vespalib/util/sort.h b/vespalib/src/vespa/vespalib/util/sort.h
index ce3f6772ef1..7d21cb4fe1a 100644
--- a/vespalib/src/vespa/vespalib/util/sort.h
+++ b/vespalib/src/vespa/vespalib/util/sort.h
@@ -271,8 +271,9 @@ public:
 };
 
 template<typename C>
-uint32_t serializeForSort(typename C::InputType v, void * dst) {
+int32_t serializeForSort(typename C::InputType v, void * dst, uint32_t available) {
     typename C::UIntType nbo(vespalib::nbo::n2h(C::convert(v)));
+    if (available < sizeof(nbo)) return -1;
     memcpy(dst, &nbo, sizeof(nbo));
     return sizeof(nbo);
 }