rpms/id3lib/FC-3 id3lib-3.8.3-io_helpers-163101.patch, NONE, 1.1 id3lib.spec, 1.6, 1.7

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/id3lib/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5209/FC-3

Modified Files:
	id3lib.spec 
Added Files:
	id3lib-3.8.3-io_helpers-163101.patch 
Log Message:
* Sat Jul 16 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 3.8.3-12
- Fix UTF-16 writing bug (bug #163101, upstream #1016290).



id3lib-3.8.3-io_helpers-163101.patch:

--- NEW FILE id3lib-3.8.3-io_helpers-163101.patch ---
diff -Nur id3lib-3.8.3-orig/src/io_helpers.cpp id3lib-3.8.3/src/io_helpers.cpp
--- id3lib-3.8.3-orig/src/io_helpers.cpp	2003-03-02 01:23:00.000000000 +0100
+++ id3lib-3.8.3/src/io_helpers.cpp	2005-07-16 12:47:11.000000000 +0200
@@ -363,9 +363,10 @@
     // Write the BOM: 0xFEFF
     unicode_t BOM = 0xFEFF;
     writer.writeChars((const unsigned char*) &BOM, 2);
+    const unsigned char* pdata = (const unsigned char*)data.c_str();
     for (size_t i = 0; i < size; i += 2)
     {
-      unicode_t ch = (data[i] << 8) | data[i+1];
+      unicode_t ch = (pdata[i] << 8) | pdata[i+1];
       writer.writeChars((const unsigned char*) &ch, 2);
     }
   }


Index: id3lib.spec
===================================================================
RCS file: /cvs/extras/rpms/id3lib/FC-3/id3lib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- id3lib.spec	1 Jul 2005 13:48:09 -0000	1.6
+++ id3lib.spec	16 Jul 2005 11:08:22 -0000	1.7
@@ -1,13 +1,14 @@
 Summary:	Library for manipulating ID3v1 and ID3v2 tags
 Name:		id3lib
 Version:	3.8.3
-Release:	11%{?dist}
+Release:	12%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
 URL:		http://id3lib.sourceforge.net/
 Source0:	http://download.sf.net/id3lib/%{name}-%{version}.tar.gz
 Patch0:		id3lib-dox.patch
 Patch1:		id3lib-3.8.3-libtool-autofoo.patch.bz2
+Patch2:		id3lib-3.8.3-io_helpers-163101.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	zlib-devel doxygen
 
@@ -35,6 +36,7 @@
 %setup -q
 %patch0 -p0
 %patch1 -p1 -b .libtool-autofoo
+%patch2 -p1 -b .io_helpers-163101
 
 
 %build
@@ -75,6 +77,9 @@
 %{_libdir}/libid3.so
 
 %changelog
+* Sat Jul 16 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 3.8.3-12
+- Fix UTF-16 writing bug (bug #163101, upstream #1016290).
+
 * Thu Jun 30 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 3.8.3-11
 - Make libtool link against libstdc++ (bug #162127).