[Haiku-commits] r31006 - haiku/trunk/src/add-ons/media/plugins/wav_reader

anevilyak at BerliOS anevilyak at mail.berlios.de
Wed Jun 10 16:47:57 CEST 2009


Author: anevilyak
Date: 2009-06-10 16:47:57 +0200 (Wed, 10 Jun 2009)
New Revision: 31006
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=31006&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/wav_reader/WavReaderPlugin.cpp
Log:
Be a bit more defensive here just in case the wav header has invalid data.



Modified: haiku/trunk/src/add-ons/media/plugins/wav_reader/WavReaderPlugin.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/wav_reader/WavReaderPlugin.cpp	2009-06-10 12:51:17 UTC (rev 31005)
+++ haiku/trunk/src/add-ons/media/plugins/wav_reader/WavReaderPlugin.cpp	2009-06-10 14:47:57 UTC (rev 31006)
@@ -302,7 +302,7 @@
 
 	fMetaData.extra_size = format.extra_size;
 	if (fMetaData.extra_size > 0) {
-		memcpy(fMetaData.extra_data, format.extra_data, format.extra_size);
+		memcpy(fMetaData.extra_data, format.extra_data, min_c(format.extra_size, sizeof(format.extra_data)));
 	}
 	fMetaData.channels = UINT16(format.channels);
 	fMetaData.samples_per_sec = UINT32(format.samples_per_sec);




More information about the Haiku-commits mailing list