upgrade gssdp

build_dependencies.sh

@@ -10,7 +10,7 @@ cd ${GITHUB_WORKSPACE}
 #1. Install Dependencies and packages
 
 apt update
-apt install -y ninja-build meson curl libsoup2.4-dev libxml2-dev libglib2.0-dev gobject-introspection libgirepository1.0-dev libgtk-3-dev valac pandoc
+apt install -y git python3 python3-pip cmake ninja-build meson curl libsoup2.4-dev libxml2-dev libglib2.0-dev gobject-introspection libgirepository1.0-dev libgtk-3-dev libcurl4-openssl-dev libcunit1-dev valac pandoc
 pip install jsonref
 
 ############################

server/CMakeLists.txt

@@ -26,14 +26,24 @@ set (GDIAL_VERSION_MINOR 0)
 find_package (PkgConfig REQUIRED)
 pkg_search_module (GLIB REQUIRED glib-2.0)
 pkg_search_module (GIO REQUIRED gio-2.0)
-pkg_search_module (GSSDP12 gssdp-1.2)
 pkg_search_module (LIBSOUP3 libsoup-3.0)
-if (GSSDP12_FOUND)
-  pkg_search_module (GSSDP REQUIRED gssdp-1.2)
-  add_definitions(-DHAVE_GSSDP_VERSION_1_2_OR_NEWER)
-  message("Using gssdp-1.2")
+if (LIBSOUP3_FOUND)
+  add_definitions(-DHAVE_LIBSOUP_VERSION_3)
+  pkg_search_module (GSSDP16 gssdp-1.6)
+  if (GSSDP16_FOUND)
+    pkg_search_module (GSSDP REQUIRED gssdp-1.6)
+    add_definitions(-DHAVE_GSSDP_VERSION_1_6_OR_NEWER)
+    message("Using gssdp-1.6")
+  endif()	
 else()
-  pkg_search_module (GSSDP REQUIRED gssdp-1.0)
+  pkg_search_module (GSSDP12 gssdp-1.2)
+  if (GSSDP12_FOUND)
+    pkg_search_module (GSSDP REQUIRED gssdp-1.2)
+    add_definitions(-DHAVE_GSSDP_VERSION_1_2_OR_NEWER)
+    message("Using gssdp-1.2")
+  else()
+    pkg_search_module (GSSDP REQUIRED gssdp-1.0)
+  endif()
 endif()
 if (LIBSOUP3_FOUND)
   pkg_search_module (SOUP REQUIRED libsoup-3.0)
@@ -73,14 +83,27 @@ include_directories (
   ${PROJECT_GLIB_INCLUDE_DIRS}
 )
 
-set (GDIAL_EXEC_SOURCE_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/gdial-util.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/gdial-app.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/gdial-rest.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/gdial-ssdp.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/gdial-shield.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/gdialservice.cpp
-)
+if (LIBSOUP3_FOUND)
+  set (GDIAL_EXEC_SOURCE_FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/gdial-util.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gdial-app.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gdial1p6-rest.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gdial1p6-ssdp.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gdial1p6-shield.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gdialservice.cpp
+  )
+  message("Using libsoup-3.0 compatible source files (gdial1p6-*.c)")
+else()
+  set (GDIAL_EXEC_SOURCE_FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/gdial-util.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gdial-app.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gdial-rest.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gdial-ssdp.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gdial-shield.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gdialservice.cpp
+  )
+  message("Using libsoup-2.4 compatible source files (gdial-*.c)")
+endif()
 
 link_directories (
   ${GLIB_LIBRARY_DIRS}

server/gdial-rest.c

@@ -540,6 +540,8 @@ static void gdial_rest_server_handle_POST(GDialRestServer *gdial_rest_server, So
   }
   else {
     g_object_unref(app);
+    // FIX(Copilot): Set app to NULL after unref to prevent use-after-free
+    app = NULL;
     gdial_rest_server_http_return_if(start_error == GDIAL_APP_ERROR_FORBIDDEN, msg, SOUP_STATUS_FORBIDDEN);
     gdial_rest_server_http_return_if(start_error == GDIAL_APP_ERROR_UNAUTH, msg, SOUP_STATUS_UNAUTHORIZED);
     gdial_rest_server_http_return_if(TRUE, msg, SOUP_STATUS_SERVICE_UNAVAILABLE);
@@ -653,7 +655,8 @@ static void gdial_rest_server_handle_POST_dial_data(GDialRestServer *gdial_rest_
       if (query) {
         GHashTable *dupQuery = gdial_util_str_str_hashtable_dup(query);
         body_query = query ? gdial_util_str_str_hashtable_merge(body_query, dupQuery) : body_query;
-        g_hash_table_destory(dupQuery);
+        // FIX(Copilot): Correct typo g_hash_table_destory -> g_hash_table_destroy
+        g_hash_table_destroy(dupQuery);
       }
     #endif
     gdial_app_set_additional_dial_data(app, body_query);

server/gdial-ssdp.c

@@ -257,6 +257,7 @@ int gdial_ssdp_new(SoupServer *ssdp_http_server, GDialOptions *options, const gc
 
 int gdial_ssdp_destroy() {
   GDIAL_LOGTRACE("Entering ...");
+  pthread_mutex_lock(&ssdpServerEventSync);
   if (ssdp_http_server_)
   {
     soup_server_remove_handler(ssdp_http_server_, "/dd.xml");