jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added safery measures

Browse Source
This commit is contained in:
Juha Heinanen
2026-05-25 08:42:55 +03:00
parent 5c78e90c4d
commit ca1af66333
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/cpp/baresip.c
View File

@ -328,17 +328,18 @@ static void message_handler(
static void send_resp_handler(int err, const struct sip_msg *msg, void *arg) static void send_resp_handler(int err, const struct sip_msg *msg, void *arg)
{ {
(void)arg; char *native_time = (char *)arg;
char reason_buf[64]; char reason_buf[64];
if (err) { if (err) {
LOGD("send_response_handler received error %d\n", err); LOGD("send_response_handler received error %d\n", err);
mem_deref(native_time);
return; return;
} }
pl_strcpy(&(msg->reason), reason_buf, 64); pl_strcpy(&(msg->reason), reason_buf, 64);
LOGD("send_response_handler received response '%u %s' at %s\n", msg->scode, reason_buf, LOGD("send_response_handler received response '%u %s' at %s\n", msg->scode, reason_buf,
(char *)arg); native_time);
JavaVM *javaVM = g_ctx.javaVM; JavaVM *javaVM = g_ctx.javaVM;
JNIEnv *env; JNIEnv *env;
@ -347,6 +348,7 @@ static void send_resp_handler(int err, const struct sip_msg *msg, void *arg)
res = (*javaVM)->AttachCurrentThread(javaVM, &env, NULL); res = (*javaVM)->AttachCurrentThread(javaVM, &env, NULL);
if (JNI_OK != res) { if (JNI_OK != res) {
LOGE("failed to AttachCurrentThread, ErrorCode = %d\n", res); LOGE("failed to AttachCurrentThread, ErrorCode = %d\n", res);
mem_deref(native_time);
return; return;
} }
} }
@ -354,11 +356,13 @@ static void send_resp_handler(int err, const struct sip_msg *msg, void *arg)
jmethodID methodId = (*env)->GetMethodID(env, g_ctx.mainActivityClz, "messageResponse", jmethodID methodId = (*env)->GetMethodID(env, g_ctx.mainActivityClz, "messageResponse",
"(ILjava/lang/String;Ljava/lang/String;)V"); "(ILjava/lang/String;Ljava/lang/String;)V");
jstring javaReason = (*env)->NewStringUTF(env, reason_buf); jstring javaReason = (*env)->NewStringUTF(env, reason_buf);
jstring javaTime = (*env)->NewStringUTF(env, (char *)arg); jstring javaTime = (*env)->NewStringUTF(env, native_time);
if (methodId)
(*env)->CallVoidMethod(env, g_ctx.mainActivityObj, methodId, msg->scode, javaReason, javaTime); (*env)->CallVoidMethod(env, g_ctx.mainActivityObj, methodId, msg->scode, javaReason, javaTime);
(*env)->DeleteLocalRef(env, javaReason); (*env)->DeleteLocalRef(env, javaReason);
(*env)->DeleteLocalRef(env, javaTime); (*env)->DeleteLocalRef(env, javaTime);
mem_deref(native_time);
} }
enum enum
@ -1569,16 +1573,20 @@ JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_message_1send(
const char *native_peer = (*env)->GetStringUTFChars(env, jPeer, 0); const char *native_peer = (*env)->GetStringUTFChars(env, jPeer, 0);
const char *native_msg = (*env)->GetStringUTFChars(env, jMsg, 0); const char *native_msg = (*env)->GetStringUTFChars(env, jMsg, 0);
const char *native_time = (*env)->GetStringUTFChars(env, jTime, 0); const char *native_time = (*env)->GetStringUTFChars(env, jTime, 0);
char *time_copy = NULL;
str_dup(&time_copy, native_time);
LOGD("sending message from ua %ld to %s at %s\n", (long)ua, native_peer, native_time); LOGD("sending message from ua %ld to %s at %s\n", (long)ua, native_peer, native_time);
re_thread_enter(); re_thread_enter();
int err = message_send( int err = message_send(
(struct ua *)ua, native_peer, native_msg, send_resp_handler, (void *)native_time); (struct ua *)ua, native_peer, native_msg, send_resp_handler, (void *)time_copy);
re_thread_leave(); re_thread_leave();
if (err) { if (err) {
LOGW("message_send failed with error %d\n", err); LOGW("message_send failed with error %d\n", err);
mem_deref(time_copy);
} }
(*env)->ReleaseStringUTFChars(env, jPeer, native_peer); (*env)->ReleaseStringUTFChars(env, jPeer, native_peer);
(*env)->ReleaseStringUTFChars(env, jMsg, native_msg); (*env)->ReleaseStringUTFChars(env, jMsg, native_msg);
(*env)->ReleaseStringUTFChars(env, jTime, native_time);
return err; return err;
} }