The branch, master has been updated via b59c7926aff3271ff0fe85ac46c6ca390dc81000 (commit) via 06142d3ef4754c9ebd6c4c5f52c858aa63811161 (commit) from f1b83c10d8beb43fcc70a6e88cf4325499f25857 (commit) - Log ----------------------------------------------------------------- commit b59c7926aff3271ff0fe85ac46c6ca390dc81000 Author: Howard Chu <hyc@highlandsun.com> AuthorDate: Wed Feb 28 14:41:01 2024 +0000 Commit: Howard Chu <hyc@highlandsun.com> CommitDate: Wed Feb 28 14:41:01 2024 +0000 Revert f3042b5bb7dcb42eda32ad9dd88029b24a2c282b Fix was incorrect. RTMPPacket_Free() is needed to prevent using the old m_body buffer with the new m_nBodySize. Actual fix is to prevent double-free in RTMP_Close by cleaaring m_body in vec array. diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c index 89fadb5..0162c88 100644 --- a/librtmp/rtmp.c +++ b/librtmp/rtmp.c @@ -3647,6 +3647,9 @@ RTMP_ReadPacket(RTMP *r, RTMPPacket *packet) { packet->m_nBodySize = AMF_DecodeInt24(header + 3); packet->m_nBytesRead = 0; + RTMPPacket_Free(packet); + if (r->m_vecChannelsIn[packet->m_nChannel]) + r->m_vecChannelsIn[packet->m_nChannel]->m_body = NULL; if (nSize > 6) { commit 06142d3ef4754c9ebd6c4c5f52c858aa63811161 Author: Howard Chu <hyc@highlandsun.com> AuthorDate: Wed Feb 28 14:40:07 2024 +0000 Commit: Howard Chu <hyc@highlandsun.com> CommitDate: Wed Feb 28 14:40:07 2024 +0000 include <limits.h> where needed diff --git a/librtmp/hashswf.c b/librtmp/hashswf.c index 32b2eed..e3669e3 100644 --- a/librtmp/hashswf.c +++ b/librtmp/hashswf.c @@ -25,6 +25,7 @@ #include <string.h> #include <ctype.h> #include <time.h> +#include <limits.h> #include "rtmp_sys.h" #include "log.h" diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c index 0865689..89fadb5 100644 --- a/librtmp/rtmp.c +++ b/librtmp/rtmp.c @@ -28,6 +28,7 @@ #include <string.h> #include <assert.h> #include <time.h> +#include <limits.h> #include "rtmp_sys.h" #include "log.h" ----------------------------------------------------------------------- Summary of changes: librtmp/hashswf.c | 1 + librtmp/rtmp.c | 4 ++++ 2 files changed, 5 insertions(+) hooks/post-receive --