Merge commit '2f45d5de4678be1a968ebe2ee08bc1d483cd1ff5'

Author: sobomax

rtpproxy/.github/workflows/rtpproxy_ci.yml

@@ -54,10 +54,12 @@ jobs:
           compiler: 'clang-16'
         - os: 24.04
           compiler: 'clang-17'
-        - os: 24.04
-          compiler: 'clang-18'
+#        - os: 24.04
+#          compiler: 'clang-18' <- this is the same as "clang" on 24.04
         - os: 24.04
           compiler: 'clang-19'
+        - os: 24.04
+          compiler: 'clang-20'
 
     steps:
     - uses: actions/checkout@v4

rtpproxy/modules/ice_lite/rtpp_ice_lite.c

@@ -253,6 +253,8 @@ rtpp_ice_lite_worker(const struct rtpp_wthrdata *wp)
         struct sa raddr = {0};
         rtpp2re_sa(&raddr, sstosa(&pkt->raddr));
         ila_c->sock->strmp_in = wip->strmp_in;
+        if (ila_c->sock->rh == NULL)
+            goto out;
         ila_c->sock->rh(&raddr, mb, ila_c->sock->rh_arg);
         bool completed = iscompleted(ila_c->icem);
         if (!ila_iscompleted(ila_c) && completed) {
@@ -261,6 +263,7 @@ rtpp_ice_lite_worker(const struct rtpp_wthrdata *wp)
             CALL_SMETHOD(ila_c->sock->strmp_in, latch, pkt);
             atomic_store_explicit(&ila_c->completed, true, memory_order_relaxed);
         }
+out:
         pthread_mutex_unlock(&ila_c->state_lock);
         RTPP_OBJ_DECREF(pkt);
         RTPP_OBJ_DECREF(wi);

rtpproxy/scripts/fuzz/libssl-dev.patch

@@ -130,3 +130,25 @@ Last-Update: 2024-08-16
 
          data.ssl_version = s->version;
          if (!ossl_assert(sess_id_len <= SSL_MAX_SSL_SESSION_ID_LENGTH))
+--- openssl-1.1.1f/fuzz/client.c.orig	2026-03-12 20:18:46.424656000 -0700
++++ openssl-1.1.1f/fuzz/client.c	2026-03-12 20:19:18.983162000 -0700
+@@ -34,7 +34,7 @@
+  * in things not being fully reproducible and have a slightly
+  * different coverage.
+  */
+-#if !defined(_WIN32)
++#if !defined(_WIN32) && !defined(time)
+ time_t time(time_t *t) TIME_IMPL(t)
+ #endif
+ 
+--- openssl-1.1.1f/fuzz/server.c.orig	2026-03-12 20:18:46.424656000 -0700
++++ openssl-1.1.1f/fuzz/server.c	2026-03-12 20:19:18.983162000 -0700
+@@ -34,7 +34,7 @@
+  * in things not being fully reproducible and have a slightly
+  * different coverage.
+  */
+-#if !defined(_WIN32)
++#if !defined(_WIN32) && !defined(time)
+ time_t time(time_t *t) TIME_IMPL(t)
+ #endif
+ 

rtpproxy/scripts/fuzz/oss-fuzz-build.sh

@@ -5,7 +5,7 @@ set -x
 set -o pipefail
 
 CC="${CC:-"clang19"}"
-CXX="${CXX:-"${CC}"}"
+CXX="${CXX:-"clang++19"}"
 CFLAGS="${CFLAGS:-"-g3 -O1 -Wall"}"
 CXXFLAGS="${CXXFLAGS:-"${CFLAGS}"}"
 OUT="${OUT:-"."}"
@@ -20,14 +20,16 @@ install_src_pkg() {
   local PKGNAME="${1}"
   mkdir -p /tmp/src/libfuzzer
   local TMPDIR="`mktemp -d /tmp/src/libfuzzer/${PKGNAME}.XXXXXXXX`"
+  local TMPFILE="${TMPDIR}/time_hack.h"
+  printf '#define _GNU_SOURCE\n#include <time.h>\n#define time(x) ({if((x) != NULL) *(time_t *)(x) = 0x69b30000; 0x69b30000;})\n'  > "${TMPFILE}"
   local OLD_PWD="`pwd`"
   cd ${TMPDIR}
   apt-get build-dep -y ${PKGNAME}
   apt-get source ${PKGNAME}
   cd ${2}-*
   (head -n 1 debian/rules; \
-   echo "export CFLAGS=${CFLAGS}"; \
-   echo "export CXXFLAGS=${CXXFLAGS}"; \
+   echo "export CFLAGS=${CFLAGS} --include ${TMPFILE}"; \
+   echo "export CXXFLAGS=${CXXFLAGS} --include ${TMPFILE}"; \
    echo "export RANLIB=${RANLIB}"; \
    tail -n +2 debian/rules) > debian/_rules
   mv debian/_rules debian/rules
@@ -84,7 +86,7 @@ fi
 
 LD="lld"
 LD_BIN="ld.lld"
-LDFLAGS="-fuse-ld=${LD}"
+LDFLAGS="${LDFLAGS} -fuse-ld=${LD}"
 
 CFLAGS="${CFLAGS} -DRTPP_DEBUG_refcnt=1"
 CXXFLAGS="${CXXFLAGS} -DRTPP_DEBUG_refcnt=1"
@@ -110,7 +112,7 @@ for src in rfz_chunk.c rfz_command.c rfz_utils.c
 do
   obj="${OUT}/${src%.*}.o"
   src=scripts/fuzz/${src}
-  ${CC} ${CFLAGS} ${LIB_FUZZING_ENGINE} -Isrc -o ${obj} -c ${src}
+  ${CC} ${CFLAGS} -Isrc -o ${obj} -c ${src}
   OBJS="${OBJS} ${obj}"
 done
 
@@ -119,7 +121,7 @@ OBJS0="${OBJS}"
 for fz in ${ALL}
 do
   obj="${OUT}/fuzz_${fz}.o"
-  ${CC} ${CFLAGS} ${LIB_FUZZING_ENGINE} -Isrc -Imodules/acct_rtcp_hep \
+  ${CC} ${CFLAGS} -Isrc -Imodules/acct_rtcp_hep \
    -o "${obj}" -c scripts/fuzz/fuzz_${fz}.c
   OBJS="${OBJS0} ${obj}"
 
@@ -132,8 +134,8 @@ do
       ;;
   esac
 
-  ${CXX} ${CXXFLAGS} ${LIB_FUZZING_ENGINE} ${LDFLAGS} -o ${OUT}/fuzz_${fz} \
-   ${OBJS} ${LIBRTPP} -lm ${LIBSRTP}
+  ${CXX} ${CXXFLAGS} ${LDFLAGS} -o ${OUT}/fuzz_${fz} \
+   ${OBJS} ${LIBRTPP} -lm ${LIBSRTP} ${LIB_FUZZING_ENGINE}
 
   for suff in dict options
   do