From 74cf8b65b2254eee059f6f599bb6095db5c66001 Mon Sep 17 00:00:00 2001
From: 雾聪 <wucong.lyb@alibaba-inc.com>
Date: 星期四, 16 十一月 2023 11:12:20 +0800
Subject: [PATCH] fix the issue of hotwords_embedding potentially being a null pointer
---
runtime/websocket/bin/funasr-wss-server.cpp | 6 ------
runtime/websocket/bin/websocket-server.cpp | 4 +++-
runtime/websocket/bin/websocket-server-2pass.cpp | 8 +++++---
runtime/websocket/bin/funasr-wss-server-2pass.cpp | 8 --------
4 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/runtime/websocket/bin/funasr-wss-server-2pass.cpp b/runtime/websocket/bin/funasr-wss-server-2pass.cpp
index 1dfd2ef..258d537 100644
--- a/runtime/websocket/bin/funasr-wss-server-2pass.cpp
+++ b/runtime/websocket/bin/funasr-wss-server-2pass.cpp
@@ -4,14 +4,6 @@
*/
/* 2022-2023 by zhaomingwork */
-// io server
-// Usage:funasr-wss-server [--model_thread_num <int>] [--decoder_thread_num
-// <int>]
-// [--io_thread_num <int>] [--port <int>] [--listen_ip
-// <string>] [--punc-quant <string>] [--punc-dir <string>]
-// [--vad-quant <string>] [--vad-dir <string>] [--quantize
-// <string>] --model-dir <string> [--] [--version] [-h]
-
#include "websocket-server-2pass.h"
#ifdef _WIN32
#include "win_func.h"
diff --git a/runtime/websocket/bin/funasr-wss-server.cpp b/runtime/websocket/bin/funasr-wss-server.cpp
index 916d115..8d4cc99 100644
--- a/runtime/websocket/bin/funasr-wss-server.cpp
+++ b/runtime/websocket/bin/funasr-wss-server.cpp
@@ -4,12 +4,6 @@
*/
/* 2022-2023 by zhaomingwork */
-// io server
-// Usage:funasr-wss-server [--model_thread_num <int>] [--decoder_thread_num <int>]
-// [--io_thread_num <int>] [--port <int>] [--listen_ip
-// <string>] [--punc-quant <string>] [--punc-dir <string>]
-// [--vad-quant <string>] [--vad-dir <string>] [--quantize
-// <string>] --model-dir <string> [--] [--version] [-h]
#include "websocket-server.h"
#ifdef _WIN32
#include "win_func.h"
diff --git a/runtime/websocket/bin/websocket-server-2pass.cpp b/runtime/websocket/bin/websocket-server-2pass.cpp
index bd0c590..156becc 100644
--- a/runtime/websocket/bin/websocket-server-2pass.cpp
+++ b/runtime/websocket/bin/websocket-server-2pass.cpp
@@ -452,7 +452,9 @@
LOG(INFO) << "jsonresult=" << jsonresult
<< ", msg_data->msg=" << msg_data->msg;
if ((jsonresult["is_speaking"] == false ||
- jsonresult["is_finished"] == true) && msg_data->msg["is_eof"] != true) {
+ jsonresult["is_finished"] == true) &&
+ msg_data->msg["is_eof"] != true &&
+ msg_data->hotwords_embedding != NULL) {
LOG(INFO) << "client done";
// if it is in final message, post the sample_data to decode
@@ -503,9 +505,9 @@
try{
// post to decode
- if (msg_data->msg["is_eof"] != true) {
+ if (msg_data->msg["is_eof"] != true && msg_data->hotwords_embedding != NULL) {
std::vector<std::vector<float>> hotwords_embedding_(*(msg_data->hotwords_embedding));
- msg_data->strand_->post(
+ msg_data->strand_->post(
std::bind(&WebSocketServer::do_decoder, this,
std::move(subvector), std::move(hdl),
std::ref(msg_data->msg),
diff --git a/runtime/websocket/bin/websocket-server.cpp b/runtime/websocket/bin/websocket-server.cpp
index 6ba4537..8ee9b16 100644
--- a/runtime/websocket/bin/websocket-server.cpp
+++ b/runtime/websocket/bin/websocket-server.cpp
@@ -343,7 +343,9 @@
msg_data->msg["itn"] = jsonresult["itn"];
}
if ((jsonresult["is_speaking"] == false ||
- jsonresult["is_finished"] == true) && msg_data->msg["is_eof"] != true) {
+ jsonresult["is_finished"] == true) &&
+ msg_data->msg["is_eof"] != true &&
+ msg_data->hotwords_embedding != NULL) {
LOG(INFO) << "client done";
// for offline, send all receive data to decoder engine
std::vector<std::vector<float>> hotwords_embedding_(*(msg_data->hotwords_embedding));
--
Gitblit v1.9.1