From 0c8ef3a8ebcaeb4d1470ce10d4f460b6c5d77978 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 15 Sep 2025 22:43:00 +0200
Subject: Cleanup: remove get() to unchecked buffer.

---
 src/lib/dcpomatic_socket.cc | 11 ++++-------
 src/lib/digester.cc         |  8 --------
 src/lib/digester.h          |  2 --
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/lib/dcpomatic_socket.cc b/src/lib/dcpomatic_socket.cc
index 7aecf752f..7d2731cd9 100644
--- a/src/lib/dcpomatic_socket.cc
+++ b/src/lib/dcpomatic_socket.cc
@@ -278,8 +278,7 @@ Socket::check_read_digest ()
 	DCPOMATIC_ASSERT (_read_digester);
 	int const size = _read_digester->size ();
 
-	uint8_t ref[size];
-	_read_digester->get (ref);
+	auto const ref = _read_digester->get_vector();
 
 	/* Make sure _read_digester is gone before we call read() so that the digest
 	 * isn't itself digested.
@@ -289,7 +288,7 @@ Socket::check_read_digest ()
 	uint8_t actual[size];
 	read (actual, size);
 
-	return memcmp(ref, actual, size) == 0;
+	return memcmp(ref.data(), actual, size) == 0;
 }
 
 
@@ -297,17 +296,15 @@ void
 Socket::finish_write_digest ()
 {
 	DCPOMATIC_ASSERT (_write_digester);
-	int const size = _write_digester->size();
 
-	uint8_t buffer[size];
-	_write_digester->get (buffer);
+	auto const buffer = _write_digester->get_vector();
 
 	/* Make sure _write_digester is gone before we call write() so that the digest
 	 * isn't itself digested.
 	 */
 	_write_digester.reset ();
 
-	write (buffer, size);
+	write(buffer.data(), buffer.size());
 }
 
 
diff --git a/src/lib/digester.cc b/src/lib/digester.cc
index 8c59d0386..adb390400 100644
--- a/src/lib/digester.cc
+++ b/src/lib/digester.cc
@@ -79,14 +79,6 @@ Digester::get() const
 }
 
 
-void
-Digester::get(uint8_t* buffer) const
-{
-	auto const digest = get_vector();
-	memcpy(buffer, digest.data(), digest.size());
-}
-
-
 int
 Digester::size() const
 {
diff --git a/src/lib/digester.h b/src/lib/digester.h
index 1b5930521..53fdb9481 100644
--- a/src/lib/digester.h
+++ b/src/lib/digester.h
@@ -45,8 +45,6 @@ public:
 	std::string get() const;
 	std::vector<unsigned char> get_vector() const;
 
-	void get(uint8_t* buffer) const;
-
 	int size() const;
 
 private:
-- 
cgit v1.2.3