From a3bbb0bf96333cb504d71f354a120e549dfdbe74 Mon Sep 17 00:00:00 2001
From: Greg Alexander <gitgreg@galexander.org>
Date: Sun, 11 Aug 2019 00:08:25 -0400
Subject: [PATCH] Fix the SIGSEGV that users have been reporting - don't
 execute anything that had already been registered with atexit().

---
 doc/index.html  |  2 +-
 jni/interface.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/doc/index.html b/doc/index.html
index fe6f4f1..4aa2480 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -184,7 +184,7 @@ regular <tt>rsa</tt> key for greatest compatibility.
 <h2>Change Log</h2>
 
 <ul>
-<li> <b>2019/08/11 Version 21:</b> Fix restarting after a crash.
+<li> <b>2019/08/11 Version 21:</b> Fix restarting after a crash.  Fix SIGSEGV on some Android 9 devices.
 <li> <b>2019/06/16 Version 20:</b> Update SDK.  Support x86_64, arm64.
 Fix finding support libraries.  Fix colors again.  Fix start-on-boot on
 new Android.  Update to dropbear 2019.78.
diff --git a/jni/interface.c b/jni/interface.c
index 54583d6..fd4bfe4 100644
--- a/jni/interface.c
+++ b/jni/interface.c
@@ -116,6 +116,16 @@ from_java_string(jobject s)
 	return ret;
 }
 
+
+/* this makes sure that no previously-added atexit gets called (some users have
+ * an atexit registered by libGLESv2_adreno.so */
+static void
+null_atexit(void)
+{
+	_Exit(0);
+}
+
+
 JNIEXPORT jint JNICALL
 Java_org_galexander_sshd_SimpleSSHDService_start_1sshd(JNIEnv *env_,
 	jclass cl,
@@ -146,6 +156,8 @@ Java_org_galexander_sshd_SimpleSSHDService_start_1sshd(JNIEnv *env_,
 		int retval;
 		int i;
 
+		atexit(null_atexit);
+
 		logfn = conf_path_file("dropbear.err");
 		logfn_old = conf_path_file("dropbear.err.old");
 		unlink(logfn_old);