diff options
| author | Christian Weisgerber <naddy@FreeBSD.org> | 2007-07-21 15:39:05 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@FreeBSD.org> | 2007-07-21 15:39:05 +0000 |
| commit | 7bfb8b8c61122b324ecb51af7052388b54e14dcb (patch) | |
| tree | 1bb656996bb211587488b122498a7bfa38a4559b /audio/mpg321 | |
| parent | Obey default EMACS_PORT_NAME defined in bsd.emacs.mk. (diff) | |
initialize some variables so we won't call free() on random pointers
Notes
Notes:
svn path=/head/; revision=195993
Diffstat (limited to 'audio/mpg321')
| -rw-r--r-- | audio/mpg321/Makefile | 2 | ||||
| -rw-r--r-- | audio/mpg321/files/patch-mpg321.c | 23 |
2 files changed, 17 insertions, 8 deletions
diff --git a/audio/mpg321/Makefile b/audio/mpg321/Makefile index 432887efce82..120595357af8 100644 --- a/audio/mpg321/Makefile +++ b/audio/mpg321/Makefile @@ -7,7 +7,7 @@ PORTNAME= mpg321 PORTVERSION= 0.2.10 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= mpg321 diff --git a/audio/mpg321/files/patch-mpg321.c b/audio/mpg321/files/patch-mpg321.c index 344e69a6908a..5d685f7d8171 100644 --- a/audio/mpg321/files/patch-mpg321.c +++ b/audio/mpg321/files/patch-mpg321.c @@ -1,8 +1,8 @@ $FreeBSD$ ---- mpg321.c.orig Sun Mar 24 06:49:20 2002 -+++ mpg321.c Wed Jan 7 21:12:40 2004 +--- mpg321.c.orig ++++ mpg321.c @@ -188,7 +188,7 @@ else @@ -21,7 +21,16 @@ $FreeBSD$ free (names[i]); } if (i%2) fprintf (stderr, "\n"); -@@ -410,12 +410,14 @@ +@@ -285,6 +285,8 @@ + signal(SIGINT, SIG_DFL); + + playbuf.buf = NULL; ++ playbuf.frames = NULL; ++ playbuf.times = NULL; + playbuf.fd = -1; + playbuf.length = 0; + playbuf.done = 0; +@@ -410,12 +412,14 @@ if(fstat(fd, &stat) == -1) { @@ -36,7 +45,7 @@ $FreeBSD$ continue; } -@@ -432,6 +434,7 @@ +@@ -432,6 +436,7 @@ if((playbuf.buf = mmap(0, playbuf.length, PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED) { @@ -44,7 +53,7 @@ $FreeBSD$ mpg321_error(currentfile); continue; } -@@ -509,9 +512,6 @@ +@@ -509,9 +514,6 @@ mad_decoder_finish(&decoder); @@ -54,7 +63,7 @@ $FreeBSD$ if (playbuf.frames) free(playbuf.frames); -@@ -521,6 +521,7 @@ +@@ -521,6 +523,7 @@ if (playbuf.fd == -1) { munmap(playbuf.buf, playbuf.length); @@ -62,7 +71,7 @@ $FreeBSD$ } else -@@ -535,10 +536,6 @@ +@@ -535,10 +538,6 @@ ao_close(playdevice); ao_shutdown(); |