From 8bf35968efa0dcdf881268c29096e14942c29bdb Mon Sep 17 00:00:00 2001
From: Jinhao <cnjinhao@hotmail.com>
Date: Thu, 30 Jul 2015 23:26:56 +0800
Subject: [PATCH] fix an audio_stream issue

occurs when pcmwaveformat's cksize is larger than sizeof pcmwaveformat
---
 include/nana/audio/detail/audio_stream.hpp | 32 +++++++++++-----------
 source/audio/detail/audio_stream.cpp       | 14 ++++++----
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/include/nana/audio/detail/audio_stream.hpp b/include/nana/audio/detail/audio_stream.hpp
index 694089bd..5fe9d39c 100644
--- a/include/nana/audio/detail/audio_stream.hpp
+++ b/include/nana/audio/detail/audio_stream.hpp
@@ -12,19 +12,19 @@ namespace nana{	namespace audio{
 			#pragma pack(1)
 				struct master_riff_chunk
 				{
-					unsigned long	ckID;	//"RIFF"
-					unsigned long	cksize;
-					unsigned long	waveID;	//"WAVE"
+					unsigned	ckID;	//"RIFF"
+					unsigned	cksize;
+					unsigned	waveID;	//"WAVE"
 				};
 
 				struct format_chunck
 				{
-					unsigned long	ckID;	//"fmt "
-					unsigned long	cksize;
+					unsigned		ckID;	//"fmt "
+					unsigned		cksize;
 					unsigned short	wFormatTag;
 					unsigned short	nChannels;
-					unsigned long	nSamplePerSec;
-					unsigned long	nAvgBytesPerSec;
+					unsigned		nSamplePerSec;
+					unsigned		nAvgBytesPerSec;
 					unsigned short	nBlockAlign;
 					unsigned short	wBitsPerSample;
 				};
@@ -32,19 +32,19 @@ namespace nana{	namespace audio{
 		#elif defined(NANA_LINUX)
 			struct master_riff_chunk
 			{
-				unsigned long	ckID;	//"RIFF"
-				unsigned long	cksize;
-				unsigned long	waveID;	//"WAVE"
+				unsigned	ckID;	//"RIFF"
+				unsigned	cksize;
+				unsigned	waveID;	//"WAVE"
 			}__attribute__((packed));
 
 			struct format_chunck
 			{
-				unsigned long	ckID;	//"fmt "
-				unsigned long	cksize;
+				unsigned		ckID;	//"fmt "
+				unsigned		cksize;
 				unsigned short	wFormatTag;
 				unsigned short	nChannels;
-				unsigned long	nSamplePerSec;
-				unsigned long	nAvgBytesPerSec;
+				unsigned		nSamplePerSec;
+				unsigned		nAvgBytesPerSec;
 				unsigned short	nBlockAlign;
 				unsigned short	wBitsPerSample;
 			}__attribute__((packed));
@@ -55,8 +55,8 @@ namespace nana{	namespace audio{
 		{
 			struct chunck
 			{
-				unsigned long ckID;
-				unsigned long cksize;
+				unsigned ckID;
+				unsigned cksize;
 			};
 		public:
 			bool open(const nana::string& file);
diff --git a/source/audio/detail/audio_stream.cpp b/source/audio/detail/audio_stream.cpp
index f5d4fdc1..902911a0 100644
--- a/source/audio/detail/audio_stream.cpp
+++ b/source/audio/detail/audio_stream.cpp
@@ -8,18 +8,20 @@ namespace nana{	namespace audio
 		//class audio_stream
 			bool audio_stream::open(const nana::string& file)
 			{
-				std::string fname = nana::charset(file);
-				fs_.open(fname, std::ios::binary);
+				fs_.open(static_cast<std::string>(charset(file)), std::ios::binary);
 				if(fs_)
 				{
 					wave_spec::master_riff_chunk riff;
 					fs_.read(reinterpret_cast<char*>(&riff), sizeof(riff));
-					if(riff.ckID == *reinterpret_cast<const unsigned long*>("RIFF") && riff.waveID == *reinterpret_cast<const unsigned long*>("WAVE"))
+					if(riff.ckID == *reinterpret_cast<const unsigned*>("RIFF") && riff.waveID == *reinterpret_cast<const unsigned*>("WAVE"))
 					{
 						fs_.read(reinterpret_cast<char*>(&ck_format_), sizeof(ck_format_));
-						if(ck_format_.ckID == *reinterpret_cast<const unsigned long*>("fmt ") && ck_format_.wFormatTag == 1)	//Only support PCM format
+						if(ck_format_.ckID == *reinterpret_cast<const unsigned*>("fmt ") && ck_format_.wFormatTag == 1)	//Only support PCM format
 						{
-							std::size_t cksize = _m_locate_chunck(*reinterpret_cast<const unsigned long*>("data"));
+							if (ck_format_.cksize > 16)
+								fs_.seekg(ck_format_.cksize - 16, std::ios::cur);
+
+							std::size_t cksize = _m_locate_chunck(*reinterpret_cast<const unsigned*>("data"));
 							if(cksize)
 							{
 								pcm_data_pos_ = static_cast<std::size_t>(fs_.tellg());
@@ -78,7 +80,7 @@ namespace nana{	namespace audio
 
 					if(ck.ckID == ckID)
 						return ck.cksize;
-					if(ck.ckID == *reinterpret_cast<const unsigned long*>("data"))
+					if(ck.ckID == *reinterpret_cast<const unsigned*>("data"))
 						fs_.seekg(ck.cksize + (ck.cksize & 1 ? 1 : 0), std::ios::cur);
 					else
 						fs_.seekg(ck.cksize, std::ios::cur);