rpms/flac/FC-6 flac-1.1.2-bufferoverflow-fix.diff,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: bnocera

Update of /cvs/dist/rpms/flac/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv28105

Modified Files:
	flac-1.1.2-bufferoverflow-fix.diff 
Log Message:
Remove winamp bits from the patch


flac-1.1.2-bufferoverflow-fix.diff:
 include/share/alloc.h             |  212 ++++++++++++++++++++++++++++++++++++++
 src/libFLAC++/metadata.cpp        |   14 +-
 src/libFLAC/include/private/md5.h |    2 
 src/libFLAC/md5.c                 |    8 +
 src/libFLAC/memory.c              |   30 ++++-
 src/libFLAC/metadata_iterators.c  |   18 +--
 src/libFLAC/metadata_object.c     |   63 +++++++----
 src/libFLAC/stream_decoder.c      |   32 +++--
 src/libFLAC/stream_encoder.c      |    3 
 src/metaflac/operations.c         |    5 
 src/metaflac/options.c            |   19 ++-
 src/metaflac/utils.c              |    5 
 src/plugin_common/charset.c       |    6 +
 src/plugin_common/tags.c          |   34 +++---
 src/plugin_xmms/plugin.c          |    9 +
 src/share/utf8/charset.c          |    3 
 src/share/utf8/iconvert.c         |    9 +
 src/share/utf8/utf8.c             |   44 +++++--
 18 files changed, 416 insertions(+), 100 deletions(-)

Index: flac-1.1.2-bufferoverflow-fix.diff
===================================================================
RCS file: /cvs/dist/rpms/flac/FC-6/flac-1.1.2-bufferoverflow-fix.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- flac-1.1.2-bufferoverflow-fix.diff	17 Oct 2007 15:05:03 -0000	1.1
+++ flac-1.1.2-bufferoverflow-fix.diff	17 Oct 2007 15:15:34 -0000	1.2
@@ -316,53 +316,6 @@
    if (!outbuf)
      goto fail;
    ib = utfbuf;
---- src/plugin_winamp2/infobox.c-dist	2005-01-30 16:10:57.000000000 +0100
-+++ src/plugin_winamp2/infobox.c	2007-10-12 15:42:00.000000000 +0200
-@@ -19,6 +19,7 @@
- #include <windows.h>
- #include <stdio.h>
- #include "FLAC/all.h"
-+#include "share/alloc.h"
- #include "plugin_common/all.h"
- #include "infobox.h"
- #include "config.h"
-@@ -70,7 +71,7 @@ static void LoadGenres()
- 	hFile = CreateFile(buffer, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
- 	if (hFile == INVALID_HANDLE_VALUE) return;
- 	genresSize = GetFileSize(hFile, 0);
--	if (genresSize && (genres = (char*)malloc(genresSize+2)))
-+	if (genresSize && (genres = (char*)safe_malloc_add_2op_(genresSize, /*+*/2)))
- 	{
- 		if (!ReadFile(hFile, genres, genresSize, &spam, NULL) || spam!=genresSize)
- 		{
-@@ -183,7 +184,7 @@ static wchar_t *AnsiToWide(const char *s
- 
- 	len = strlen(src) + 1;
- 	/* copy */
--	dest = (wchar_t*)malloc(len*sizeof(wchar_t));
-+	dest = (wchar_t*)safe_malloc_mul_2op_(len, /*times*/sizeof(wchar_t));
- 	if (dest) mbstowcs(dest, src, len);
- 	return dest;
- }
---- src/plugin_winamp2/in_flac.c-dist	2005-02-02 05:50:00.000000000 +0100
-+++ src/plugin_winamp2/in_flac.c	2007-10-12 15:42:00.000000000 +0200
-@@ -19,6 +19,7 @@
- #include <windows.h>
- #include <stdio.h>
- 
-+#include "share/alloc.h"
- #include "winamp2/in2.h"
- #include "config.h"
- #include "infobox.h"
-@@ -274,7 +275,7 @@ static T_CHAR *get_tag(const T_CHAR *tag
- 	if (!tag)
- 		return 0;
- 	/* Vorbis comment names must be ASCII, so convert 'tag' first */
--	tagname = malloc(wcslen(tag)+1);
-+	tagname = safe_malloc_add_2op_(wcslen(tag), /*+*/1);
- 	for(p=tagname;*tag;) {
- 		if(*tag > 0x7d) {
- 			free(tagname);
 --- src/libFLAC/md5.c-dist	2004-07-23 03:13:06.000000000 +0200
 +++ src/libFLAC/md5.c	2007-10-12 17:26:20.000000000 +0200
 @@ -230,7 +230,13 @@ FLAC__MD5Accumulate(struct FLAC__MD5Cont