diff --git a/contrib/src/pjproject/fetch_and_patch.bat b/contrib/src/pjproject/fetch_and_patch.bat index fafb48d9aa4d872ac24fd56f74d683518e9a4055..e469ac31421bcf8a2ce3965f94b79442486ce0dc 100644 --- a/contrib/src/pjproject/fetch_and_patch.bat +++ b/contrib/src/pjproject/fetch_and_patch.bat @@ -41,6 +41,7 @@ bash -c "%PATCH_CMD% %UNIXPATH%pjproject/fix_ebusy_turn.patch" bash -c "%PATCH_CMD% %UNIXPATH%pjproject/ignore_ipv6_on_transport_check.patch" bash -c "%PATCH_CMD% %UNIXPATH%pjproject/fix_turn_connection_failure.patch" bash -c "%PATCH_CMD% %UNIXPATH%pjproject/disable_local_resolution.patch" +bash -c "%PATCH_CMD% %UNIXPATH%pjproject/fix_assert_on_connection_attempt.patch" %APPLY_CMD% %SRC%\pjproject\win32_vs_gnutls.patch %APPLY_CMD% %SRC%\pjproject\win_config.patch diff --git a/contrib/src/pjproject/fix_assert_on_connection_attempt.patch b/contrib/src/pjproject/fix_assert_on_connection_attempt.patch new file mode 100644 index 0000000000000000000000000000000000000000..43ffa2bb35f381743292811494fecc57e4d7195a --- /dev/null +++ b/contrib/src/pjproject/fix_assert_on_connection_attempt.patch @@ -0,0 +1,16 @@ + pjnath/src/pjnath/turn_sock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pjnath/src/pjnath/turn_sock.c b/pjnath/src/pjnath/turn_sock.c +index e6c60126..aa764019 100644 +--- a/pjnath/src/pjnath/turn_sock.c ++++ b/pjnath/src/pjnath/turn_sock.c +@@ -1597,7 +1597,7 @@ static void turn_on_connection_attempt(pj_turn_session *sess, + if (turn_sock->data_conn[i].state == DATACONN_STATE_NULL) + break; + } +- pj_assert(i < turn_sock->data_conn_cnt); ++ pj_assert(i < PJ_TURN_MAX_TCP_CONN_CNT); + ++turn_sock->data_conn_cnt; + + /* Init new data connection */ diff --git a/contrib/src/pjproject/rules.mak b/contrib/src/pjproject/rules.mak index 0463f54a6aba4b55ca1d782c28e9bee149f0898b..1ebc2bd428d5043311cc0fc0a569ca61ae1ee942 100644 --- a/contrib/src/pjproject/rules.mak +++ b/contrib/src/pjproject/rules.mak @@ -70,6 +70,7 @@ endif $(APPLY) $(SRC)/pjproject/ignore_ipv6_on_transport_check.patch $(APPLY) $(SRC)/pjproject/fix_turn_connection_failure.patch $(APPLY) $(SRC)/pjproject/disable_local_resolution.patch + $(APPLY) $(SRC)/pjproject/fix_assert_on_connection_attempt.patch $(UPDATE_AUTOCONFIG) $(MOVE)