update to newer RTMPDump snapshot and K-S-V patch, fixes some vulnerabilities

AMFProp_GetObject must make sure the prop is actually an object
Obsolete RTMPPacket_Free() call left over from original C++ to C rewrite
Potential integer overflow in RTMPPacket_Alloc()
Ignore zero-length packets
Additional decode input size checks
This commit is contained in:
sthen 2015-12-30 14:10:50 +00:00
parent bbd22c733b
commit 332f9f27ca
2 changed files with 11 additions and 11 deletions

View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.30 2015/12/03 21:24:31 sthen Exp $ # $OpenBSD: Makefile,v 1.31 2015/12/30 14:10:50 sthen Exp $
SHARED_LIBS = rtmp 1.0 SHARED_LIBS = rtmp 1.1
COMMENT = dump RTMP media streams COMMENT = dump RTMP media streams
DISTNAME = rtmpdump-2.4pl8 # also see VERSION in MAKE_FLAGS below
PATCHFILES = rtmpdump-KSV-20150505.patch.gz DISTNAME = rtmpdump-2.4.20151223
WRKDIST = ${WRKDIR}/rtmpdump PATCHFILES = rtmpdump-KSV-20151215.patch.gz
CATEGORIES = net CATEGORIES = net
@ -18,14 +18,14 @@ PERMIT_PACKAGE_FTP = Yes
WANTLIB = c crypto m pthread ssl z WANTLIB = c crypto m pthread ssl z
# packaged from git://git.ffmpeg.org/rtmpdump : a107cef9 # packaged from git://git.ffmpeg.org/rtmpdump : fa8646da
# and patch from https://github.com/K-S-V/Scripts/releases/, see # and patch from https://github.com/K-S-V/Scripts/releases/, see
# http://stream-recorder.com/forum/customized-rtmpdump-binaries-patch-file-t16103.html # http://stream-recorder.com/forum/customized-rtmpdump-binaries-patch-file-t16103.html
MASTER_SITES = https://spacehopper.org/mirrors/ MASTER_SITES = https://spacehopper.org/mirrors/
MAKE_FLAGS = CC="${CC}" XCFLAGS="${CFLAGS}" OPT= \ MAKE_FLAGS = CC="${CC}" XCFLAGS="${CFLAGS}" OPT= \
THREADLIB=-pthread SO_VERSION=${LIBrtmp_VERSION} \ THREADLIB=-pthread SO_VERSION=${LIBrtmp_VERSION} \
VERSION="v2.4-git-a107cef9\ KSV-2015-05-05" VERSION="v2.4-git-fa8646da\ KSV-2015-12-15"
NO_TEST = Yes NO_TEST = Yes

View File

@ -1,4 +1,4 @@
SHA256 (rtmpdump-2.4pl8.tar.gz) = wSetVWZzcfZ/ENrI5Tqv3z/Df3JZldTHhzmqeYbLcd0= SHA256 (rtmpdump-2.4.20151223.tar.gz) = Q6HnAc68v1OyNEc8Z/ElIvqLzOuKVZtm9C52xFjSQ7A=
SHA256 (rtmpdump-KSV-20150505.patch.gz) = rNSnOJH/2Cq3fiYqPuicJGKxvbNZzI7id0sERaJYoTw= SHA256 (rtmpdump-KSV-20151215.patch.gz) = SClmn4OtsQcKCfTMP48hL/1ZA8WiODbcCZel8hhxbII=
SIZE (rtmpdump-2.4pl8.tar.gz) = 142257 SIZE (rtmpdump-2.4.20151223.tar.gz) = 142583
SIZE (rtmpdump-KSV-20150505.patch.gz) = 29979 SIZE (rtmpdump-KSV-20151215.patch.gz) = 31715