View | Details | Raw Unified | Return to bug 119476
Collapse All | Expand All

(-)/data/compile/flac/port/Makefile (-4 / +8 lines)
Lines 6-17 Link Here
6
 #
6
 #
7
 PORTNAME=	flac
7
 PORTNAME=	flac
8
PORTVERSION=	1.1.2
8
PORTVERSION=	1.2.1
9
PORTREVISION=	2
9
PORTREVISION=	0
10
 CATEGORIES=	audio
10
 CATEGORIES=	audio
11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:sf/} \
11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:sf/} \
12
 		${MASTER_SITE_LOCAL:S/$/:local/}
12
 		${MASTER_SITE_LOCAL:S/$/:local/}
13
 MASTER_SITE_SUBDIR=	${PORTNAME}/:sf naddy/:local
13
 MASTER_SITE_SUBDIR=	${PORTNAME}/:sf naddy/:local
14
DISTNAME=	flac-${PORTVERSION}
14
 DISTFILES=	${EXTRACT_ONLY}:sf flac-alloc.h:local
15
 DISTFILES=	${EXTRACT_ONLY}:sf flac-alloc.h:local
15
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
16
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
Lines 25-34 Link Here
25
 GNU_CONFIGURE=	yes
26
 GNU_CONFIGURE=	yes
26
 CONFIGURE_TARGET=	--target=${ARCH}-unknown-freebsd${OSREL}
27
 CONFIGURE_TARGET=	--target=${ARCH}-unknown-freebsd${OSREL}
27
 CONFIGURE_ARGS=	--enable-sse \
28
 CONFIGURE_ARGS=	--enable-sse \
29
		--with-xmms-prefix="${LOCALBASE}" \
28
 		--with-libiconv-prefix="${LOCALBASE}" \
30
 		--with-libiconv-prefix="${LOCALBASE}" \
29
 		--with-ogg="${LOCALBASE}"
31
 		--with-ogg="${LOCALBASE}"
30
CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/include" \
32
CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/include"
31
		ac_cv_path_XMMS_CONFIG=no
33
34
DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
32
 .if defined(NOPORTDOCS)
35
 .if defined(NOPORTDOCS)
33
 MAKE_ENV=	DOC=""
36
 MAKE_ENV=	DOC=""
Lines 52-57 Link Here
52
 post-configure:
55
 post-configure:
53
 	@${RM} -rf ${WRKSRC}/obj
56
 	@${RM} -rf ${WRKSRC}/obj
57
# for files/patch-man_flac.1:
54
 post-build:
58
 post-build:
55
 	${REINPLACE_CMD} 's:%%PREFIX%%:${PREFIX}:' ${WRKSRC}/man/flac.1
59
 	${REINPLACE_CMD} 's:%%PREFIX%%:${PREFIX}:' ${WRKSRC}/man/flac.1
(-)/data/compile/flac/port/distinfo (-3 / +3 lines)
Lines 1-6 Link Here
1
MD5 (flac-1.1.2.tar.gz) = 2bfc127cdda02834d0491ab531a20960
1
MD5 (flac-1.2.1.tar.gz) = 153c8b15a54da428d1f0fadc756c22c7
2
SHA256 (flac-1.1.2.tar.gz) = ce4f7d11b3c04a7368c916ca4abc284dd0c0256f461dfb7f07df1ab445e7a5c0
2
SHA256 (flac-1.2.1.tar.gz) = 9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf
3
SIZE (flac-1.1.2.tar.gz) = 1516235
3
SIZE (flac-1.2.1.tar.gz) = 2009217
4
 MD5 (flac-alloc.h) = 08891390039e2aee9bd4335f784467db
4
 MD5 (flac-alloc.h) = 08891390039e2aee9bd4335f784467db
5
 SHA256 (flac-alloc.h) = da40afc663e5b3fe6dccd1a0f1c218b7ec02d3699d72b41d6978696896d7df98
5
 SHA256 (flac-alloc.h) = da40afc663e5b3fe6dccd1a0f1c218b7ec02d3699d72b41d6978696896d7df98
6
 SIZE (flac-alloc.h) = 5697
6
 SIZE (flac-alloc.h) = 5697
(-)/data/compile/flac/port/files/patch-Makefile.in (-13 / +10 lines)
Lines 1-14 Link Here
1
1
--- Makefile.in.orig	2008-01-08 07:30:16.000000000 +0100
2
$FreeBSD: ports/audio/flac/files/patch-Makefile.in,v 1.3 2005/03/16 14:49:23 naddy Exp $
2
+++ Makefile.in	2008-01-08 07:30:16.000000000 +0100
3
3
@@ -234,7 +234,7 @@
4
--- Makefile.in.orig
4
 
5
+++ Makefile.in
5
 AUTOMAKE_OPTIONS = foreign 1.7
6
@@ -258,7 +258,7 @@
6
 
7
 sharedstatedir = @sharedstatedir@
7
-SUBDIRS = doc include m4 man src examples test build obj
8
 sysconfdir = @sysconfdir@
8
+SUBDIRS = $(DOC) include m4 man src examples test build
9
 target_alias = @target_alias@
9
10
-SUBDIRS = doc include man src test build flac.pbproj obj
11
+SUBDIRS = $(DOC) include man src test build flac.pbproj
12
  DISTCLEANFILES = libtool-disable-static
10
  DISTCLEANFILES = libtool-disable-static
13
 EXTRA_DIST = \
11
 
14
 	COPYING.FDL \
(-)/data/compile/flac/port/files/patch-configure (-15 / +34 lines)
Lines 1-17 Link Here
1
1
--- configure.orig	2007-09-16 22:05:33.000000000 +0200
2
$FreeBSD: ports/audio/flac/files/patch-configure,v 1.7 2005/03/16 14:49:23 naddy Exp $
2
+++ configure	2008-01-08 17:49:51.000000000 +0100
3
3
@@ -19591,10 +19591,10 @@
4
--- configure.orig
4
 
5
+++ configure
5
 
6
@@ -10541,9 +10541,9 @@
6
 # This can be used to rebuild libtool when needed
7
 if test x$debug = xtrue; then
7
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
8
 	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -O0 -DDEBUG"
8
+LIBTOOL_DEPS=" /usr/local/share/libtool/ltmain.sh"
9
 else
9
 
10
-	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O2 -DNDEBUG"
10
 # Always use our own libtool.
11
+	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -DNDEBUG"
11
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
12
 	if test x$GCC = xyes; then
12
+LIBTOOL='$(SHELL) /usr/local/bin/libtool'
13
-		OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
13
 
14
+		OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -Wall -W -DFLaC__INLINE=__inline__"
14
 # Prevent multiple expansion
15
 
16
@@ -23114,11 +23114,6 @@
17
 #ifdef __cplusplus
18
 "C"
19
 #endif
20
-#if defined(__STDC__) || defined(__cplusplus)
21
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
22
-#else
23
-size_t iconv();
24
-#endif
25
 
26
 int
27
 main ()
28
@@ -23490,7 +23485,7 @@
29
 	CPPFLAGS="-DNDEBUG $CPPFLAGS"
30
 	if test "x$GCC" = xyes; then
31
 		CPPFLAGS="-DFLaC__INLINE=__inline__ $CPPFLAGS"
32
-		CFLAGS="-O3 -funroll-loops -finline-functions -Wall -W -Winline $CFLAGS"
33
+		CFLAGS="-O2 -funroll-loops  -Wall -W -Winline $CFLAGS"
15
  	fi
34
  	fi
16
  fi
35
  fi
17
 CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS"
36
 
(-)/data/compile/flac/port/files/patch-doc_Makefile.in (-14 lines)
Lines 1-14 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-doc_Makefile.in,v 1.3 2005/03/16 14:49:23 naddy Exp $
3
4
--- doc/Makefile.in.orig
5
+++ doc/Makefile.in
6
@@ -236,7 +236,7 @@
7
 target_alias = @target_alias@
8
 AUTOMAKE_OPTIONS = foreign
9
 SUBDIRS = . html
10
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
11
+docdir = $(datadir)/doc/$(PACKAGE)
12
 doc_DATA = \
13
 	FLAC.tag
14
 
(-)/data/compile/flac/port/files/patch-doc_html_Makefile.in (-35 lines)
Lines 1-35 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-doc_html_Makefile.in,v 1.2 2005/03/16 14:49:23 naddy Exp $
3
4
--- doc/html/Makefile.in.orig
5
+++ doc/html/Makefile.in
6
@@ -236,7 +236,7 @@
7
 target_alias = @target_alias@
8
 AUTOMAKE_OPTIONS = foreign
9
 SUBDIRS = ru images
10
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html
11
+docdir = $(datadir)/doc/$(PACKAGE)/html
12
 doc_DATA = \
13
 	changelog.html \
14
 	comparison.html \
15
@@ -577,13 +577,13 @@
16
 
17
 # The install targets don't copy whole directories so we have to
18
 # handle 'api/' specially:
19
-@FLaC__HAS_DOXYGEN_TRUE@install-data-local:
20
-@FLaC__HAS_DOXYGEN_TRUE@	$(mkinstalldirs) $(DESTDIR)$(docdir)/api
21
-@FLaC__HAS_DOXYGEN_TRUE@	(cd api && $(INSTALL_DATA) * $(DESTDIR)$(docdir)/api)
22
-@FLaC__HAS_DOXYGEN_TRUE@uninstall-local:
23
-@FLaC__HAS_DOXYGEN_TRUE@	rm -rf $(DESTDIR)$(docdir)/api
24
-@FLaC__HAS_DOXYGEN_TRUE@maintainer-clean-local:
25
-@FLaC__HAS_DOXYGEN_TRUE@	rm -rf api
26
+install-data-local:
27
+	$(mkinstalldirs) $(DESTDIR)$(docdir)/api
28
+	(cd api && $(INSTALL_DATA) * $(DESTDIR)$(docdir)/api)
29
+uninstall-local:
30
+	rm -rf $(DESTDIR)$(docdir)/api
31
+maintainer-clean-local:
32
+	rm -rf api
33
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
34
 # Otherwise a system limit (for SysV at least) may be exceeded.
35
 .NOEXPORT:
(-)/data/compile/flac/port/files/patch-doc_html_images_Makefile.in (-14 lines)
Lines 1-14 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-doc_html_images_Makefile.in,v 1.2 2005/03/16 14:49:23 naddy Exp $
3
4
--- doc/html/images/Makefile.in.orig
5
+++ doc/html/images/Makefile.in
6
@@ -226,7 +226,7 @@
7
 sysconfdir = @sysconfdir@
8
 target_alias = @target_alias@
9
 AUTOMAKE_OPTIONS = foreign
10
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/images
11
+docdir = $(datadir)/doc/$(PACKAGE)/html/images
12
 doc_DATA = \
13
 	1x1.gif \
14
 	cafebug.gif \
(-)/data/compile/flac/port/files/patch-doc_html_ru_Makefile.in (-14 lines)
Lines 1-14 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-doc_html_ru_Makefile.in,v 1.2 2005/03/16 14:49:23 naddy Exp $
3
4
--- doc/html/ru/Makefile.in.orig
5
+++ doc/html/ru/Makefile.in
6
@@ -226,7 +226,7 @@
7
 sysconfdir = @sysconfdir@
8
 target_alias = @target_alias@
9
 AUTOMAKE_OPTIONS = foreign
10
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/ru
11
+docdir = $(datadir)/doc/$(PACKAGE)/html/ru
12
 doc_DATA = \
13
 	authors.html \
14
 	comparison.html \
(-)/data/compile/flac/port/files/patch-man_flac.1 (-12 / +8 lines)
Lines 1-15 Link Here
1
1
--- man/flac.1.orig	2008-01-08 17:46:07.000000000 +0100
2
$FreeBSD: ports/audio/flac/files/patch-man_flac.1,v 1.2 2005/03/16 14:49:23 naddy Exp $
2
+++ man/flac.1	2008-01-08 17:46:07.000000000 +0100
3
3
@@ -325,7 +325,7 @@
4
--- man/flac.1.orig
5
+++ man/flac.1
6
@@ -397,8 +397,7 @@
7
  .PP
4
  .PP
8
 The programs are documented fully by HTML format
5
 metaflac(1).
9
 documentation, available in
6
 .PP
10
-\fI/usr/share/doc/flac/html\fR on
7
-The programs are documented fully by HTML format documentation, available in \fI/usr/share/doc/flac/html\fR on Debian GNU/Linux systems.
11
-Debian GNU/Linux systems.
8
+The programs are documented fully by HTML format documentation, available in \fI%%PREFIX%%/share/doc/flac/html\fR.
12
+\fI%%PREFIX%%/share/doc/flac/html\fR.
13
  .SH "AUTHOR"
9
  .SH "AUTHOR"
14
  .PP
10
  .PP
15
 This manual page was written by Matt Zimmerman <mdz@debian.org> for
11
 This manual page was written by Matt Zimmerman <mdz@debian.org> for the Debian GNU/Linux system (but may be used by others).
(-)/data/compile/flac/port/files/patch-src_libFLAC++_Makefile.in (+11 lines)
Line 0 Link Here
1
--- src/libFLAC++/Makefile.in.orig	2008-01-09 06:44:19.000000000 +0100
2
+++ src/libFLAC++/Makefile.in	2008-01-09 06:44:35.000000000 +0100
3
@@ -237,7 +237,7 @@
4
 m4datadir = $(datadir)/aclocal
5
 m4data_DATA = libFLAC++.m4
6
 
7
-pkgconfigdir = $(libdir)/pkgconfig
8
+pkgconfigdir = $(prefix)/libdata/pkgconfig
9
 pkgconfig_DATA = flac++.pc
10
 
11
 EXTRA_DIST = \
(-)/data/compile/flac/port/files/patch-src_libFLAC++_metadata.cpp (-66 lines)
Lines 1-66 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-src_libFLAC++_metadata.cpp,v 1.1 2007/11/13 14:28:28 naddy Exp $
3
4
--- src/libFLAC++/metadata.cpp.orig
5
+++ src/libFLAC++/metadata.cpp
6
@@ -33,6 +33,7 @@
7
 #include "FLAC/assert.h"
8
 #include <stdlib.h> // for malloc(), free()
9
 #include <string.h> // for memcpy() etc.
10
+#include "share/alloc.h"
11
 
12
 #ifdef _MSC_VER
13
 // warning C4800: 'int' : forcing to bool 'true' or 'false' (performance warning)
14
@@ -568,7 +569,7 @@
15
 
16
 			clear_entry();
17
 
18
-			if(0 == (entry_.entry = (FLAC__byte*)malloc(field_length+1))) {
19
+			if(0 == (entry_.entry = (FLAC__byte*)safe_malloc_add_2op_(field_length, /*+*/1))) {
20
 				is_valid_ = false;
21
 			}
22
 			else {
23
@@ -617,7 +618,7 @@
24
 
25
 			clear_field_value();
26
 
27
-			if(0 == (field_value_ = (char *)malloc(field_value_length+1))) {
28
+			if(0 == (field_value_ = (char *)safe_malloc_add_2op_(field_value_length, /*+*/1))) {
29
 				is_valid_ = false;
30
 			}
31
 			else {
32
@@ -707,7 +708,7 @@
33
 		{
34
 			clear_entry();
35
 
36
-			if(0 == (entry_.entry = (FLAC__byte*)malloc(field_name_length_ + 1 + field_value_length_ + 1))) {
37
+			if(0 == (entry_.entry = (FLAC__byte*)safe_malloc_add_4op_(field_name_length_, /*+*/1, /*+*/field_value_length_, /*+*/1))) {
38
 				is_valid_ = false;
39
 			}
40
 			else {
41
@@ -733,7 +734,7 @@
42
 				p = (const char *)entry_.entry + entry_.length;
43
 
44
 			field_name_length_ = p - (const char *)entry_.entry;
45
-			if(0 == (field_name_ = (char *)malloc(field_name_length_ + 1))) { // +1 for the trailing \0
46
+			if(0 == (field_name_ = (char *)safe_malloc_add_2op_(field_name_length_, /*+*/1))) { // +1 for the trailing \0
47
 				is_valid_ = false;
48
 				return;
49
 			}
50
@@ -742,14 +743,14 @@
51
 
52
 			if(entry_.length - field_name_length_ == 0) {
53
 				field_value_length_ = 0;
54
-				if(0 == (field_value_ = (char *)malloc(0))) {
55
+				if(0 == (field_value_ = (char *)safe_malloc_(0))) {
56
 					is_valid_ = false;
57
 					return;
58
 				}
59
 			}
60
 			else {
61
 				field_value_length_ = entry_.length - field_name_length_ - 1;
62
-				if(0 == (field_value_ = (char *)malloc(field_value_length_ + 1))) { // +1 for the trailing \0
63
+				if(0 == (field_value_ = (char *)safe_malloc_add_2op_(field_value_length_, /*+*/1))) { // +1 for the trailing \0
64
 					is_valid_ = false;
65
 					return;
66
 				}
(-)/data/compile/flac/port/files/patch-src_libFLAC_Makefile.in (-11 / +9 lines)
Lines 1-13 Link Here
1
1
--- src/libFLAC/Makefile.in.orig	2008-01-09 06:42:57.000000000 +0100
2
$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_Makefile.in,v 1.1 2007/03/27 15:05:59 naddy Exp $
2
+++ src/libFLAC/Makefile.in	2008-01-09 06:43:13.000000000 +0100
3
3
@@ -259,7 +259,7 @@
4
--- src/libFLAC/Makefile.in.orig
5
+++ src/libFLAC/Makefile.in
6
@@ -304,7 +304,6 @@
7
 @FLaC__CPU_IA32_TRUE@@FLaC__HAS_NASM_TRUE@@FLaC__NO_ASM_FALSE@libFLAC_la_LIBADD = ia32/libFLAC-asm.la
8
 @FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE@libFLAC_la_LIBADD = ppc/gas/libFLAC-asm.la
9
 @FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE@libFLAC_la_LIBADD = ppc/as/libFLAC-asm.la
10
-@FLaC__CPU_PPC_TRUE@@FLaC__NO_ASM_FALSE@LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
11
 SUBDIRS = $(ARCH_SUBDIRS) include .
12
  m4datadir = $(datadir)/aclocal
4
  m4datadir = $(datadir)/aclocal
13
  m4data_DATA = libFLAC.m4
5
  m4data_DATA = libFLAC.m4
6
 
7
-pkgconfigdir = $(libdir)/pkgconfig
8
+pkgconfigdir = $(prefix)/libdata/pkgconfig
9
 pkgconfig_DATA = flac.pc
10
 
11
 EXTRA_DIST = \
(-)/data/compile/flac/port/files/patch-src_libFLAC_bitbuffer.c (-31 lines)
Lines 1-31 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_bitbuffer.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
3
4
--- src/libFLAC/bitbuffer.c.orig
5
+++ src/libFLAC/bitbuffer.c
6
@@ -35,6 +35,7 @@
7
 #include "private/bitmath.h"
8
 #include "private/crc.h"
9
 #include "FLAC/assert.h"
10
+#include "share/alloc.h"
11
 
12
 /*
13
  * Along the way you will see two versions of some functions, selected
14
@@ -193,7 +194,7 @@
15
 	if(bb->capacity == new_capacity)
16
 		return true;
17
 
18
-	new_buffer = (FLAC__blurb*)calloc(new_capacity, sizeof(FLAC__blurb));
19
+	new_buffer = (FLAC__blurb*)safe_calloc_(new_capacity, sizeof(FLAC__blurb));
20
 	if(new_buffer == 0)
21
 		return false;
22
 	memcpy(new_buffer, bb->buffer, sizeof(FLAC__blurb)*min(bb->blurbs+(bb->bits?1:0), new_capacity));
23
@@ -425,7 +426,7 @@
24
 {
25
 	if(bb->buffer == 0) {
26
 		bb->capacity = FLAC__BITBUFFER_DEFAULT_CAPACITY;
27
-		bb->buffer = (FLAC__blurb*)calloc(bb->capacity, sizeof(FLAC__blurb));
28
+		bb->buffer = (FLAC__blurb*)safe_calloc_(bb->capacity, sizeof(FLAC__blurb));
29
 		if(bb->buffer == 0)
30
 			return false;
31
 	}
(-)/data/compile/flac/port/files/patch-src_libFLAC_cpu.c (-32 lines)
Lines 1-32 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_cpu.c,v 1.2 2005/03/16 14:49:23 naddy Exp $
3
4
--- src/libFLAC/cpu.c.orig
5
+++ src/libFLAC/cpu.c
6
@@ -37,6 +37,11 @@
7
 #include <config.h>
8
 #endif
9
 
10
+#ifdef __FreeBSD__
11
+#include <sys/types.h>
12
+#include <sys/sysctl.h>
13
+#endif
14
+
15
 #if defined FLAC__CPU_PPC
16
 #if !defined FLAC__NO_ASM
17
 #if defined FLAC__SYS_DARWIN
18
@@ -95,6 +100,14 @@
19
 
20
 #ifndef FLAC__SSE_OS
21
 		info->data.ia32.fxsr = info->data.ia32.sse = info->data.ia32.sse2 = false;
22
+#elif defined(__FreeBSD__)
23
+		/* on FreeBSD we can double-check via sysctl whether the OS supports SSE */
24
+		{
25
+			int sse;
26
+			size_t len = sizeof(sse);
27
+			if (sysctlbyname("hw.instruction_sse", &sse, &len, NULL, 0) || !sse)
28
+				info->data.ia32.fxsr = info->data.ia32.sse = info->data.ia32.sse2 = false;
29
+		}
30
 #endif
31
 
32
 #ifdef FLAC__USE_3DNOW
(-)/data/compile/flac/port/files/patch-src_libFLAC_file__decoder.c (-22 lines)
Lines 1-22 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_file__decoder.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
3
4
--- src/libFLAC/file_decoder.c.orig
5
+++ src/libFLAC/file_decoder.c
6
@@ -43,6 +43,7 @@
7
 #include "FLAC/assert.h"
8
 #include "protected/file_decoder.h"
9
 #include "protected/seekable_stream_decoder.h"
10
+#include "share/alloc.h"
11
 
12
 /***********************************************************************
13
  *
14
@@ -248,7 +249,7 @@
15
 		decoder->private_->filename = 0;
16
 	}
17
 	if(0 != strcmp(value, "-")) {
18
-		if(0 == (decoder->private_->filename = (char*)malloc(strlen(value)+1))) {
19
+		if(0 == (decoder->private_->filename = (char*)safe_malloc_add_2op_(strlen(value), /*+*/1))) {
20
 			decoder->protected_->state = FLAC__FILE_DECODER_MEMORY_ALLOCATION_ERROR;
21
 			return false;
22
 		}
(-)/data/compile/flac/port/files/patch-src_libFLAC_file__encoder.c (-22 lines)
Lines 1-22 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_file__encoder.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
3
4
--- src/libFLAC/file_encoder.c.orig
5
+++ src/libFLAC/file_encoder.c
6
@@ -34,6 +34,7 @@
7
 #include <string.h> /* for strlen(), strcpy() */
8
 #include "FLAC/assert.h"
9
 #include "protected/file_encoder.h"
10
+#include "share/alloc.h"
11
 
12
 #ifdef max
13
 #undef max
14
@@ -436,7 +437,7 @@
15
 		free(encoder->private_->filename);
16
 		encoder->private_->filename = 0;
17
 	}
18
-	if(0 == (encoder->private_->filename = (char*)malloc(strlen(value)+1))) {
19
+	if(0 == (encoder->private_->filename = (char*)safe_malloc_add_2op_(strlen(value), /*+*/1))) {
20
 		encoder->protected_->state = FLAC__FILE_ENCODER_MEMORY_ALLOCATION_ERROR;
21
 		return false;
22
 	}
(-)/data/compile/flac/port/files/patch-src_libFLAC_format.c (-25 lines)
Lines 1-25 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_format.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
3
4
--- src/libFLAC/format.c.orig
5
+++ src/libFLAC/format.c
6
@@ -38,6 +38,7 @@
7
 #ifdef HAVE_CONFIG_H
8
 #include <config.h>
9
 #endif
10
+#include "share/alloc.h"
11
 
12
 #ifdef min
13
 #undef min
14
@@ -463,9 +464,9 @@
15
 	FLAC__ASSERT(object->capacity_by_order > 0 || (0 == object->parameters && 0 == object->raw_bits));
16
 
17
 	if(object->capacity_by_order < max_partition_order) {
18
-		if(0 == (object->parameters = (unsigned*)realloc(object->parameters, sizeof(unsigned)*(1 << max_partition_order))))
19
+		if(0 == (object->parameters = (unsigned*)safe_realloc_mul_2op_(object->parameters, sizeof(unsigned), /*times*/(1 << max_partition_order))))
20
 			return false;
21
-		if(0 == (object->raw_bits = (unsigned*)realloc(object->raw_bits, sizeof(unsigned)*(1 << max_partition_order))))
22
+		if(0 == (object->raw_bits = (unsigned*)safe_realloc_mul_2op_(object->raw_bits, sizeof(unsigned), /*times*/(1 << max_partition_order))))
23
 			return false;
24
 		object->capacity_by_order = max_partition_order;
25
 	}
(-)/data/compile/flac/port/files/patch-src_libFLAC_include_private_md5.h (-14 lines)
Lines 1-14 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_include_private_md5.h,v 1.1 2007/11/13 14:28:28 naddy Exp $
3
4
--- src/libFLAC/include/private/md5.h.orig
5
+++ src/libFLAC/include/private/md5.h
6
@@ -41,7 +41,7 @@
7
 	FLAC__uint32 bytes[2];
8
 	FLAC__uint32 in[16];
9
 	FLAC__byte *internal_buf;
10
-	unsigned capacity;
11
+	size_t capacity;
12
 };
13
 
14
 FLAC_API void FLAC__MD5Init(struct FLAC__MD5Context *context);
(-)/data/compile/flac/port/files/patch-src_libFLAC_md5.c (-35 lines)
Lines 1-35 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_md5.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
3
4
--- src/libFLAC/md5.c.orig
5
+++ src/libFLAC/md5.c
6
@@ -31,6 +31,7 @@
7
 #ifdef HAVE_CONFIG_H
8
 #include <config.h>
9
 #endif
10
+#include "share/alloc.h"
11
 
12
 #ifndef FLaC__INLINE
13
 #define FLaC__INLINE
14
@@ -230,13 +231,19 @@
15
 	unsigned channel, sample, a_byte;
16
 	FLAC__int32 a_word;
17
 	FLAC__byte *buf_;
18
-	const unsigned bytes_needed = channels * samples * bytes_per_sample;
19
+	const size_t bytes_needed = (size_t)channels * (size_t)samples * (size_t)bytes_per_sample;
20
+
21
+	/* overflow check */
22
+	if((size_t)channels > SIZE_MAX / (size_t)bytes_per_sample)
23
+		return false;
24
+	if((size_t)channels * (size_t)bytes_per_sample > SIZE_MAX / (size_t)samples)
25
+		return false;
26
 
27
 	if(ctx->capacity < bytes_needed) {
28
 		FLAC__byte *tmp = (FLAC__byte*)realloc(ctx->internal_buf, bytes_needed);
29
 		if(0 == tmp) {
30
 			free(ctx->internal_buf);
31
-			if(0 == (ctx->internal_buf = (FLAC__byte*)malloc(bytes_needed)))
32
+			if(0 == (ctx->internal_buf = (FLAC__byte*)safe_malloc_(bytes_needed)))
33
 				return false;
34
 		}
35
 		ctx->internal_buf = tmp;
(-)/data/compile/flac/port/files/patch-src_libFLAC_memory.c (-76 lines)
Lines 1-76 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_memory.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
3
4
--- src/libFLAC/memory.c.orig
5
+++ src/libFLAC/memory.c
6
@@ -35,6 +35,7 @@
7
 #ifdef HAVE_CONFIG_H
8
 #include <config.h>
9
 #endif
10
+#include "share/alloc.h"
11
 
12
 void *FLAC__memory_alloc_aligned(size_t bytes, void **aligned_address)
13
 {
14
@@ -44,10 +45,10 @@
15
 
16
 #ifdef FLAC__ALIGN_MALLOC_DATA
17
 	/* align on 32-byte (256-bit) boundary */
18
-	x = malloc(bytes+31);
19
+	x = safe_malloc_add_2op_(bytes, /*+*/31);
20
 	*aligned_address = (void*)(((unsigned)x + 31) & -32);
21
 #else
22
-	x = malloc(bytes);
23
+	x = safe_malloc_(bytes);
24
 	*aligned_address = x;
25
 #endif
26
 	return x;
27
@@ -66,6 +67,9 @@
28
 	FLAC__ASSERT(0 != aligned_pointer);
29
 	FLAC__ASSERT(unaligned_pointer != aligned_pointer);
30
 
31
+	if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
32
+		return false;
33
+
34
 	pu = (FLAC__int32*)FLAC__memory_alloc_aligned(sizeof(FLAC__int32) * elements, &u.pv);
35
 	if(0 == pu) {
36
 		return false;
37
@@ -92,6 +96,9 @@
38
 	FLAC__ASSERT(0 != aligned_pointer);
39
 	FLAC__ASSERT(unaligned_pointer != aligned_pointer);
40
 
41
+	if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
42
+		return false;
43
+
44
 	pu = (FLAC__uint32*)FLAC__memory_alloc_aligned(sizeof(FLAC__uint32) * elements, &u.pv);
45
 	if(0 == pu) {
46
 		return false;
47
@@ -118,6 +125,9 @@
48
 	FLAC__ASSERT(0 != aligned_pointer);
49
 	FLAC__ASSERT(unaligned_pointer != aligned_pointer);
50
 
51
+	if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
52
+		return false;
53
+
54
 	pu = (FLAC__uint64*)FLAC__memory_alloc_aligned(sizeof(FLAC__uint64) * elements, &u.pv);
55
 	if(0 == pu) {
56
 		return false;
57
@@ -144,6 +154,9 @@
58
 	FLAC__ASSERT(0 != aligned_pointer);
59
 	FLAC__ASSERT(unaligned_pointer != aligned_pointer);
60
 
61
+	if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
62
+		return false;
63
+
64
 	pu = (unsigned*)FLAC__memory_alloc_aligned(sizeof(unsigned) * elements, &u.pv);
65
 	if(0 == pu) {
66
 		return false;
67
@@ -171,6 +184,9 @@
68
 	FLAC__ASSERT(0 != unaligned_pointer);
69
 	FLAC__ASSERT(0 != aligned_pointer);
70
 	FLAC__ASSERT(unaligned_pointer != aligned_pointer);
71
+
72
+	if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
73
+		return false;
74
 
75
 	pu = (FLAC__real*)FLAC__memory_alloc_aligned(sizeof(FLAC__real) * elements, &u.pv);
76
 	if(0 == pu) {
(-)/data/compile/flac/port/files/patch-src_libFLAC_metadata__iterators.c (-67 lines)
Lines 1-67 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_metadata__iterators.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
3
4
--- src/libFLAC/metadata_iterators.c.orig
5
+++ src/libFLAC/metadata_iterators.c
6
@@ -48,6 +48,7 @@
7
 
8
 #include "FLAC/assert.h"
9
 #include "FLAC/file_decoder.h"
10
+#include "share/alloc.h"
11
 
12
 #ifdef max
13
 #undef max
14
@@ -1928,7 +1929,7 @@
15
 		block->data = 0;
16
 	}
17
 	else {
18
-		if(0 == (block->data = (FLAC__byte*)malloc(block_length)))
19
+		if(0 == (block->data = (FLAC__byte*)safe_malloc_(block_length)))
20
 			return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR;
21
 
22
 		if(read_cb(block->data, 1, block_length, handle) != block_length)
23
@@ -1949,7 +1950,7 @@
24
 
25
 	if(block->num_points == 0)
26
 		block->points = 0;
27
-	else if(0 == (block->points = (FLAC__StreamMetadata_SeekPoint*)malloc(block->num_points * sizeof(FLAC__StreamMetadata_SeekPoint))))
28
+	else if(0 == (block->points = (FLAC__StreamMetadata_SeekPoint*)safe_malloc_mul_2op_(block->num_points, /*times*/ sizeof(FLAC__StreamMetadata_SeekPoint))))
29
 		return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR;
30
 
31
 	for(i = 0; i < block->num_points; i++) {
32
@@ -1982,7 +1983,7 @@
33
 		entry->entry = 0;
34
 	}
35
 	else {
36
-		if(0 == (entry->entry = (FLAC__byte*)malloc(entry->length+1)))
37
+		if(0 == (entry->entry = (FLAC__byte*)safe_malloc_add_2op_(entry->length, /*+*/1)))
38
 			return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR;
39
 
40
 		if(read_cb(entry->entry, 1, entry->length, handle) != entry->length)
41
@@ -2145,7 +2146,7 @@
42
 		block->data = 0;
43
 	}
44
 	else {
45
-		if(0 == (block->data = (FLAC__byte*)malloc(block_length)))
46
+		if(0 == (block->data = (FLAC__byte*)safe_malloc_(block_length)))
47
 			return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR;
48
 
49
 		if(read_cb(block->data, 1, block_length, handle) != block_length)
50
@@ -2812,7 +2813,7 @@
51
 {
52
 	static const char *tempfile_suffix = ".metadata_edit";
53
 	if(0 == tempfile_path_prefix) {
54
-		if(0 == (*tempfilename = (char*)malloc(strlen(filename) + strlen(tempfile_suffix) + 1))) {
55
+		if(0 == (*tempfilename = (char*)safe_malloc_add_3op_(strlen(filename), /*+*/strlen(tempfile_suffix), /*+*/1))) {
56
 			*status = FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR;
57
 			return false;
58
 		}
59
@@ -2826,7 +2827,7 @@
60
 		else
61
 			p++;
62
 
63
-		if(0 == (*tempfilename = (char*)malloc(strlen(tempfile_path_prefix) + 1 + strlen(p) + strlen(tempfile_suffix) + 1))) {
64
+		if(0 == (*tempfilename = (char*)safe_malloc_add_4op_(strlen(tempfile_path_prefix), /*+*/strlen(p), /*+*/strlen(tempfile_suffix), /*+*/2))) {
65
 			*status = FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR;
66
 			return false;
67
 		}
(-)/data/compile/flac/port/files/patch-src_libFLAC_metadata__object.c (-176 lines)
Lines 1-176 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_metadata__object.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
3
4
--- src/libFLAC/metadata_object.c.orig
5
+++ src/libFLAC/metadata_object.c
6
@@ -35,6 +35,7 @@
7
 #include "private/metadata.h"
8
 
9
 #include "FLAC/assert.h"
10
+#include "share/alloc.h"
11
 
12
 
13
 /****************************************************************************
14
@@ -47,7 +48,7 @@
15
 {
16
 	if(bytes > 0 && 0 != from) {
17
 		FLAC__byte *x;
18
-		if(0 == (x = (FLAC__byte*)malloc(bytes)))
19
+		if(0 == (x = (FLAC__byte*)safe_malloc_(bytes)))
20
 			return false;
21
 		memcpy(x, from, bytes);
22
 		*to = x;
23
@@ -62,7 +63,7 @@
24
 
25
 static FLAC__bool ensure_null_terminated_(FLAC__byte **entry, unsigned length)
26
 {
27
-	FLAC__byte *x = (FLAC__byte*)realloc(*entry, length+1);
28
+	FLAC__byte *x = (FLAC__byte*)safe_realloc_add_2op_(*entry, length, /*+*/1);
29
 	if(0 != x) {
30
 		x[length] = '\0';
31
 		*entry = x;
32
@@ -82,7 +83,7 @@
33
 	else {
34
 		FLAC__byte *x;
35
 		FLAC__ASSERT(from->length > 0);
36
-		if(0 == (x = (FLAC__byte*)malloc(from->length+1)))
37
+		if(0 == (x = (FLAC__byte*)safe_malloc_add_2op_(from->length, /*+*/1)))
38
 			return false;
39
 		memcpy(x, from->entry, from->length);
40
 		x[from->length] = '\0';
41
@@ -100,7 +101,7 @@
42
 	else {
43
 		FLAC__StreamMetadata_CueSheet_Index *x;
44
 		FLAC__ASSERT(from->num_indices > 0);
45
-		if(0 == (x = (FLAC__StreamMetadata_CueSheet_Index*)malloc(from->num_indices * sizeof(FLAC__StreamMetadata_CueSheet_Index))))
46
+		if(0 == (x = (FLAC__StreamMetadata_CueSheet_Index*)safe_malloc_mul_2op_(from->num_indices, /*times*/sizeof(FLAC__StreamMetadata_CueSheet_Index))))
47
 			return false;
48
 		memcpy(x, from->indices, from->num_indices * sizeof(FLAC__StreamMetadata_CueSheet_Index));
49
 		to->indices = x;
50
@@ -122,7 +123,7 @@
51
 
52
 	FLAC__ASSERT(num_points > 0);
53
 
54
-	object_array = (FLAC__StreamMetadata_SeekPoint*)malloc(num_points * sizeof(FLAC__StreamMetadata_SeekPoint));
55
+	object_array = (FLAC__StreamMetadata_SeekPoint*)safe_malloc_mul_2op_(num_points, /*times*/sizeof(FLAC__StreamMetadata_SeekPoint));
56
 
57
 	if(0 != object_array) {
58
 		unsigned i;
59
@@ -155,7 +156,7 @@
60
 {
61
 	FLAC__ASSERT(num_comments > 0);
62
 
63
-	return (FLAC__StreamMetadata_VorbisComment_Entry*)calloc(num_comments, sizeof(FLAC__StreamMetadata_VorbisComment_Entry));
64
+	return (FLAC__StreamMetadata_VorbisComment_Entry*)safe_calloc_(num_comments, sizeof(FLAC__StreamMetadata_VorbisComment_Entry));
65
 }
66
 
67
 static void vorbiscomment_entry_array_delete_(FLAC__StreamMetadata_VorbisComment_Entry *object_array, unsigned num_comments)
68
@@ -294,14 +295,14 @@
69
 {
70
 	FLAC__ASSERT(num_indices > 0);
71
 
72
-	return (FLAC__StreamMetadata_CueSheet_Index*)calloc(num_indices, sizeof(FLAC__StreamMetadata_CueSheet_Index));
73
+	return (FLAC__StreamMetadata_CueSheet_Index*)safe_calloc_(num_indices, sizeof(FLAC__StreamMetadata_CueSheet_Index));
74
 }
75
 
76
 static FLAC__StreamMetadata_CueSheet_Track *cuesheet_track_array_new_(unsigned num_tracks)
77
 {
78
 	FLAC__ASSERT(num_tracks > 0);
79
 
80
-	return (FLAC__StreamMetadata_CueSheet_Track*)calloc(num_tracks, sizeof(FLAC__StreamMetadata_CueSheet_Track));
81
+	return (FLAC__StreamMetadata_CueSheet_Track*)safe_calloc_(num_tracks, sizeof(FLAC__StreamMetadata_CueSheet_Track));
82
 }
83
 
84
 static void cuesheet_track_array_delete_(FLAC__StreamMetadata_CueSheet_Track *object_array, unsigned num_tracks)
85
@@ -462,6 +463,10 @@
86
 				break;
87
 			case FLAC__METADATA_TYPE_SEEKTABLE:
88
 				to->data.seek_table.num_points = object->data.seek_table.num_points;
89
+				if(to->data.seek_table.num_points > SIZE_MAX / sizeof(FLAC__StreamMetadata_SeekPoint)) { /* overflow check */
90
+					FLAC__metadata_object_delete(to);
91
+					return 0;
92
+				}
93
 				if(!copy_bytes_((FLAC__byte**)&to->data.seek_table.points, (FLAC__byte*)object->data.seek_table.points, object->data.seek_table.num_points * sizeof(FLAC__StreamMetadata_SeekPoint))) {
94
 					FLAC__metadata_object_delete(to);
95
 					return 0;
96
@@ -788,8 +793,12 @@
97
 			return false;
98
 	}
99
 	else {
100
-		const unsigned old_size = object->data.seek_table.num_points * sizeof(FLAC__StreamMetadata_SeekPoint);
101
-		const unsigned new_size = new_num_points * sizeof(FLAC__StreamMetadata_SeekPoint);
102
+		const size_t old_size = object->data.seek_table.num_points * sizeof(FLAC__StreamMetadata_SeekPoint);
103
+		const size_t new_size = new_num_points * sizeof(FLAC__StreamMetadata_SeekPoint);
104
+
105
+		/* overflow check */
106
+		if((size_t)new_num_points > SIZE_MAX / sizeof(FLAC__StreamMetadata_SeekPoint))
107
+			return false;
108
 
109
 		FLAC__ASSERT(object->data.seek_table.num_points > 0);
110
 
111
@@ -982,8 +991,12 @@
112
 			return false;
113
 	}
114
 	else {
115
-		const unsigned old_size = object->data.vorbis_comment.num_comments * sizeof(FLAC__StreamMetadata_VorbisComment_Entry);
116
-		const unsigned new_size = new_num_comments * sizeof(FLAC__StreamMetadata_VorbisComment_Entry);
117
+		const size_t old_size = object->data.vorbis_comment.num_comments * sizeof(FLAC__StreamMetadata_VorbisComment_Entry);
118
+		const size_t new_size = new_num_comments * sizeof(FLAC__StreamMetadata_VorbisComment_Entry);
119
+
120
+		/* overflow check */
121
+		if((size_t)new_num_comments > SIZE_MAX / sizeof(FLAC__StreamMetadata_VorbisComment_Entry))
122
+			return false;
123
 
124
 		FLAC__ASSERT(object->data.vorbis_comment.num_comments > 0);
125
 
126
@@ -1131,7 +1144,7 @@
127
 		const size_t nn = strlen(field_name);
128
 		const size_t nv = strlen(field_value);
129
 		entry->length = nn + 1 /*=*/ + nv;
130
-		if(0 == (entry->entry = (FLAC__byte*)malloc(entry->length+1)))
131
+		if(0 == (entry->entry = (FLAC__byte*)safe_malloc_add_2op_(entry->length, /*+*/1)))
132
 			return false;
133
 		memcpy(entry->entry, field_name, nn);
134
 		entry->entry[nn] = '=';
135
@@ -1158,9 +1171,9 @@
136
 		FLAC__ASSERT(0 != eq);
137
 		if(0 == eq)
138
 			return false; /* double protection */
139
-		if(0 == (*field_name = (char*)malloc(nn+1)))
140
+		if(0 == (*field_name = (char*)safe_malloc_add_2op_(nn, /*+*/1)))
141
 			return false;
142
-		if(0 == (*field_value = (char*)malloc(nv+1))) {
143
+		if(0 == (*field_value = (char*)safe_malloc_add_2op_(nv, /*+*/1))) {
144
 			free(*field_name);
145
 			return false;
146
 		}
147
@@ -1290,8 +1303,12 @@
148
 			return false;
149
 	}
150
 	else {
151
-		const unsigned old_size = track->num_indices * sizeof(FLAC__StreamMetadata_CueSheet_Index);
152
-		const unsigned new_size = new_num_indices * sizeof(FLAC__StreamMetadata_CueSheet_Index);
153
+		const size_t old_size = track->num_indices * sizeof(FLAC__StreamMetadata_CueSheet_Index);
154
+		const size_t new_size = new_num_indices * sizeof(FLAC__StreamMetadata_CueSheet_Index);
155
+
156
+		/* overflow check */
157
+		if((size_t)new_num_indices > SIZE_MAX / sizeof(FLAC__StreamMetadata_CueSheet_Index))
158
+			return false;
159
 
160
 		FLAC__ASSERT(track->num_indices > 0);
161
 
162
@@ -1374,8 +1391,12 @@
163
 			return false;
164
 	}
165
 	else {
166
-		const unsigned old_size = object->data.cue_sheet.num_tracks * sizeof(FLAC__StreamMetadata_CueSheet_Track);
167
-		const unsigned new_size = new_num_tracks * sizeof(FLAC__StreamMetadata_CueSheet_Track);
168
+		const size_t old_size = object->data.cue_sheet.num_tracks * sizeof(FLAC__StreamMetadata_CueSheet_Track);
169
+		const size_t new_size = new_num_tracks * sizeof(FLAC__StreamMetadata_CueSheet_Track);
170
+
171
+		/* overflow check */
172
+		if((size_t)new_num_tracks > SIZE_MAX / sizeof(FLAC__StreamMetadata_CueSheet_Track))
173
+			return false;
174
 
175
 		FLAC__ASSERT(object->data.cue_sheet.num_tracks > 0);
176
 
(-)/data/compile/flac/port/files/patch-src_libFLAC_stream__decoder.c (-121 lines)
Lines 1-121 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_stream__decoder.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
3
4
--- src/libFLAC/stream_decoder.c.orig
5
+++ src/libFLAC/stream_decoder.c
6
@@ -46,6 +46,7 @@
7
 #ifdef HAVE_CONFIG_H
8
 #include <config.h>
9
 #endif
10
+#include "share/alloc.h"
11
 
12
 #ifdef max
13
 #undef max
14
@@ -214,7 +215,7 @@
15
 	}
16
 
17
 	decoder->private_->metadata_filter_ids_capacity = 16;
18
-	if(0 == (decoder->private_->metadata_filter_ids = (FLAC__byte*)malloc((FLAC__STREAM_METADATA_APPLICATION_ID_LEN/8) * decoder->private_->metadata_filter_ids_capacity))) {
19
+	if(0 == (decoder->private_->metadata_filter_ids = (FLAC__byte*)safe_malloc_mul_2op_((FLAC__STREAM_METADATA_APPLICATION_ID_LEN/8), /*times*/decoder->private_->metadata_filter_ids_capacity))) {
20
 		FLAC__bitbuffer_delete(decoder->private_->input);
21
 		free(decoder->private_);
22
 		free(decoder->protected_);
23
@@ -455,7 +456,7 @@
24
 	FLAC__ASSERT(0 != decoder->private_->metadata_filter_ids);
25
 
26
 	if(decoder->private_->metadata_filter_ids_count == decoder->private_->metadata_filter_ids_capacity) {
27
-		if(0 == (decoder->private_->metadata_filter_ids = (FLAC__byte*)realloc(decoder->private_->metadata_filter_ids, decoder->private_->metadata_filter_ids_capacity * 2)))
28
+		if(0 == (decoder->private_->metadata_filter_ids = (FLAC__byte*)safe_realloc_mul_2op_(decoder->private_->metadata_filter_ids, decoder->private_->metadata_filter_ids_capacity, /*times*/2)))
29
 			return decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
30
 		decoder->private_->metadata_filter_ids_capacity *= 2;
31
 	}
32
@@ -512,7 +513,7 @@
33
 	FLAC__ASSERT(0 != decoder->private_->metadata_filter_ids);
34
 
35
 	if(decoder->private_->metadata_filter_ids_count == decoder->private_->metadata_filter_ids_capacity) {
36
-		if(0 == (decoder->private_->metadata_filter_ids = (FLAC__byte*)realloc(decoder->private_->metadata_filter_ids, decoder->private_->metadata_filter_ids_capacity * 2)))
37
+		if(0 == (decoder->private_->metadata_filter_ids = (FLAC__byte*)safe_realloc_mul_2op_(decoder->private_->metadata_filter_ids, decoder->private_->metadata_filter_ids_capacity, /*times*/2)))
38
 			return decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
39
 		decoder->private_->metadata_filter_ids_capacity *= 2;
40
 	}
41
@@ -804,7 +805,7 @@
42
 		 * (at negative indices) for alignment purposes; we use 4
43
 		 * to keep the data well-aligned.
44
 		 */
45
-		tmp = (FLAC__int32*)malloc(sizeof(FLAC__int32)*(size+4));
46
+		tmp = (FLAC__int32*)safe_malloc_mul_2op_(sizeof(FLAC__int32), /*times*/(size+4));
47
 		if(tmp == 0) {
48
 			decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
49
 			return false;
50
@@ -967,7 +968,7 @@
51
 				case FLAC__METADATA_TYPE_APPLICATION:
52
 					/* remember, we read the ID already */
53
 					if(real_length > 0) {
54
-						if(0 == (block.data.application.data = (FLAC__byte*)malloc(real_length))) {
55
+						if(0 == (block.data.application.data = (FLAC__byte*)safe_malloc_(real_length))) {
56
 							decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
57
 							return false;
58
 						}
59
@@ -991,7 +992,7 @@
60
 					break;
61
 				default:
62
 					if(real_length > 0) {
63
-						if(0 == (block.data.unknown.data = (FLAC__byte*)malloc(real_length))) {
64
+						if(0 == (block.data.unknown.data = (FLAC__byte*)safe_malloc_(real_length))) {
65
 							decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
66
 							return false;
67
 						}
68
@@ -1132,7 +1133,7 @@
69
 	decoder->private_->seek_table.data.seek_table.num_points = length / FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
70
 
71
 	/* use realloc since we may pass through here several times (e.g. after seeking) */
72
-	if(0 == (decoder->private_->seek_table.data.seek_table.points = (FLAC__StreamMetadata_SeekPoint*)realloc(decoder->private_->seek_table.data.seek_table.points, decoder->private_->seek_table.data.seek_table.num_points * sizeof(FLAC__StreamMetadata_SeekPoint)))) {
73
+	if(0 == (decoder->private_->seek_table.data.seek_table.points = (FLAC__StreamMetadata_SeekPoint*)safe_realloc_mul_2op_(decoder->private_->seek_table.data.seek_table.points, decoder->private_->seek_table.data.seek_table.num_points, /*times*/sizeof(FLAC__StreamMetadata_SeekPoint)))) {
74
 		decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
75
 		return false;
76
 	}
77
@@ -1171,7 +1172,7 @@
78
 	if(!FLAC__bitbuffer_read_raw_uint32_little_endian(decoder->private_->input, &obj->vendor_string.length, read_callback_, decoder))
79
 		return false; /* the read_callback_ sets the state for us */
80
 	if(obj->vendor_string.length > 0) {
81
-		if(0 == (obj->vendor_string.entry = (FLAC__byte*)malloc(obj->vendor_string.length+1))) {
82
+		if(0 == (obj->vendor_string.entry = (FLAC__byte*)safe_malloc_add_2op_(obj->vendor_string.length, /*+*/1))) {
83
 			decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
84
 			return false;
85
 		}
86
@@ -1189,7 +1190,7 @@
87
 
88
 	/* read comments */
89
 	if(obj->num_comments > 0) {
90
-		if(0 == (obj->comments = (FLAC__StreamMetadata_VorbisComment_Entry*)malloc(obj->num_comments * sizeof(FLAC__StreamMetadata_VorbisComment_Entry)))) {
91
+		if(0 == (obj->comments = (FLAC__StreamMetadata_VorbisComment_Entry*)safe_malloc_mul_2op_(obj->num_comments, /*times*/sizeof(FLAC__StreamMetadata_VorbisComment_Entry)))) {
92
 			decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
93
 			return false;
94
 		}
95
@@ -1198,7 +1199,7 @@
96
 			if(!FLAC__bitbuffer_read_raw_uint32_little_endian(decoder->private_->input, &obj->comments[i].length, read_callback_, decoder))
97
 				return false; /* the read_callback_ sets the state for us */
98
 			if(obj->comments[i].length > 0) {
99
-				if(0 == (obj->comments[i].entry = (FLAC__byte*)malloc(obj->comments[i].length+1))) {
100
+				if(0 == (obj->comments[i].entry = (FLAC__byte*)safe_malloc_add_2op_(obj->comments[i].length, /*+*/1))) {
101
 					decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
102
 					return false;
103
 				}
104
@@ -1244,7 +1245,7 @@
105
 	obj->num_tracks = x;
106
 
107
 	if(obj->num_tracks > 0) {
108
-		if(0 == (obj->tracks = (FLAC__StreamMetadata_CueSheet_Track*)calloc(obj->num_tracks, sizeof(FLAC__StreamMetadata_CueSheet_Track)))) {
109
+		if(0 == (obj->tracks = (FLAC__StreamMetadata_CueSheet_Track*)safe_calloc_(obj->num_tracks, sizeof(FLAC__StreamMetadata_CueSheet_Track)))) {
110
 			decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
111
 			return false;
112
 		}
113
@@ -1277,7 +1278,7 @@
114
 			track->num_indices = (FLAC__byte)x;
115
 
116
 			if(track->num_indices > 0) {
117
-				if(0 == (track->indices = (FLAC__StreamMetadata_CueSheet_Index*)calloc(track->num_indices, sizeof(FLAC__StreamMetadata_CueSheet_Index)))) {
118
+				if(0 == (track->indices = (FLAC__StreamMetadata_CueSheet_Index*)safe_calloc_(track->num_indices, sizeof(FLAC__StreamMetadata_CueSheet_Index)))) {
119
 					decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
120
 					return false;
121
 				}
(-)/data/compile/flac/port/files/patch-src_libFLAC_stream__encoder.c (-22 lines)
Lines 1-22 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_stream__encoder.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
3
4
--- src/libFLAC/stream_encoder.c.orig
5
+++ src/libFLAC/stream_encoder.c
6
@@ -50,6 +50,7 @@
7
 #ifdef HAVE_CONFIG_H
8
 #include <config.h>
9
 #endif
10
+#include "share/alloc.h"
11
 
12
 #ifdef min
13
 #undef min
14
@@ -836,7 +837,7 @@
15
 		 */
16
 		encoder->private_->verify.input_fifo.size = encoder->protected_->blocksize;
17
 		for(i = 0; i < encoder->protected_->channels; i++) {
18
-			if(0 == (encoder->private_->verify.input_fifo.data[i] = (FLAC__int32*)malloc(sizeof(FLAC__int32) * encoder->private_->verify.input_fifo.size)))
19
+			if(0 == (encoder->private_->verify.input_fifo.data[i] = (FLAC__int32*)safe_malloc_mul_2op_(sizeof(FLAC__int32), /*times*/encoder->private_->verify.input_fifo.size)))
20
 				return encoder->protected_->state = FLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR;
21
 		}
22
 		encoder->private_->verify.input_fifo.tail = 0;
(-)/data/compile/flac/port/files/patch-src_libOggFLAC_file__decoder.c (-22 lines)
Lines 1-22 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-src_libOggFLAC_file__decoder.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
3
4
--- src/libOggFLAC/file_decoder.c.orig
5
+++ src/libOggFLAC/file_decoder.c
6
@@ -43,6 +43,7 @@
7
 #include "FLAC/assert.h"
8
 #include "protected/file_decoder.h"
9
 #include "protected/seekable_stream_decoder.h"
10
+#include "share/alloc.h"
11
 
12
 /***********************************************************************
13
  *
14
@@ -248,7 +249,7 @@
15
 		decoder->private_->filename = 0;
16
 	}
17
 	if(0 != strcmp(value, "-")) {
18
-		if(0 == (decoder->private_->filename = (char*)malloc(strlen(value)+1))) {
19
+		if(0 == (decoder->private_->filename = (char*)safe_malloc_add_2op_(strlen(value), /*+*/1))) {
20
 			decoder->protected_->state = OggFLAC__FILE_DECODER_MEMORY_ALLOCATION_ERROR;
21
 			return false;
22
 		}
(-)/data/compile/flac/port/files/patch-src_libOggFLAC_file__encoder.c (-22 lines)
Lines 1-22 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-src_libOggFLAC_file__encoder.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
3
4
--- src/libOggFLAC/file_encoder.c.orig
5
+++ src/libOggFLAC/file_encoder.c
6
@@ -35,6 +35,7 @@
7
 #include "FLAC/assert.h"
8
 #include "OggFLAC/seekable_stream_encoder.h"
9
 #include "protected/file_encoder.h"
10
+#include "share/alloc.h"
11
 
12
 #ifdef max
13
 #undef max
14
@@ -450,7 +451,7 @@
15
 		free(encoder->private_->filename);
16
 		encoder->private_->filename = 0;
17
 	}
18
-	if(0 == (encoder->private_->filename = (char*)malloc(strlen(value)+1))) {
19
+	if(0 == (encoder->private_->filename = (char*)safe_malloc_add_2op_(strlen(value), /*+*/1))) {
20
 		encoder->protected_->state = OggFLAC__FILE_ENCODER_MEMORY_ALLOCATION_ERROR;
21
 		return false;
22
 	}
(-)/data/compile/flac/port/files/patch-src_libOggFLAC_ogg__helper.c (-31 lines)
Lines 1-31 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-src_libOggFLAC_ogg__helper.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
3
4
--- src/libOggFLAC/ogg_helper.c.orig
5
+++ src/libOggFLAC/ogg_helper.c
6
@@ -34,6 +34,7 @@
7
 #include "FLAC/assert.h"
8
 #include "private/ogg_helper.h"
9
 #include "protected/seekable_stream_encoder.h"
10
+#include "share/alloc.h"
11
 
12
 
13
 static FLAC__bool full_read_(OggFLAC__SeekableStreamEncoder *encoder, FLAC__byte *buffer, unsigned bytes, OggFLAC__SeekableStreamEncoderReadCallback read_callback, void *client_data)
14
@@ -102,7 +103,7 @@
15
 	}
16
 
17
 	/* allocate space for the page header */
18
-	if(0 == (page->header = (unsigned char *)malloc(OGG_MAX_HEADER_LEN))) {
19
+	if(0 == (page->header = (unsigned char *)safe_malloc_(OGG_MAX_HEADER_LEN))) {
20
 		encoder->protected_->state = OggFLAC__SEEKABLE_STREAM_ENCODER_MEMORY_ALLOCATION_ERROR;
21
 		return false;
22
 	}
23
@@ -144,7 +145,7 @@
24
 	}
25
 
26
 	/* allocate space for the page body */
27
-	if(0 == (page->body = (unsigned char *)malloc(page->body_len))) {
28
+	if(0 == (page->body = (unsigned char *)safe_malloc_(page->body_len))) {
29
 		encoder->protected_->state = OggFLAC__SEEKABLE_STREAM_ENCODER_MEMORY_ALLOCATION_ERROR;
30
 		return false;
31
 	}
(-)/data/compile/flac/port/files/patch-src_metaflac_operations.c (-24 lines)
Lines 1-24 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-src_metaflac_operations.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
3
4
--- src/metaflac/operations.c.orig
5
+++ src/metaflac/operations.c
6
@@ -21,6 +21,7 @@
7
 #include "utils.h"
8
 #include "FLAC/assert.h"
9
 #include "FLAC/metadata.h"
10
+#include "share/alloc.h"
11
 #include "share/grabbag.h"
12
 #include <stdio.h>
13
 #include <stdlib.h>
14
@@ -430,8 +431,8 @@
15
 	}
16
 
17
 	if(
18
-		0 == (title_gains = (float*)malloc(sizeof(float) * num_files)) ||
19
-		0 == (title_peaks = (float*)malloc(sizeof(float) * num_files))
20
+		0 == (title_gains = (float*)safe_malloc_mul_2op_(sizeof(float), /*times*/num_files)) ||
21
+		0 == (title_peaks = (float*)safe_malloc_mul_2op_(sizeof(float), /*times*/num_files))
22
 	)
23
 		die("out of memory allocating space for title gains/peaks");
24
 
(-)/data/compile/flac/port/files/patch-src_metaflac_options.c (-66 lines)
Lines 1-66 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-src_metaflac_options.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
3
4
--- src/metaflac/options.c.orig
5
+++ src/metaflac/options.c
6
@@ -20,6 +20,7 @@
7
 #include "usage.h"
8
 #include "utils.h"
9
 #include "FLAC/assert.h"
10
+#include "share/alloc.h"
11
 #include <ctype.h>
12
 #include <stdio.h>
13
 #include <stdlib.h>
14
@@ -183,7 +184,7 @@
15
 
16
 	if(options->num_files > 0) {
17
 		unsigned i = 0;
18
-		if(0 == (options->filenames = (char**)malloc(sizeof(char*) * options->num_files)))
19
+		if(0 == (options->filenames = (char**)safe_malloc_mul_2op_(sizeof(char*), /*times*/options->num_files)))
20
 			die("out of memory allocating space for file names list");
21
 		while(share__optind < argc)
22
 			options->filenames[i++] = local_strdup(argv[share__optind++]);
23
@@ -661,8 +662,10 @@
24
 	}
25
 	if(options->ops.capacity <= options->ops.num_operations) {
26
 		unsigned original_capacity = options->ops.capacity;
27
-		options->ops.capacity *= 4;
28
-		if(0 == (options->ops.operations = (Operation*)realloc(options->ops.operations, sizeof(Operation) * options->ops.capacity)))
29
+		if(options->ops.capacity > SIZE_MAX / 2) /* overflow check */
30
+			die("out of memory allocating space for option list");
31
+		options->ops.capacity *= 2;
32
+		if(0 == (options->ops.operations = (Operation*)safe_realloc_mul_2op_(options->ops.operations, sizeof(Operation), /*times*/options->ops.capacity)))
33
 			die("out of memory allocating space for option list");
34
 		memset(options->ops.operations + original_capacity, 0, sizeof(Operation) * (options->ops.capacity - original_capacity));
35
 	}
36
@@ -680,8 +683,10 @@
37
 	}
38
 	if(options->args.capacity <= options->args.num_arguments) {
39
 		unsigned original_capacity = options->args.capacity;
40
-		options->args.capacity *= 4;
41
-		if(0 == (options->args.arguments = (Argument*)realloc(options->args.arguments, sizeof(Argument) * options->args.capacity)))
42
+		if(options->args.capacity > SIZE_MAX / 2) /* overflow check */
43
+			die("out of memory allocating space for option list");
44
+		options->args.capacity *= 2;
45
+		if(0 == (options->args.arguments = (Argument*)safe_realloc_mul_2op_(options->args.arguments, sizeof(Argument), /*times*/options->args.capacity)))
46
 			die("out of memory allocating space for option list");
47
 		memset(options->args.arguments + original_capacity, 0, sizeof(Argument) * (options->args.capacity - original_capacity));
48
 	}
49
@@ -897,7 +902,7 @@
50
 
51
 	/* make space */
52
 	FLAC__ASSERT(out->num_entries > 0);
53
-	if(0 == (out->entries = (unsigned*)malloc(sizeof(unsigned) * out->num_entries)))
54
+	if(0 == (out->entries = (unsigned*)safe_malloc_mul_2op_(sizeof(unsigned), /*times*/out->num_entries)))
55
 		die("out of memory allocating space for option list");
56
 
57
 	/* load 'em up */
58
@@ -936,7 +941,7 @@
59
 
60
 	/* make space */
61
 	FLAC__ASSERT(out->num_entries > 0);
62
-	if(0 == (out->entries = (Argument_BlockTypeEntry*)malloc(sizeof(Argument_BlockTypeEntry) * out->num_entries)))
63
+	if(0 == (out->entries = (Argument_BlockTypeEntry*)safe_malloc_mul_2op_(sizeof(Argument_BlockTypeEntry), /*times*/out->num_entries)))
64
 		die("out of memory allocating space for option list");
65
 
66
 	/* load 'em up */
(-)/data/compile/flac/port/files/patch-src_metaflac_utils.c (-22 lines)
Lines 1-22 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-src_metaflac_utils.c,v 1.1 2007/11/13 14:28:29 naddy Exp $
3
4
--- src/metaflac/utils.c.orig
5
+++ src/metaflac/utils.c
6
@@ -18,6 +18,7 @@
7
 
8
 #include "utils.h"
9
 #include "FLAC/assert.h"
10
+#include "share/alloc.h"
11
 #include "share/utf8.h"
12
 #include <ctype.h>
13
 #include <stdarg.h>
14
@@ -64,7 +65,7 @@
15
 	if(nsource == 0)
16
 		return;
17
 
18
-	*dest = (char*)realloc(*dest, ndest + nsource + 1);
19
+	*dest = (char*)safe_realloc_add_3op_(*dest, ndest, /*+*/nsource, /*+*/1);
20
 	if(0 == *dest)
21
 		die("out of memory growing string");
22
 	strcpy((*dest)+ndest, source);
(-)/data/compile/flac/port/files/patch-src_plugin__common_charset.c (-25 lines)
Lines 1-25 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-src_plugin__common_charset.c,v 1.1 2007/11/13 14:28:29 naddy Exp $
3
4
--- src/plugin_common/charset.c.orig
5
+++ src/plugin_common/charset.c
6
@@ -83,6 +83,8 @@
7
 	/* Due to a GLIBC bug, round outbuf_size up to a multiple of 4 */
8
 	/* + 1 for nul in case len == 1 */
9
 	outsize = ((length + 3) & ~3) + 1;
10
+	if(outsize < length) /* overflow check */
11
+		return NULL;
12
 	out = (char*)malloc(outsize);
13
 	outleft = outsize - 1;
14
 	outptr = out;
15
@@ -95,6 +97,10 @@
16
 		{
17
 			case E2BIG:
18
 				used = outptr - out;
19
+				if((outsize - 1) * 2 + 1 <= outsize) { /* overflow check */
20
+					free(out);
21
+					return NULL;
22
+				}
23
 				outsize = (outsize - 1) * 2 + 1;
24
 				out = realloc(out, outsize);
25
 				outptr = out + used;
(-)/data/compile/flac/port/files/patch-src_plugin__common_tags.c (-59 lines)
Lines 1-59 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-src_plugin__common_tags.c,v 1.1 2007/11/13 14:28:29 naddy Exp $
3
4
--- src/plugin_common/tags.c.orig
5
+++ src/plugin_common/tags.c
6
@@ -23,6 +23,7 @@
7
 #include "tags.h"
8
 #include "FLAC/assert.h"
9
 #include "FLAC/metadata.h"
10
+#include "share/alloc.h"
11
 
12
 
13
 static __inline unsigned local__wide_strlen(const FLAC__uint16 *s)
14
@@ -82,7 +83,7 @@
15
 	}
16
 
17
 	/* allocate */
18
-	out = (FLAC__uint16*)malloc(chars * sizeof(FLAC__uint16));
19
+	out = (FLAC__uint16*)safe_malloc_mul_2op_(chars, /*times*/sizeof(FLAC__uint16));
20
 	if (0 == out) {
21
 		FLAC__ASSERT(0);
22
 		return 0;
23
@@ -130,19 +131,23 @@
24
 static char *local__convert_ucs2_to_utf8(const FLAC__uint16 *src, unsigned length)
25
 {
26
 	char *out;
27
-	unsigned len = 0;
28
+	unsigned len = 0, n;
29
 
30
 	FLAC__ASSERT(0 != src);
31
 
32
 	/* calculate length */
33
 	{
34
 		unsigned i;
35
-		for (i = 0; i < length; i++)
36
-			len += local__ucs2len(src[i]);
37
+		for (i = 0; i < length; i++) {
38
+			n += local__ucs2len(src[i]);
39
+			if(len + n < len) /* overflow check */
40
+				return 0;
41
+			len += n;
42
+		}
43
 	}
44
 
45
 	/* allocate */
46
-	out = (char*)malloc(len * sizeof(char));
47
+	out = (char*)safe_malloc_mul_2op_(len, /*times*/sizeof(char));
48
 	if (0 == out)
49
 		return 0;
50
 
51
@@ -265,7 +270,7 @@
52
 		const size_t value_len = strlen(value);
53
 		const size_t separator_len = strlen(separator);
54
 		FLAC__byte *new_entry;
55
-		if(0 == (new_entry = (FLAC__byte*)realloc(entry->entry, entry->length + value_len + separator_len + 1)))
56
+		if(0 == (new_entry = (FLAC__byte*)safe_realloc_add_4op_(entry->entry, entry->length, /*+*/value_len, /*+*/separator_len, /*+*/1)))
57
 			return false;
58
 		memcpy(new_entry+entry->length, separator, separator_len);
59
 		entry->length += separator_len;
(-)/data/compile/flac/port/files/patch-src_share_utf8_charset.c (-22 lines)
Lines 1-22 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-src_share_utf8_charset.c,v 1.1 2007/11/13 14:28:29 naddy Exp $
3
4
--- src/share/utf8/charset.c.orig
5
+++ src/share/utf8/charset.c
6
@@ -35,6 +35,7 @@
7
 
8
 #include <stdlib.h>
9
 
10
+#include "share/alloc.h"
11
 #include "charset.h"
12
 
13
 #include "charmaps.h"
14
@@ -492,7 +493,7 @@
15
   if (!charset1 || !charset2 )
16
     return -1;
17
 
18
-  tobuf = (char *)malloc(fromlen * charset2->max + 1);
19
+  tobuf = (char *)safe_malloc_mul2add_(fromlen, /*times*/charset2->max, /*+*/1);
20
   if (!tobuf)
21
     return -2;
22
 
(-)/data/compile/flac/port/files/patch-src_share_utf8_iconvert.c (-49 lines)
Lines 1-49 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-src_share_utf8_iconvert.c,v 1.1 2007/11/13 14:28:29 naddy Exp $
3
4
--- src/share/utf8/iconvert.c.orig
5
+++ src/share/utf8/iconvert.c
6
@@ -27,6 +27,7 @@
7
 #include <iconv.h>
8
 #include <stdlib.h>
9
 #include <string.h>
10
+#include "share/alloc.h"
11
 
12
 /*
13
  * Convert data from one encoding to another. Return:
14
@@ -79,7 +80,7 @@
15
      * This is deliberately not a config option as people often
16
      * change their iconv library without rebuilding applications.
17
      */
18
-    tocode1 = (char *)malloc(strlen(tocode) + 11);
19
+    tocode1 = (char *)safe_malloc_add_2op_(strlen(tocode), /*+*/11);
20
     if (!tocode1)
21
       goto fail;
22
 
23
@@ -117,6 +118,8 @@
24
       break;
25
     if (obl < 6) {
26
       /* Enlarge the buffer */
27
+      if(utflen*2 < utflen) /* overflow check */
28
+        goto fail;
29
       utflen *= 2;
30
       newbuf = (char *)realloc(utfbuf, utflen);
31
       if (!newbuf)
32
@@ -143,7 +146,7 @@
33
       iconv_close(cd1);
34
       return ret;
35
     }
36
-    newbuf = (char *)realloc(utfbuf, (ob - utfbuf) + 1);
37
+    newbuf = (char *)safe_realloc_add_2op_(utfbuf, (ob - utfbuf), /*+*/1);
38
     if (!newbuf)
39
       goto fail;
40
     ob = (ob - utfbuf) + newbuf;
41
@@ -194,7 +197,7 @@
42
   outlen += ob - tbuf;
43
 
44
   /* Convert from UTF-8 for real */
45
-  outbuf = (char *)malloc(outlen + 1);
46
+  outbuf = (char *)safe_malloc_add_2op_(outlen, /*+*/1);
47
   if (!outbuf)
48
     goto fail;
49
   ib = utfbuf;
(-)/data/compile/flac/port/files/patch-src_share_utf8_utf8.c (-72 lines)
Lines 1-72 Link Here
1
2
$FreeBSD: ports/audio/flac/files/patch-src_share_utf8_utf8.c,v 1.1 2007/11/13 14:28:29 naddy Exp $
3
4
--- src/share/utf8/utf8.c.orig
5
+++ src/share/utf8/utf8.c
6
@@ -28,6 +28,7 @@
7
 #include <config.h>
8
 #endif
9
 
10
+#include "share/alloc.h"
11
 #include "utf8.h"
12
 #include "charset.h"
13
 
14
@@ -57,10 +58,13 @@
15
         } else {
16
             size += 3;
17
         }
18
+        if(size+n < size) /* overflow check */
19
+            return NULL;
20
+        size += n;
21
         c = unicode[index++];
22
     } 
23
 
24
-    out = malloc(size + 1);
25
+    out = safe_malloc_add_2op_(size, /*+*/1);
26
     if (out == NULL)
27
         return NULL;
28
     index = 0;
29
@@ -101,11 +105,15 @@
30
         } else {
31
             index += 1;
32
         }
33
+        if(size + 1 == 0) /* overflow check */
34
+            return NULL;
35
         size += 1;
36
         c = utf8[index++];
37
     } 
38
 
39
-    out = malloc((size + 1) * sizeof(wchar_t));
40
+    if(size + 1 == 0) /* overflow check */
41
+        return NULL;
42
+    out = safe_malloc_mul_2op_((size + 1), /*times*/sizeof(wchar_t));
43
     if (out == NULL)
44
         return NULL;
45
     index = 0;
46
@@ -147,7 +155,7 @@
47
 		return -1;
48
 	}
49
 
50
-	unicode = calloc(wchars + 1, sizeof(unsigned short));
51
+	unicode = safe_calloc_(wchars + 1, sizeof(unsigned short));
52
 	if(unicode == NULL) 
53
 	{
54
 		fprintf(stderr, "Out of memory processing string to UTF8\n");
55
@@ -197,7 +205,7 @@
56
         return -1;
57
     }
58
 
59
-    *to = calloc(chars + 1, sizeof(unsigned char));
60
+    *to = safe_calloc_(chars + 1, sizeof(unsigned char));
61
     if(*to == NULL) 
62
     {
63
         fprintf(stderr, "Out of memory processing string to local charset\n");
64
@@ -285,7 +293,7 @@
65
   if (ret != -1)
66
     return ret;
67
 
68
-  s = malloc(fromlen + 1);
69
+  s = safe_malloc_add_2op_(fromlen, /*+*/1);
70
   if (!s)
71
     return -1;
72
   strcpy(s, from);
(-)/data/compile/flac/port/pkg-descr (-2 lines)
Lines 4-11 Link Here
4
 * libFLAC, a library which implements reference encoders and
4
 * libFLAC, a library which implements reference encoders and
5
   decoders, and a metadata interface
5
   decoders, and a metadata interface
6
 * libFLAC++, a C++ object wrapper library around libFLAC
6
 * libFLAC++, a C++ object wrapper library around libFLAC
7
* libOggFLAC and libOggFLAC++, which provide encoders and
8
  decoders for FLAC streams in an Ogg container
9
 * flac, a command-line program for encoding and decoding files
7
 * flac, a command-line program for encoding and decoding files
10
 * metaflac, a command-line program for viewing and editing FLAC
8
 * metaflac, a command-line program for viewing and editing FLAC
11
   metadata
9
   metadata
(-)/data/compile/flac/port/pkg-plist (-135 / +122 lines)
Lines 1-4 Link Here
1
@comment $FreeBSD: ports/audio/flac/pkg-plist,v 1.13 2006/02/23 10:34:27 ade Exp $
2
 bin/flac
1
 bin/flac
3
 bin/metaflac
2
 bin/metaflac
4
 include/FLAC++/all.h
3
 include/FLAC++/all.h
Lines 10-227 Link Here
10
 include/FLAC/assert.h
9
 include/FLAC/assert.h
11
 include/FLAC/callback.h
10
 include/FLAC/callback.h
12
 include/FLAC/export.h
11
 include/FLAC/export.h
13
include/FLAC/file_decoder.h
14
include/FLAC/file_encoder.h
15
 include/FLAC/format.h
12
 include/FLAC/format.h
16
 include/FLAC/metadata.h
13
 include/FLAC/metadata.h
17
 include/FLAC/ordinals.h
14
 include/FLAC/ordinals.h
18
include/FLAC/seekable_stream_decoder.h
19
include/FLAC/seekable_stream_encoder.h
20
 include/FLAC/stream_decoder.h
15
 include/FLAC/stream_decoder.h
21
 include/FLAC/stream_encoder.h
16
 include/FLAC/stream_encoder.h
22
include/OggFLAC++/all.h
23
include/OggFLAC++/decoder.h
24
include/OggFLAC++/encoder.h
25
include/OggFLAC++/export.h
26
include/OggFLAC/all.h
27
include/OggFLAC/export.h
28
include/OggFLAC/file_decoder.h
29
include/OggFLAC/file_encoder.h
30
include/OggFLAC/seekable_stream_decoder.h
31
include/OggFLAC/seekable_stream_encoder.h
32
include/OggFLAC/stream_decoder.h
33
include/OggFLAC/stream_encoder.h
34
 lib/libFLAC++.a
17
 lib/libFLAC++.a
35
 lib/libFLAC++.la
18
 lib/libFLAC++.la
36
 lib/libFLAC++.so
19
 lib/libFLAC++.so
37
lib/libFLAC++.so.5
20
lib/libFLAC++.so.8
38
 lib/libFLAC.a
21
 lib/libFLAC.a
39
 lib/libFLAC.la
22
 lib/libFLAC.la
40
 lib/libFLAC.so
23
 lib/libFLAC.so
41
lib/libFLAC.so.7
24
lib/libFLAC.so.10
42
lib/libOggFLAC++.a
25
libdata/pkgconfig/flac++.pc
43
lib/libOggFLAC++.la
26
libdata/pkgconfig/flac.pc
44
lib/libOggFLAC++.so
45
lib/libOggFLAC++.so.2
46
lib/libOggFLAC.a
47
lib/libOggFLAC.la
48
lib/libOggFLAC.so
49
lib/libOggFLAC.so.3
50
 share/aclocal/libFLAC++.m4
27
 share/aclocal/libFLAC++.m4
51
 share/aclocal/libFLAC.m4
28
 share/aclocal/libFLAC.m4
52
share/aclocal/libOggFLAC++.m4
53
share/aclocal/libOggFLAC.m4
54
 %%PORTDOCS%%%%DOCSDIR%%/FLAC.tag
29
 %%PORTDOCS%%%%DOCSDIR%%/FLAC.tag
30
%%PORTDOCS%%%%DOCSDIR%%/html/api/+_2all_8h-source.html
31
%%PORTDOCS%%%%DOCSDIR%%/html/api/+_2export_8h-source.html
32
%%PORTDOCS%%%%DOCSDIR%%/html/api/+_2export_8h.html
55
 %%PORTDOCS%%%%DOCSDIR%%/html/api/+_2metadata_8h-source.html
33
 %%PORTDOCS%%%%DOCSDIR%%/html/api/+_2metadata_8h-source.html
56
 %%PORTDOCS%%%%DOCSDIR%%/html/api/+_2metadata_8h.html
34
 %%PORTDOCS%%%%DOCSDIR%%/html/api/+_2metadata_8h.html
57
%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC++_2all_8h-source.html
35
%%PORTDOCS%%%%DOCSDIR%%/html/api/all_8h-source.html
58
%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC++_2decoder_8h-source.html
59
%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC++_2decoder_8h.html
60
%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC++_2encoder_8h-source.html
61
%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC++_2encoder_8h.html
62
%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC++_2export_8h-source.html
63
%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2all_8h-source.html
64
%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2export_8h-source.html
65
%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2file__encoder_8h-source.html
66
%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2file__encoder_8h.html
67
%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2seekable__stream__encoder_8h-source.html
68
%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2seekable__stream__encoder_8h.html
69
%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2stream__decoder_8h-source.html
70
%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2stream__decoder_8h.html
71
%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2stream__encoder_8h-source.html
72
%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2stream__encoder_8h.html
73
%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC++_2all_8h-source.html
74
%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC++_2decoder_8h-source.html
75
%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC++_2decoder_8h.html
76
%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC++_2encoder_8h-source.html
77
%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC++_2encoder_8h.html
78
%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC++_2export_8h-source.html
79
%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2all_8h-source.html
80
%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2export_8h-source.html
81
%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2file__encoder_8h-source.html
82
%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2file__encoder_8h.html
83
%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2seekable__stream__encoder_8h-source.html
84
%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2seekable__stream__encoder_8h.html
85
%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2stream__decoder_8h-source.html
86
%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2stream__decoder_8h.html
87
%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2stream__encoder_8h-source.html
88
%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2stream__encoder_8h.html
89
 %%PORTDOCS%%%%DOCSDIR%%/html/api/annotated.html
36
 %%PORTDOCS%%%%DOCSDIR%%/html/api/annotated.html
90
 %%PORTDOCS%%%%DOCSDIR%%/html/api/assert_8h-source.html
37
 %%PORTDOCS%%%%DOCSDIR%%/html/api/assert_8h-source.html
91
 %%PORTDOCS%%%%DOCSDIR%%/html/api/callback_8h-source.html
38
 %%PORTDOCS%%%%DOCSDIR%%/html/api/callback_8h-source.html
92
 %%PORTDOCS%%%%DOCSDIR%%/html/api/callback_8h.html
39
 %%PORTDOCS%%%%DOCSDIR%%/html/api/callback_8h.html
93
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1File-members.html
40
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1File-members.html
94
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1File.html
41
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1File.html
95
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1SeekableStream-members.html
42
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1File.png
96
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1SeekableStream.html
97
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream-members.html
43
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream-members.html
98
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream.html
44
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream.html
45
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream.png
46
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream_1_1State-members.html
47
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream_1_1State.html
99
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1File-members.html
48
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1File-members.html
100
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1File.html
49
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1File.html
101
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1SeekableStream-members.html
50
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1File.png
102
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1SeekableStream.html
103
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream-members.html
51
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream-members.html
104
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream.html
52
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream.html
53
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream.png
54
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream_1_1State-members.html
55
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream_1_1State.html
105
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Application-members.html
56
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Application-members.html
106
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Application.gif
107
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Application.html
57
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Application.html
58
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Application.png
108
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Chain-members.html
59
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Chain-members.html
109
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Chain.html
60
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Chain.html
61
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Chain_1_1Status-members.html
62
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Chain_1_1Status.html
110
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet-members.html
63
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet-members.html
111
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet.gif
112
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet.html
64
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet.html
65
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet.png
113
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track-members.html
66
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track-members.html
114
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html
67
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html
115
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Iterator-members.html
68
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Iterator-members.html
116
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Iterator.html
69
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Iterator.html
117
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Padding-members.html
70
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Padding-members.html
118
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Padding.gif
119
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Padding.html
71
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Padding.html
72
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Padding.png
73
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Picture-members.html
74
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Picture.html
75
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Picture.png
120
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Prototype-members.html
76
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Prototype-members.html
121
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Prototype.gif
122
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Prototype.html
77
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Prototype.html
78
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Prototype.png
123
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SeekTable-members.html
79
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SeekTable-members.html
124
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SeekTable.gif
125
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SeekTable.html
80
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SeekTable.html
81
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SeekTable.png
126
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SimpleIterator-members.html
82
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SimpleIterator-members.html
127
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SimpleIterator.html
83
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SimpleIterator.html
84
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status-members.html
85
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status.html
128
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1StreamInfo-members.html
86
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1StreamInfo-members.html
129
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1StreamInfo.gif
130
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1StreamInfo.html
87
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1StreamInfo.html
88
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1StreamInfo.png
131
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Unknown-members.html
89
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Unknown-members.html
132
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Unknown.gif
133
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Unknown.html
90
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Unknown.html
91
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Unknown.png
134
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment-members.html
92
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment-members.html
135
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment.gif
136
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment.html
93
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment.html
94
%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment.png
137
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry-members.html
95
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry-members.html
138
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html
96
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html
139
%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Decoder_1_1File-members.html
140
%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Decoder_1_1File.html
141
%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Decoder_1_1SeekableStream-members.html
142
%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Decoder_1_1SeekableStream.html
143
%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Decoder_1_1Stream-members.html
144
%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Decoder_1_1Stream.html
145
%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Encoder_1_1File-members.html
146
%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Encoder_1_1File.html
147
%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Encoder_1_1SeekableStream-members.html
148
%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Encoder_1_1SeekableStream.html
149
%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Encoder_1_1Stream-members.html
150
%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Encoder_1_1Stream.html
151
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classes.html
97
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classes.html
98
%%PORTDOCS%%%%DOCSDIR%%/html/api/decoder_8h-source.html
99
%%PORTDOCS%%%%DOCSDIR%%/html/api/decoder_8h.html
100
%%PORTDOCS%%%%DOCSDIR%%/html/api/dir_000000.html
101
%%PORTDOCS%%%%DOCSDIR%%/html/api/dir_000001.html
102
%%PORTDOCS%%%%DOCSDIR%%/html/api/dir_000002.html
103
%%PORTDOCS%%%%DOCSDIR%%/html/api/dirs.html
152
 %%PORTDOCS%%%%DOCSDIR%%/html/api/doxygen.css
104
 %%PORTDOCS%%%%DOCSDIR%%/html/api/doxygen.css
153
%%PORTDOCS%%%%DOCSDIR%%/html/api/doxygen.gif
105
%%PORTDOCS%%%%DOCSDIR%%/html/api/doxygen.png
154
%%PORTDOCS%%%%DOCSDIR%%/html/api/file__decoder_8h-source.html
106
%%PORTDOCS%%%%DOCSDIR%%/html/api/encoder_8h-source.html
155
%%PORTDOCS%%%%DOCSDIR%%/html/api/file__decoder_8h.html
107
%%PORTDOCS%%%%DOCSDIR%%/html/api/encoder_8h.html
108
%%PORTDOCS%%%%DOCSDIR%%/html/api/export_8h-source.html
109
%%PORTDOCS%%%%DOCSDIR%%/html/api/export_8h.html
156
 %%PORTDOCS%%%%DOCSDIR%%/html/api/files.html
110
 %%PORTDOCS%%%%DOCSDIR%%/html/api/files.html
157
 %%PORTDOCS%%%%DOCSDIR%%/html/api/format_8h-source.html
111
 %%PORTDOCS%%%%DOCSDIR%%/html/api/format_8h-source.html
158
 %%PORTDOCS%%%%DOCSDIR%%/html/api/format_8h.html
112
 %%PORTDOCS%%%%DOCSDIR%%/html/api/format_8h.html
159
 %%PORTDOCS%%%%DOCSDIR%%/html/api/functions.html
113
 %%PORTDOCS%%%%DOCSDIR%%/html/api/functions.html
114
%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_func.html
115
%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_vars.html
160
 %%PORTDOCS%%%%DOCSDIR%%/html/api/globals.html
116
 %%PORTDOCS%%%%DOCSDIR%%/html/api/globals.html
117
%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_0x66.html
118
%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_0x67.html
119
%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_defs.html
120
%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_enum.html
121
%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_eval.html
122
%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_func.html
123
%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_type.html
124
%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_vars.html
161
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac.html
125
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac.html
162
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__callbacks.html
126
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__callbacks.html
163
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__decoder.html
127
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__decoder.html
164
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__encoder.html
128
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__encoder.html
165
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__file__decoder.html
129
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__export.html
166
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__file__encoder.html
167
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__format.html
130
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__format.html
168
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata.html
131
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata.html
169
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__level0.html
132
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__level0.html
170
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__level1.html
133
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__level1.html
171
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__level2.html
134
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__level2.html
172
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__object.html
135
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__object.html
173
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__seekable__stream__decoder.html
174
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__seekable__stream__encoder.html
175
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__stream__decoder.html
136
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__stream__decoder.html
176
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__stream__encoder.html
137
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__stream__encoder.html
177
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp.html
138
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp.html
178
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__decoder.html
139
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__decoder.html
179
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__encoder.html
140
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__encoder.html
180
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__file__decoder.html
141
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__export.html
181
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__file__encoder.html
182
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata.html
142
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata.html
183
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__level0.html
143
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__level0.html
184
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__level1.html
144
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__level1.html
185
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__level2.html
145
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__level2.html
186
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__object.html
146
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__object.html
187
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__seekable__stream__decoder.html
147
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__porting.html
188
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__seekable__stream__encoder.html
148
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__porting__1__1__2__to__1__1__3.html
189
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__stream__decoder.html
149
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__porting__1__1__3__to__1__1__4.html
190
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__stream__encoder.html
150
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__porting__1__1__4__to__1__2__0.html
191
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac.html
192
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac__decoder.html
193
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac__encoder.html
194
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac__file__encoder.html
195
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac__seekable__stream__encoder.html
196
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac__stream__decoder.html
197
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac__stream__encoder.html
198
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp.html
199
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__decoder.html
200
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__encoder.html
201
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__file__decoder.html
202
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__file__encoder.html
203
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__seekable__stream__decoder.html
204
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__seekable__stream__encoder.html
205
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__stream__decoder.html
206
%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__stream__encoder.html
207
 %%PORTDOCS%%%%DOCSDIR%%/html/api/hierarchy.html
151
 %%PORTDOCS%%%%DOCSDIR%%/html/api/hierarchy.html
208
 %%PORTDOCS%%%%DOCSDIR%%/html/api/index.html
152
 %%PORTDOCS%%%%DOCSDIR%%/html/api/index.html
209
 %%PORTDOCS%%%%DOCSDIR%%/html/api/metadata_8h-source.html
153
 %%PORTDOCS%%%%DOCSDIR%%/html/api/metadata_8h-source.html
210
 %%PORTDOCS%%%%DOCSDIR%%/html/api/metadata_8h.html
154
 %%PORTDOCS%%%%DOCSDIR%%/html/api/metadata_8h.html
211
 %%PORTDOCS%%%%DOCSDIR%%/html/api/modules.html
155
 %%PORTDOCS%%%%DOCSDIR%%/html/api/modules.html
212
 %%PORTDOCS%%%%DOCSDIR%%/html/api/ordinals_8h-source.html
156
 %%PORTDOCS%%%%DOCSDIR%%/html/api/ordinals_8h-source.html
213
%%PORTDOCS%%%%DOCSDIR%%/html/api/seekable__stream__decoder_8h-source.html
157
%%PORTDOCS%%%%DOCSDIR%%/html/api/stream__decoder_8h-source.html
214
%%PORTDOCS%%%%DOCSDIR%%/html/api/seekable__stream__decoder_8h.html
158
%%PORTDOCS%%%%DOCSDIR%%/html/api/stream__decoder_8h.html
159
%%PORTDOCS%%%%DOCSDIR%%/html/api/stream__encoder_8h-source.html
160
%%PORTDOCS%%%%DOCSDIR%%/html/api/stream__encoder_8h.html
215
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod-members.html
161
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod-members.html
216
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod.html
162
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod.html
217
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRice-members.html
163
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRice-members.html
218
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRice.html
164
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRice.html
219
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents-members.html
165
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents-members.html
220
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents.html
166
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents.html
221
%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FileDecoder-members.html
222
%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FileDecoder.html
223
%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FileEncoder-members.html
224
%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FileEncoder.html
225
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Frame-members.html
167
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Frame-members.html
226
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Frame.html
168
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Frame.html
227
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameFooter-members.html
169
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameFooter-members.html
Lines 230-239 Link Here
230
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameHeader.html
172
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameHeader.html
231
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____IOCallbacks-members.html
173
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____IOCallbacks-members.html
232
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____IOCallbacks.html
174
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____IOCallbacks.html
233
%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____SeekableStreamDecoder-members.html
234
%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____SeekableStreamDecoder.html
235
%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____SeekableStreamEncoder-members.html
236
%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____SeekableStreamEncoder.html
237
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamDecoder-members.html
175
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamDecoder-members.html
238
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamDecoder.html
176
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamDecoder.html
239
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamEncoder-members.html
177
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamEncoder-members.html
Lines 250-255 Link Here
250
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet__Track.html
188
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet__Track.html
251
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Padding-members.html
189
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Padding-members.html
252
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Padding.html
190
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Padding.html
191
%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Picture-members.html
192
%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Picture.html
253
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekPoint-members.html
193
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekPoint-members.html
254
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekPoint.html
194
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekPoint.html
255
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekTable-members.html
195
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekTable-members.html
Lines 272-301 Link Here
272
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__LPC.html
212
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__LPC.html
273
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Verbatim-members.html
213
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Verbatim-members.html
274
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Verbatim.html
214
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Verbatim.html
275
%%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____FileEncoder-members.html
276
%%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____FileEncoder.html
277
%%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____SeekableStreamEncoder-members.html
278
%%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____SeekableStreamEncoder.html
279
%%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____StreamDecoder-members.html
280
%%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____StreamDecoder.html
281
%%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____StreamEncoder-members.html
282
%%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____StreamEncoder.html
283
 %%PORTDOCS%%%%DOCSDIR%%/html/changelog.html
215
 %%PORTDOCS%%%%DOCSDIR%%/html/changelog.html
284
 %%PORTDOCS%%%%DOCSDIR%%/html/comparison.html
216
 %%PORTDOCS%%%%DOCSDIR%%/html/comparison.html
217
%%PORTDOCS%%%%DOCSDIR%%/html/comparison__chopin_prelude_24.html
218
%%PORTDOCS%%%%DOCSDIR%%/html/comparison__dream_theater_600.html
219
%%PORTDOCS%%%%DOCSDIR%%/html/comparison__eddie_warner_titus.html
220
%%PORTDOCS%%%%DOCSDIR%%/html/comparison__fanfare_de_l_eventail_de_jeanne.html
221
%%PORTDOCS%%%%DOCSDIR%%/html/comparison__gloria_estefan_conga.html
222
%%PORTDOCS%%%%DOCSDIR%%/html/comparison__hand_in_my_pocket.html
223
%%PORTDOCS%%%%DOCSDIR%%/html/comparison__l_sub_raga_sivapriya.html
224
%%PORTDOCS%%%%DOCSDIR%%/html/comparison__laetatus_sum.html
225
%%PORTDOCS%%%%DOCSDIR%%/html/comparison__mummified_in_barbed_wire.html
226
%%PORTDOCS%%%%DOCSDIR%%/html/comparison__prokofiev_pcon3_3.html
227
%%PORTDOCS%%%%DOCSDIR%%/html/comparison__ravel_sq4_4.html
228
%%PORTDOCS%%%%DOCSDIR%%/html/comparison__scarlatti_k42.html
229
%%PORTDOCS%%%%DOCSDIR%%/html/comparison__tool_forty_six_and_2.html
230
%%PORTDOCS%%%%DOCSDIR%%/html/comparison__white_room.html
231
%%PORTDOCS%%%%DOCSDIR%%/html/comparison_all_cpudectime.html
232
%%PORTDOCS%%%%DOCSDIR%%/html/comparison_all_cpuenctime.html
233
%%PORTDOCS%%%%DOCSDIR%%/html/comparison_all_procdectime.html
234
%%PORTDOCS%%%%DOCSDIR%%/html/comparison_all_procenctime.html
235
%%PORTDOCS%%%%DOCSDIR%%/html/comparison_all_ratio.html
285
 %%PORTDOCS%%%%DOCSDIR%%/html/developers.html
236
 %%PORTDOCS%%%%DOCSDIR%%/html/developers.html
286
 %%PORTDOCS%%%%DOCSDIR%%/html/documentation.html
237
 %%PORTDOCS%%%%DOCSDIR%%/html/documentation.html
238
%%PORTDOCS%%%%DOCSDIR%%/html/documentation_bugs.html
239
%%PORTDOCS%%%%DOCSDIR%%/html/documentation_example_code.html
240
%%PORTDOCS%%%%DOCSDIR%%/html/documentation_format_overview.html
241
%%PORTDOCS%%%%DOCSDIR%%/html/documentation_tasks.html
242
%%PORTDOCS%%%%DOCSDIR%%/html/documentation_tools.html
243
%%PORTDOCS%%%%DOCSDIR%%/html/documentation_tools_flac.html
244
%%PORTDOCS%%%%DOCSDIR%%/html/documentation_tools_metaflac.html
245
%%PORTDOCS%%%%DOCSDIR%%/html/documentation_tools_plugins.html
287
 %%PORTDOCS%%%%DOCSDIR%%/html/download.html
246
 %%PORTDOCS%%%%DOCSDIR%%/html/download.html
288
 %%PORTDOCS%%%%DOCSDIR%%/html/faq.html
247
 %%PORTDOCS%%%%DOCSDIR%%/html/faq.html
289
 %%PORTDOCS%%%%DOCSDIR%%/html/favicon.ico
248
 %%PORTDOCS%%%%DOCSDIR%%/html/favicon.ico
290
 %%PORTDOCS%%%%DOCSDIR%%/html/features.html
249
 %%PORTDOCS%%%%DOCSDIR%%/html/features.html
250
%%PORTDOCS%%%%DOCSDIR%%/html/flac.css
291
 %%PORTDOCS%%%%DOCSDIR%%/html/format.html
251
 %%PORTDOCS%%%%DOCSDIR%%/html/format.html
292
%%PORTDOCS%%%%DOCSDIR%%/html/goals.html
293
 %%PORTDOCS%%%%DOCSDIR%%/html/id.html
252
 %%PORTDOCS%%%%DOCSDIR%%/html/id.html
294
 %%PORTDOCS%%%%DOCSDIR%%/html/images/1x1.gif
253
 %%PORTDOCS%%%%DOCSDIR%%/html/images/1x1.gif
295
 %%PORTDOCS%%%%DOCSDIR%%/html/images/cafebug.gif
254
 %%PORTDOCS%%%%DOCSDIR%%/html/images/cafebug.gif
255
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/Blackbird_Front_low3_325x87.jpg
256
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/MS300frontsmall_270x108.jpg
257
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/MediaBox_Frt_170x325.jpg
258
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/SB_Hero_Black_325x182.jpg
259
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/Sooloos-ControlOne_325x328.jpg
260
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/Z500_front_325x94.jpg
261
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/a2_01_325x252.jpg
262
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/arcus_325x135.jpg
263
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/bmp-1430_325x241.jpg
264
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/cs505_front_lrg_325x113.jpg
265
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/enus_3-4lft-hires_product_eva8000_325x127.jpg
266
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/escient_ProductLine_325x163.jpg
267
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/hifidelio_bl_front_Z_RGB_325x163.jpg
268
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/i-station-mini-dx_325x237.jpg
269
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/iwod-g10_325x257.jpg
270
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/knc_hr-2800_325x209.jpg
271
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/mediaready_prodmain_MRMCa_325x232.jpg
272
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/meizu_m6_325x206.jpg
273
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/musica_artwork_325x90.jpg
274
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/neodigits_x5000_325x124.jpg
275
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/onda-vx737_325x240.jpg
276
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/request_n_front_325x103.jpg
277
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/rio_karma_279x254.jpg
278
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/sonos_family_RGB_325x200.jpg
279
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/teclast-tl29_325x244.jpg
280
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/transporter_hero_grey_325x208.jpg
281
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/tvix-4000_325x204.jpg
282
%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/vibez_nofm_combi_black_b_325x220.jpg
296
 %%PORTDOCS%%%%DOCSDIR%%/html/images/logo100.gif
283
 %%PORTDOCS%%%%DOCSDIR%%/html/images/logo100.gif
297
 %%PORTDOCS%%%%DOCSDIR%%/html/images/logo130.gif
284
 %%PORTDOCS%%%%DOCSDIR%%/html/images/logo130.gif
298
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
285
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
286
%%PORTDOCS%%%%DOCSDIR%%/html/itunes.html
299
 %%PORTDOCS%%%%DOCSDIR%%/html/license.html
287
 %%PORTDOCS%%%%DOCSDIR%%/html/license.html
300
 %%PORTDOCS%%%%DOCSDIR%%/html/links.html
288
 %%PORTDOCS%%%%DOCSDIR%%/html/links.html
301
 %%PORTDOCS%%%%DOCSDIR%%/html/news.html
289
 %%PORTDOCS%%%%DOCSDIR%%/html/news.html
Lines 313-323 Link Here
313
 %%PORTDOCS%%%%DOCSDIR%%/html/ru/links.html
301
 %%PORTDOCS%%%%DOCSDIR%%/html/ru/links.html
314
 %%PORTDOCS%%%%DOCSDIR%%/html/ru/news.html
302
 %%PORTDOCS%%%%DOCSDIR%%/html/ru/news.html
315
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/ru
303
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/ru
304
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images/hw
316
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
305
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
317
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/api
306
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/api
318
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
307
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
319
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
308
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
320
@dirrm include/OggFLAC++
321
@dirrm include/OggFLAC
322
 @dirrm include/FLAC++
309
 @dirrm include/FLAC++
323
 @dirrm include/FLAC
310
 @dirrm include/FLAC

Return to bug 119476