ports/124616: [PATCH] Prevent audio/mp3splt from segfaulting if vorbis file is split after mp3 file

[Fabian Keil]

The following reply was made to PR ports/124616; it has been noted by GNATS.

From: Fabian Keil <fk at fabiankeil.de>
To: Ulrich Spoerlein <uspoerlein at gmail.com>
Cc: bug-followup at FreeBSD.org
Subject: Re: ports/124616: [PATCH] Prevent audio/mp3splt from segfaulting if
 vorbis file is split after mp3 file
Date: Sun, 15 Jun 2008 18:56:07 +0200

 --MP_/Q2nhk4KpWrDkFuQHrlLrb=A
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 Ulrich Spoerlein <uspoerlein at gmail.com> wrote:
 
 > looks ok to me. Might you even be interessted in maintaining the port?
 
 Sure, thanks. The attached patch additionally changes MAINTAINER to my address.
 
 Fabian
 --MP_/Q2nhk4KpWrDkFuQHrlLrb=A
 Content-Type: text/x-patch; name=mp3splt-2.1c-3.diff
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=mp3splt-2.1c-3.diff
 
 diff -u -ruN mp3splt.orig/Makefile mp3splt/Makefile
 --- mp3splt.orig/Makefile	2008-02-07 16:09:10.100268000 +0100
 +++ mp3splt/Makefile	2008-06-15 18:40:42.119638378 +0200
 @@ -7,13 +7,13 @@
  
  PORTNAME=	mp3splt
  PORTVERSION=	2.1c
 -PORTREVISION=	2
 +PORTREVISION=	3
  CATEGORIES=	audio
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	${PORTNAME}
  DISTNAME=	${PORTNAME}-${PORTVERSION}-src
  
 -MAINTAINER=	uspoerlein at gmail.com
 +MAINTAINER=	fk at fabiankeil.de
  COMMENT=	Utility to split mp3 and ogg files (via CUE sheets)
  
  OPTIONS=	VORBIS	"Ogg Vorbis support" On
 diff -u -ruN mp3splt.orig/files/patch-mp3splt.c mp3splt/files/patch-mp3splt.c
 --- mp3splt.orig/files/patch-mp3splt.c	1970-01-01 01:00:00.000000000 +0100
 +++ mp3splt/files/patch-mp3splt.c	2008-04-27 21:07:59.025871032 +0200
 @@ -0,0 +1,16 @@
 +--- mp3splt.c.orig	2005-03-26 14:51:56.000000000 +0100
 ++++ mp3splt.c	2008-04-27 21:05:45.396787349 +0200
 +@@ -114,6 +114,13 @@
 + 		if (state->mstate) {
 + 			fclose(state->mstate->file_input);
 + 			mp3_state_free(state->mstate);
 ++                        /*
 ++                         * Explicitly setting mstate to NULL
 ++                         * prevents encoding misdetection (resulting
 ++                         * in a crash) if a mp3 file is followed by
 ++                         * a vorbis file.
 ++                         */
 ++                        state->mstate = NULL;
 + 		}
 + #ifndef NO_OGG
 + 		else if (state->ostate) { // If file has been opened with ov_open we should close it using ov_clear()
 
 --MP_/Q2nhk4KpWrDkFuQHrlLrb=A--