From owner-svn-ports-all@freebsd.org Sun Jun 2 06:35:45 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 27E4115ACD3B; Sun, 2 Jun 2019 06:35:45 +0000 (UTC) (envelope-from arrowd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C22248D1AB; Sun, 2 Jun 2019 06:35:44 +0000 (UTC) (envelope-from arrowd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9861323413; Sun, 2 Jun 2019 06:35:44 +0000 (UTC) (envelope-from arrowd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x526Zi4L030933; Sun, 2 Jun 2019 06:35:44 GMT (envelope-from arrowd@FreeBSD.org) Received: (from arrowd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x526ZicW030931; Sun, 2 Jun 2019 06:35:44 GMT (envelope-from arrowd@FreeBSD.org) Message-Id: <201906020635.x526ZicW030931@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arrowd set sender to arrowd@FreeBSD.org using -f From: Gleb Popov Date: Sun, 2 Jun 2019 06:35:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r503283 - in head/multimedia/zoneminder: . files X-SVN-Group: ports-head X-SVN-Commit-Author: arrowd X-SVN-Commit-Paths: in head/multimedia/zoneminder: . files X-SVN-Commit-Revision: 503283 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C22248D1AB X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.94)[-0.942,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Jun 2019 06:35:45 -0000 Author: arrowd Date: Sun Jun 2 06:35:43 2019 New Revision: 503283 URL: https://svnweb.freebsd.org/changeset/ports/503283 Log: multimedia/zoneminder: Fix MP4 file generation by patching UB bug in src/zm_video.cpp file. The patch has also been merged upstream: https://github.com/ZoneMinder/zoneminder/pull/2628 Reviewed by: abi@abinet.ru (maintainer) Approved by: tcberner (mentor, implicit) Added: head/multimedia/zoneminder/files/patch-src_zm__video.cpp (contents, props changed) Modified: head/multimedia/zoneminder/Makefile Modified: head/multimedia/zoneminder/Makefile ============================================================================== --- head/multimedia/zoneminder/Makefile Sun Jun 2 05:38:03 2019 (r503282) +++ head/multimedia/zoneminder/Makefile Sun Jun 2 06:35:43 2019 (r503283) @@ -2,7 +2,7 @@ PORTNAME= zoneminder PORTVERSION= 1.32.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= bsd@abinet.ru Added: head/multimedia/zoneminder/files/patch-src_zm__video.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/zoneminder/files/patch-src_zm__video.cpp Sun Jun 2 06:35:43 2019 (r503283) @@ -0,0 +1,17 @@ +--- src/zm_video.cpp.orig 2018-12-08 14:22:36 UTC ++++ src/zm_video.cpp +@@ -455,11 +455,12 @@ int X264MP4Writer::x264encodeloop(bool bFlush) { + + /* Write the sample */ + if ( !buffer.empty() ) { ++ unsigned int bufSize = buffer.size(); + if ( !MP4WriteSample( + mp4h, + mp4vtid, +- buffer.extract(buffer.size()), +- buffer.size(), ++ buffer.extract(bufSize), ++ bufSize, + duration, + offset, + prevKeyframe) ) {