Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Pullup ticket 2281 - requested by drochner
security fix for libsndfile - pkgsrc/audio/libsndfile/Makefile 1.44 - pkgsrc/audio/libsndfile/distinfo 1.23 - pkgsrc/audio/libsndfile/patches/patch-ba 1.1 Module Name: pkgsrc Committed By: drochner Date: Mon Jan 7 17:34:38 UTC 2008 Modified Files: pkgsrc/audio/libsndfile: Makefile distinfo Added Files: pkgsrc/audio/libsndfile/patches: patch-ba Log Message: fix CVE-2007-4974 (buffer overflow), patch from Gentoo bump PKGREVISION
- Loading branch information
ghen
committed
Jan 29, 2008
1 parent
1a15be1
commit 81a9c93
Showing
3 changed files
with
44 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
$NetBSD: patch-ba,v 1.1.2.2 2008/01/29 14:05:51 ghen Exp $ | ||
|
||
--- src/flac.c.orig 2008-01-03 17:13:00.000000000 +0100 | ||
+++ src/flac.c | ||
@@ -57,7 +57,7 @@ flac_open (SF_PRIVATE *psf) | ||
** Private static functions. | ||
*/ | ||
|
||
-#define ENC_BUFFER_SIZE 4096 | ||
+#define ENC_BUFFER_SIZE 8192 | ||
|
||
typedef enum | ||
{ PFLAC_PCM_SHORT = 0, | ||
@@ -202,6 +202,17 @@ flac_buffer_copy (SF_PRIVATE *psf) | ||
const FLAC__int32* const *buffer = pflac->wbuffer ; | ||
unsigned i = 0, j, offset ; | ||
|
||
+ /* | ||
+ ** frame->header.blocksize is variable and we're using a constant blocksize | ||
+ ** of FLAC__MAX_BLOCK_SIZE. | ||
+ ** Check our assumptions here. | ||
+ */ | ||
+ if (frame->header.blocksize > FLAC__MAX_BLOCK_SIZE) | ||
+ { psf_log_printf (psf, "Ooops : frame->header.blocksize (%d) > FLAC__MAX_BLOCK_SIZE (%d)\n", __func__, __LINE__, frame->header.blocksize, FLAC__MAX_BLOCK_SIZE) ; | ||
+ psf->error = SFE_INTERNAL ; | ||
+ return 0 ; | ||
+ } ; | ||
+ | ||
if (pflac->ptr == NULL) | ||
{ /* | ||
** Not sure why this code is here and not elsewhere. | ||
@@ -210,7 +221,7 @@ flac_buffer_copy (SF_PRIVATE *psf) | ||
pflac->bufferbackup = SF_TRUE ; | ||
for (i = 0 ; i < frame->header.channels ; i++) | ||
{ if (pflac->rbuffer [i] == NULL) | ||
- pflac->rbuffer [i] = calloc (frame->header.blocksize, sizeof (FLAC__int32)) ; | ||
+ pflac->rbuffer [i] = calloc (FLAC__MAX_BLOCK_SIZE, sizeof (FLAC__int32)) ; | ||
memcpy (pflac->rbuffer [i], buffer [i], frame->header.blocksize * sizeof (FLAC__int32)) ; | ||
} ; | ||
pflac->wbuffer = (const FLAC__int32* const*) pflac->rbuffer ; |