From 8afe4f4a1f1450ddc6b1964dc4e5cff598160d7e Mon Sep 17 00:00:00 2001
From: Doug McLain <doug@nostar.net>
Date: Sat, 6 Nov 2021 12:09:52 -0400
Subject: [PATCH] Fix NXDN transmit issue and android USB device buffer
 overflow crash bug

---
 android/AndroidManifest.xml | 100 ++++++++++++++++++------------------
 androidserialport.cpp       |   2 +
 nxdncodec.cpp               |   9 ++--
 3 files changed, 55 insertions(+), 56 deletions(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 90948ef..e17979d 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <manifest package="org.dudetronics.droidstar" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="57" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29"/>
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/>
 
 	<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
 		 Remove the comment if you do not require these default permissions. -->
@@ -13,71 +13,71 @@
 	<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
 
 	<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:extractNativeLibs="true" android:icon="@drawable/icon">
-        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="unspecified" android:launchMode="singleTop">
-            <intent-filter>
+		<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="unspecified" android:launchMode="singleTop">
+			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
 				<category android:name="android.intent.category.LAUNCHER"/>
 			</intent-filter>
-            <intent-filter>
+			<intent-filter>
 				 <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"/>
 			</intent-filter>
-            <meta-data android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" android:resource="@xml/device_filter"/>
-            <!-- Application arguments -->
-            <!-- meta-data android:name="android.app.arguments" android:value="arg1 arg2 arg3"/ -->
-            <!-- Application arguments -->
-            <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
-            <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
-            <meta-data android:name="android.app.repository" android:value="default"/>
-            <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
-            <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
-            <!-- Deploy Qt libs as part of package -->
-            <meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
-            <!-- Run with local libs -->
-            <meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
-            <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
-            <meta-data android:name="android.app.load_local_libs_resource_id" android:resource="@array/load_local_libs"/>
-            <meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
-            <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
-            <!-- Used to specify custom system library path to run with local system libs -->
-            <!-- <meta-data android:name="android.app.system_libs_prefix" android:value="/system/lib/"/> -->
-            <!--  Messages maps -->
-            <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
-            <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
-            <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
-            <meta-data android:value="@string/unsupported_android_version" android:name="android.app.unsupported_android_version"/>
-            <!--  Messages maps -->
-            <!-- Splash screen -->
-            <!-- Orientation-specific (portrait/landscape) data is checked first. If not available for current orientation,
+			<meta-data android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" android:resource="@xml/device_filter"/>
+			<!-- Application arguments -->
+			<!-- meta-data android:name="android.app.arguments" android:value="arg1 arg2 arg3"/ -->
+			<!-- Application arguments -->
+			<meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
+			<meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
+			<meta-data android:name="android.app.repository" android:value="default"/>
+			<meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
+			<meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
+			<!-- Deploy Qt libs as part of package -->
+			<meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
+			<!-- Run with local libs -->
+			<meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
+			<meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
+			<meta-data android:name="android.app.load_local_libs_resource_id" android:resource="@array/load_local_libs"/>
+			<meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
+			<meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
+			<!-- Used to specify custom system library path to run with local system libs -->
+			<!-- <meta-data android:name="android.app.system_libs_prefix" android:value="/system/lib/"/> -->
+			<!--  Messages maps -->
+			<meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
+			<meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
+			<meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
+			<meta-data android:value="@string/unsupported_android_version" android:name="android.app.unsupported_android_version"/>
+			<!--  Messages maps -->
+			<!-- Splash screen -->
+			<!-- Orientation-specific (portrait/landscape) data is checked first. If not available for current orientation,
 				 then android.app.splash_screen_drawable. For best results, use together with splash_screen_sticky and
 				 use hideSplashScreen() with a fade-out animation from Qt Android Extras to hide the splash screen when you
 				 are done populating your window with content. -->
-            <!-- meta-data android:name="android.app.splash_screen_drawable_portrait" android:resource="@drawable/logo_portrait" / -->
-            <!-- meta-data android:name="android.app.splash_screen_drawable_landscape" android:resource="@drawable/logo_landscape" / -->
-            <!-- meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/ -->
-            <!-- meta-data android:name="android.app.splash_screen_sticky" android:value="true"/ -->
-            <!-- Splash screen -->
-            <!-- Background running -->
-            <!-- Warning: changing this value to true may cause unexpected crashes if the
+			<!-- meta-data android:name="android.app.splash_screen_drawable_portrait" android:resource="@drawable/logo_portrait" / -->
+			<!-- meta-data android:name="android.app.splash_screen_drawable_landscape" android:resource="@drawable/logo_landscape" / -->
+			<!-- meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/ -->
+			<!-- meta-data android:name="android.app.splash_screen_sticky" android:value="true"/ -->
+			<!-- Splash screen -->
+			<!-- Background running -->
+			<!-- Warning: changing this value to true may cause unexpected crashes if the
 						  application still try to draw after
 						  "applicationStateChanged(Qt::ApplicationSuspended)"
 						  signal is sent! -->
-            <meta-data android:name="android.app.background_running" android:value="false"/>
-            <!-- Background running -->
-            <!-- auto screen scale factor -->
-            <meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/>
-            <!-- auto screen scale factor -->
-            <!-- extract android style -->
-            <!-- available android:values :
+			<meta-data android:name="android.app.background_running" android:value="false"/>
+			<!-- Background running -->
+			<!-- auto screen scale factor -->
+			<meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/>
+			<!-- auto screen scale factor -->
+			<!-- extract android style -->
+			<!-- available android:values :
 				* default - In most cases this will be the same as "full", but it can also be something else if needed, e.g., for compatibility reasons
 				* full - useful QWidget & Quick Controls 1 apps
 				* minimal - useful for Quick Controls 2 apps, it is much faster than "full"
 				* none - useful for apps that don't use any of the above Qt modules
 				-->
-            <meta-data android:name="android.app.extract_android_style" android:value="default"/>
-            <!-- extract android style -->
-        </activity>
-        <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
-    </application>
+			<meta-data android:name="android.app.extract_android_style" android:value="default"/>
+			<!-- extract android style -->
+		</activity>
+		<!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
+	</application>
 
 
 
diff --git a/androidserialport.cpp b/androidserialport.cpp
index e7e2654..2cedc77 100644
--- a/androidserialport.cpp
+++ b/androidserialport.cpp
@@ -64,6 +64,7 @@ int AndroidSerialPort::write(char *data, int s)
 	jbyteArray buffer = env->NewByteArray(s);
 	env->SetByteArrayRegion(buffer, 0, s, (jbyte *)data);
 	serialJavaObject.callMethod<void>("write", "([B)V", buffer);
+	env->DeleteLocalRef(buffer);
 	return 0;
 }
 
@@ -73,6 +74,7 @@ int AndroidSerialPort::write(QByteArray data)
 	jbyteArray buffer = env->NewByteArray(data.size());
 	env->SetByteArrayRegion(buffer, 0, data.size(), (jbyte *)data.data());
 	serialJavaObject.callMethod<void>("write", "([B)V", buffer);
+	env->DeleteLocalRef(buffer);
 	return 0;
 }
 
diff --git a/nxdncodec.cpp b/nxdncodec.cpp
index 18a2f90..26f494a 100755
--- a/nxdncodec.cpp
+++ b/nxdncodec.cpp
@@ -282,7 +282,6 @@ void NXDNCodec::send_disconnect()
 
 void NXDNCodec::transmit()
 {
-	uint8_t ambe_frame[49];
 	uint8_t ambe[7];
 	int16_t pcm[160];
 
@@ -314,13 +313,11 @@ void NXDNCodec::transmit()
 	}
 	else{
 		if(m_modeinfo.sw_vocoder_loaded){
-			m_mbevocoder->encode_2450(pcm, ambe_frame);
+			m_mbevocoder->encode_2450(pcm, ambe);
 		}
+		ambe[6] &= 0x80;
+
 		for(int i = 0; i < 7; ++i){
-			for(int j = 0; j < 8; ++j){
-				ambe[i] |= (ambe_frame[(i*8)+j] << (7-j));
-			}
-			ambe[6] &= 0x80;
 			m_txcodecq.append(ambe[i]);
 		}
 	}