aboutsummaryrefslogtreecommitdiffstats
path: root/audio/mp3splt
diff options
context:
space:
mode:
authoradamw <adamw@FreeBSD.org>2008-06-25 12:25:32 +0800
committeradamw <adamw@FreeBSD.org>2008-06-25 12:25:32 +0800
commitebf94de3c5b145238a95e193af75c0a30f0be821 (patch)
tree1e9641c005fb5fa80eadb4c5ef1c4cada4135052 /audio/mp3splt
parentbbc562caf97a60daaf83446a1453dd235c6a0f22 (diff)
downloadfreebsd-ports-gnome-ebf94de3c5b145238a95e193af75c0a30f0be821.tar.gz
freebsd-ports-gnome-ebf94de3c5b145238a95e193af75c0a30f0be821.tar.zst
freebsd-ports-gnome-ebf94de3c5b145238a95e193af75c0a30f0be821.zip
Add a fix to prevent a segfault when an mp3 file is followed by a
Vorbis file. Transfer maintainership to the submitter, at the request of the previous maintainer. PR: ports/124616 Submitted by: Fabian Keil <fk@fabiankeil.de> Approved by: Original maintainer (uspoerlein@mgail.com)
Diffstat (limited to 'audio/mp3splt')
-rw-r--r--audio/mp3splt/Makefile4
-rw-r--r--audio/mp3splt/files/patch-mp3splt.c16
2 files changed, 18 insertions, 2 deletions
diff --git a/audio/mp3splt/Makefile b/audio/mp3splt/Makefile
index 127b9dd1c22e..c422d5c1f5dd 100644
--- a/audio/mp3splt/Makefile
+++ b/audio/mp3splt/Makefile
@@ -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@gmail.com
+MAINTAINER= fk@fabiankeil.de
COMMENT= Utility to split mp3 and ogg files (via CUE sheets)
OPTIONS= VORBIS "Ogg Vorbis support" On
diff --git a/audio/mp3splt/files/patch-mp3splt.c b/audio/mp3splt/files/patch-mp3splt.c
new file mode 100644
index 000000000000..323aee6be945
--- /dev/null
+++ b/audio/mp3splt/files/patch-mp3splt.c
@@ -0,0 +1,16 @@
+--- mp3splt.c.orig 2008-06-25 00:19:32.000000000 -0400
++++ mp3splt.c 2008-06-25 00:20:37.000000000 -0400
+@@ -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 an 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()