wrapper/node-srt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

node-src.cc: fix erratic value passed to srt_setsockflag for length argument

Browse source 
(SRT API params are typeless, and for strings it expects the string **length** obviously,
while what was put there is some random constant related to the allocated size of platform specific string container class!! :D)
& compiler warning regarding std::string/c_str-pointer lifecycles,
std::string needs to stay on stack until srt_setsockflag call to be safe indeed.
+ add JS-exception thrown for unexpected value type passed
+ SRT_SOCKOPT cast general style fixes
This commit is contained in:
Stephan Hesse 2022-04-28 16:27:54 +02:00
parent 12fd413117
commit 418deaec2a
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/node-srt.cc
View file

@ -253,7 +253,7 @@ Napi::Value NodeSRT::SetSockOpt(const Napi::CallbackInfo& info) {
Napi::Number value = info[2].As<Napi::Number>();
int32_t optName = option;
int optValue = value;
result = srt_setsockflag(socketValue, (SRT_SOCKOPT)optName, &optValue, sizeof(int));
result = srt_setsockflag(socketValue, (SRT_SOCKOPT) optName, &optValue, sizeof(int));
if (result == SRT_ERROR) {
Napi::Error::New(env, srt_getlasterror_str()).ThrowAsJavaScriptException();
return Napi::Number::New(env, SRT_ERROR);
@ -262,7 +262,7 @@ Napi::Value NodeSRT::SetSockOpt(const Napi::CallbackInfo& info) {
Napi::Boolean value = info[2].As<Napi::Boolean>();
int32_t optName = option;
bool optValue = value;
result = srt_setsockflag(socketValue, (SRT_SOCKOPT)optName, &optValue, sizeof(bool));
result = srt_setsockflag(socketValue, (SRT_SOCKOPT) optName, &optValue, sizeof(bool));
if (result == SRT_ERROR) {
Napi::Error::New(env, srt_getlasterror_str()).ThrowAsJavaScriptException();
return Napi::Number::New(env, SRT_ERROR);
@ -270,12 +270,14 @@ Napi::Value NodeSRT::SetSockOpt(const Napi::CallbackInfo& info) {
} else if (info[2].IsString()) {
Napi::String value = info[2].As<Napi::String>();
int32_t optName = option;
const char * optValue = std::string(value).c_str();
result = srt_setsockflag(socketValue, (SRT_SOCKOPT)optName, optValue, sizeof(string));
std::string optValue = std::string(value);
result = srt_setsockflag(socketValue, (SRT_SOCKOPT) optName, optValue.c_str(), optValue.length());
if (result == SRT_ERROR) {
Napi::Error::New(env, srt_getlasterror_str()).ThrowAsJavaScriptException();
return Napi::Number::New(env, SRT_ERROR);
}
} else {
Napi::Error::New(env, "Unexpected argument type for srt_setsockflag").ThrowAsJavaScriptException();
}
return Napi::Number::New(env, result);
}