main BUGFIX invalid memory access on rpc

Fixes #1695
CESNET · Jan 31, 2025 · 2efb81d · 2efb81d
1 parent 40de43a
commit 2efb81d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -54,8 +54,8 @@ set(LIBNETCONF2_DEP_SOVERSION 4.5.1)
 set(LIBNETCONF2_DEP_SOVERSION_MAJOR 4)
 
 # sysrepo required version
-set(SYSREPO_DEP_VERSION 3.4.3)
-set(SYSREPO_DEP_SOVERSION 7.30.0)
+set(SYSREPO_DEP_VERSION 3.4.8)
+set(SYSREPO_DEP_SOVERSION 7.30.5)
 set(SYSREPO_DEP_SOVERSION_MAJOR 7)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -std=c99")

diff --git a/src/main.c b/src/main.c
@@ -310,9 +310,13 @@ np2srv_rpc_cb(struct lyd_node *rpc, struct nc_session *ncs)
 
             /* error reply */
             reply = np_reply_err_sr(user_sess->sess, LYD_NAME(rpc));
+        } else if (output) {
+            /* data reply */
+            reply = np_reply_success(rpc, output->tree);
+            output->tree = NULL;
         } else {
-            /* OK/data reply */
-            reply = np_reply_success(rpc, output ? output->tree : NULL);
+            /* OK reply */
+            reply = np_reply_success(rpc, NULL);
         }
     }