Merge pull request #6 from ThibaultBee/bugfix/setSockOpt

ThibaultBee · Aug 27, 2020 · 105b376 · 105b376
2 parents b83ddf1 + 0660d81
commit 105b376
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/src/main/cpp/glue.cpp b/lib/src/main/cpp/glue.cpp
@@ -304,13 +304,14 @@ nativeSetSockOpt(JNIEnv *env,
     int optval_len = 0;
     const void *optval = srt_optval_j2n(env, optVal, &optval_len);
 
-    int res = srt_setsockopt((SRTSOCKET) u,
-                             0 /*level: ignored*/, (SRT_SOCKOPT) sockopt, optval, optval_len);
-
     if (!optval) {
-        free((void *) optval);
+        return -EFAULT;
     }
 
+    int res = srt_setsockopt((SRTSOCKET) u,
+                             0 /*level: ignored*/, (SRT_SOCKOPT) sockopt, optval, optval_len);
+    free((void *) optval);
+
     return
             res;
 }

diff --git a/lib/src/main/cpp/structs.cpp b/lib/src/main/cpp/structs.cpp
@@ -308,7 +308,7 @@ srt_optval_j2n(JNIEnv *env, jobject optVal, int *optval_len) {
         return nullptr;
     }
 
-    if (strcmp(class_name, "java.lang.String;") == 0) {
+    if (strcmp(class_name, "java.lang.String") == 0) {
         const char *optval = env->GetStringUTFChars((jstring) optVal, nullptr);
         *optval_len = strlen(optval);
         srt_optval = strdup(optval);