From 6734ac6cf357aef1e4658acf8724ad5d1e7e7c56 Mon Sep 17 00:00:00 2001
From: "Adam D. Ruppe" <destructionator@gmail.com>
Date: Sat, 28 Sep 2019 10:14:09 -0400
Subject: [PATCH] sundry minor fixes

---
 apng.d        |  2 +-
 argon2.d      |  2 ++
 cgi.d         |  1 +
 database.d    |  2 ++
 gamehelpers.d | 19 ++++++++++++-------
 http2.d       |  8 ++++++++
 simpleaudio.d |  6 +++++-
 7 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/apng.d b/apng.d
index 5a3d8f9..937dd10 100644
--- a/apng.d
+++ b/apng.d
@@ -59,7 +59,7 @@ class ApngFrame {
 		auto bytesPerLine = bytesPerLineOfPng(parent.header.depth, parent.header.type, width);
 		bytesPerLine--; // removing filter byte from this calculation since we handle separtely
 
-		int idataIdx;
+		size_t idataIdx;
 		ubyte[] idata;
 
 		idata.length = width * height * (parent.header.type == 3 ? 1 : 4);
diff --git a/argon2.d b/argon2.d
index be51c43..474ecf7 100644
--- a/argon2.d
+++ b/argon2.d
@@ -5,6 +5,8 @@
 +/
 module arsd.argon2;
 
+// a password length limitation might legit make sense here cuz of the hashing function can get slow
+
 // it is conceivably useful to hash the password with a secret key before passing to this function,
 // but I'm not going to do that automatically here just to keep this thin and simple.
 
diff --git a/cgi.d b/cgi.d
index 451679a..c0dd2b4 100644
--- a/cgi.d
+++ b/cgi.d
@@ -1711,6 +1711,7 @@ class Cgi {
 					if(name != "host" || host is null)
 						host = value;
 				}
+				// FIXME: https://tools.ietf.org/html/rfc7239
 				else if (name == "accept-encoding") {
 					if(value.indexOf("gzip") != -1)
 						acceptsGzip = true;
diff --git a/database.d b/database.d
index 11a879d..d5718ab 100644
--- a/database.d
+++ b/database.d
@@ -1,6 +1,8 @@
 ///
 module arsd.database;
 
+// I should do a prepared statement as a template string arg
+
 public import std.variant;
 import std.string;
 public import std.datetime;
diff --git a/gamehelpers.d b/gamehelpers.d
index d5685ee..cfafbc9 100644
--- a/gamehelpers.d
+++ b/gamehelpers.d
@@ -123,7 +123,6 @@ class GameHelperBase {
 	this() {
 		if(wantAudio) {
 			audio = new AudioPcmOutThread();
-			audio.start();
 		}
 	}
 
@@ -193,6 +192,18 @@ struct VirtualController {
 void runGame(T : GameHelperBase)(T game, int maxUpdateRate = 20, int maxRedrawRate = 0) {
 	// this is a template btw because then it can statically dispatch
 	// the members instead of going through the virtual interface.
+	if(game.audio !is null) {
+		game.audio.start();
+	}
+
+	scope(exit)
+	if(game.audio !is null) {
+		import std.stdio;
+		game.audio.stop();
+		game.audio.join();
+		game.audio = null;
+	}
+
 
 	int joystickPlayers = enableJoystickInput();
 	scope(exit) closeJoysticks();
@@ -297,12 +308,6 @@ void runGame(T : GameHelperBase)(T game, int maxUpdateRate = 20, int maxRedrawRa
 			}
 		}
 	);
-
-	// FIXME: what if an exception is thrown above?
-	if(game.audio !is null) {
-		game.audio.stop();
-		game.audio.join();
-	}
 }
 
 /++
diff --git a/http2.d b/http2.d
index 61fd9f0..b49cecf 100644
--- a/http2.d
+++ b/http2.d
@@ -747,6 +747,7 @@ class HttpRequest {
 							debug(arsd_http2) writeln("remote disconnect");
 							request.state = State.aborted;
 							inactive[inactiveCount++] = sock;
+							sock.close();
 							loseSocket(request.requestParameters.host, request.requestParameters.port, request.requestParameters.ssl, sock);
 						} else {
 							// data available
@@ -1496,6 +1497,7 @@ version(use_openssl) {
 		int SSL_connect(SSL*);
 		int SSL_write(SSL*, const void*, int);
 		int SSL_read(SSL*, void*, int);
+		@trusted nothrow @nogc int SSL_shutdown(SSL*);
 		void SSL_free(SSL*);
 		void SSL_CTX_free(SSL_CTX*);
 
@@ -1589,6 +1591,11 @@ version(use_openssl) {
 			initSsl(verifyPeer);
 		}
 
+		override void close() {
+			if(ssl) SSL_shutdown(ssl);
+			super.close();
+		}
+
 		this(socket_t sock, AddressFamily af) {
 			super(sock, af);
 			initSsl(true);
@@ -1597,6 +1604,7 @@ version(use_openssl) {
 		~this() {
 			SSL_free(ssl);
 			SSL_CTX_free(ctx);
+			ssl = null;
 		}
 	}
 }
diff --git a/simpleaudio.d b/simpleaudio.d
index c12a5d0..9ecb04f 100644
--- a/simpleaudio.d
+++ b/simpleaudio.d
@@ -198,6 +198,7 @@ import core.thread;
 final class AudioPcmOutThread : Thread {
 	///
 	this() {
+		this.isDaemon = true;
 		version(linux) {
 			// this thread has no business intercepting signals from the main thread,
 			// so gonna block a couple of them
@@ -292,7 +293,9 @@ final class AudioPcmOutThread : Thread {
 
 		addChannel(
 			delegate bool(short[] buffer) {
-				auto got = v.getSamplesShortInterleaved(2, buffer.ptr, buffer.length);
+				if(cast(int) buffer.length != buffer.length)
+					throw new Exception("eeeek");
+				auto got = v.getSamplesShortInterleaved(2, buffer.ptr, cast(int) buffer.length);
 				if(got == 0) {
 					if(loop) {
 						v.seekStart();
@@ -1406,6 +1409,7 @@ extern(C):
 	alias snd_lib_error_handler_t = void function (const(char)* file, int line, const(char)* function_, int err, const(char)* fmt, ...);
 	int snd_lib_error_set_handler (snd_lib_error_handler_t handler);
 
+	import core.stdc.stdarg;
 	private void alsa_message_silencer (const(char)* file, int line, const(char)* function_, int err, const(char)* fmt, ...) {}
 	//k8: ALSAlib loves to trash stderr; shut it up
 	void silence_alsa_messages () { snd_lib_error_set_handler(&alsa_message_silencer); }