ringbuf: check maximum length

Author: igchor

include/libpmemobj++/detail/ringbuf.hpp

@@ -109,9 +109,17 @@ struct ringbuf_t {
 	/* Set by ringbuf_consume, reset by ringbuf_release. */
 	bool consume_in_progress;
 
+	/**
+	 * Creates new ringbuf_t instance.
+	 *
+	 * Length must be < RBUF_OFF_MASK
+	 */
 	ringbuf_t(size_t max_workers, size_t length)
 	    : workers(new ringbuf_worker_t[max_workers])
 	{
+		if (length >= RBUF_OFF_MASK)
+			throw std::out_of_range("ringbuf length too big");
+
 		written.store(0);
 		next.store(0);
 		end.store(0);

tests/mpsc_queue/ringbuf.cpp

@@ -314,6 +314,22 @@ test_random(void)
 	delete r;
 }
 
+static void
+test_size()
+{
+	try {
+		auto size = (1ULL << 32) + 1;
+		auto r = new ringbuf_t(1, size);
+		(void)r;
+
+		ASSERT_UNREACHABLE;
+	} catch (std::out_of_range &) {
+
+	} catch (...) {
+		ASSERT_UNREACHABLE;
+	}
+}
+
 int
 main(void)
 {
@@ -326,5 +342,6 @@ main(void)
 	test_multi();
 	test_overlap();
 	test_random();
+	test_size();
 	return 0;
 }