January 2016 - rtmpdump - lists.mplayerhq.hu

[PATCH 0/3] Haiku port
by François Revol 10 Mar '17

10 Mar '17

This patchset adds support building on Haiku. - we need -lnetwork - we have pthread already in libroot - we declare fd_set in <sys/select.h> as per POSIX For the record, the HaikuPorts recipe is at: https://github.com/haikuports/haikuports/tree/master/media-video/rtmpdump François.

3 8

add packet size check in ServeInvoke() for rtmpsuck
by fcicq 12 Jan '16

12 Jan '16

Without the nBodySize check, the later (body[0] != 0x02) check will trigger a null pointer deference and cause a crash. This kind of empty packet may have some relationship with NetStream.Video.DimensionChange event. diff --git a/rtmpsuck.c b/rtmpsuck.c index e886179..633a1f3 100644 --- a/rtmpsuck.c +++ b/rtmpsuck.c @@ -160,6 +160,12 @@ ServeInvoke(STREAMING_SERVER *server, int which, RTMPPacket *pack, const char *b int ret = 0, nRes; int nBodySize = pack->m_nBodySize; + if (!nBodySize) + { + RTMP_Log(RTMP_LOGERROR, "%s, empty packet from %s", __FUNCTION__, cst[which]); + return 0; + } + if (body > pack->m_body) nBodySize--;

3 4

add alive check for paused stream for rtmpsuck
by fcicq 12 Jan '16

12 Jan '16

Another segmentation fault (null pointer deref) on server->rc.m_channelTimestamp access and lead to a crash. The video source was suddenly paused before the crash. I found the only place to free this variable is at CloseInternal() in librtmp/rtmp.c, so this null pointer means CloseInternal() was called before the access to server->rc.m_channelTimestamp. I think the patch attached, which checks RTMP_IsConnected(&server->rc) is the correct fix to handle this issue. [Switching to Thread 0x7ffff4f24700 (LWP 859)] doServe (arg=0x7ffff00008c0) at rtmpsuck.c:912 912 server->rc.m_pauseStamp = server->rc.m_channelTimestamp[server->rc.m_mediaChannel]; (gdb) bt #0 doServe (arg=0x7ffff00008c0) at rtmpsuck.c:912 #1 0x00007ffff79b86aa in start_thread (arg=0x7ffff4f24700) at pthread_create.c:333 #2 0x00007ffff74d0eed in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:109 (gdb) p server->rc.m_mediaChannel $1 = 4 (gdb) p server->rc.m_channelTimestamp $2 = (int *) 0x0 diff --git a/rtmpsuck.c b/rtmpsuck.c index e886179..f5cd313 100644 --- a/rtmpsuck.c +++ b/rtmpsuck.c @@ -815,7 +907,7 @@ TFTYPE doServe(void *arg) // server socket and state (our listening socket) if (select(n + 1, &rfds, NULL, NULL, &tv) <= 0) { - if (server->f_cur && server->rc.m_mediaChannel && !paused) + if (server->f_cur && server->rc.m_mediaChannel && !paused && RTMP_IsConnected(&server->rc)) { server->rc.m_pauseStamp = server->rc.m_channelTimestamp[server->rc.m_mediaChannel]; if (RTMP_ToggleStream(&server->rc))

1 0