WebSVN – spk – Diff – /libspk/src/File.cpp

 	if ( !this->CompressData(compressionType, progress) )
 		return false;
 	return true;
+}
-unsigned char *C_File::CompressToData(int compressionType, unsigned long *outSize, CProgressInfo *progress, int level)
+unsigned char* C_File::CompressToData(int compressionType, size_t* outSize, CProgressInfo* progress, int level)
+{
+	if (outSize) *outSize = 0;
-	unsigned long comprLen = m_lDataSize;
+	size_t initialLen = m_lDataSize;
-	if ( comprLen < 100 )		comprLen = 200;
+	if (initialLen < 100) initialLen = 200;
-	else if ( comprLen < 1000 )	comprLen *= 2;
+	else if (initialLen < 1000) initialLen *= 2;
-	comprLen += 1000;
+	initialLen += 1000;
-	switch(compressionType)
+	switch (compressionType)
+	{
+	case SPKCOMPRESS_ZLIB:
+	{
+		unsigned long comprLen = static_cast<unsigned long>(initialLen);
+		unsigned char* compr = (unsigned char*)calloc(comprLen, 1);
+		if (!compr) return NULL;
-		case SPKCOMPRESS_ZLIB:
+		int err = Z_NOTENOUGH_BUF;
+		while (err == Z_NOTENOUGH_BUF)
+		{
+			err = compress2(compr, &comprLen, (const unsigned char*)m_sData, m_lDataSize,
+				(progress) ? progress->GetDonePointer() : 0, level);
+			if (err == Z_NOTENOUGH_BUF)
+			{
-				unsigned char *compr = (unsigned char *)calloc(comprLen, 1);
+				unsigned long newLen = comprLen + (CHUNK * 2);
-				int err = Z_NOTENOUGH_BUF;
+				unsigned char* newCompr = (unsigned char*)realloc(compr, newLen);
-				while ( err == Z_NOTENOUGH_BUF )
+				if (!newCompr) { free(compr); return NULL; }
-				{
-					err = compress2 ( compr, &comprLen, (const unsigned char *)m_sData, m_lDataSize, (progress) ? progress->GetDonePointer() : 0, level );
-					if ( err == Z_NOTENOUGH_BUF )
+				compr = newCompr;
-					{
-						comprLen += (CHUNK * 2);
+				comprLen = newLen;
-						compr = (unsigned char *)realloc(compr, comprLen);
-					}
+			}
-					else
-						break;
-				}
+		}
-				// if its compressed ok, remove old data and use new one
-				if ( err == Z_OK )
+		if (err == Z_OK && comprLen > 0)
-				{
+		{
-					unsigned char *retData = new unsigned char[comprLen];
+			unsigned char* retData = new (std::nothrow) unsigned char[comprLen];
-					(*outSize) = comprLen;
+			if (!retData) { free(compr); return NULL; }
-					memcpy(retData, compr, comprLen);
+			memcpy(retData, compr, comprLen);
-					free(compr);
+			free(compr);
+			if (outSize) *outSize = static_cast<size_t>(comprLen);
-					return retData;
+			return retData;
-				}
+		}
-				free(compr);
+		free(compr);
-				return NULL;
+		return NULL;
-			}
+	}
-			break;
+	break;
-		case SPKCOMPRESS_LZMA:
+	case SPKCOMPRESS_LZMA:
-			{
+	{
+		size_t comprLen = initialLen;
-				unsigned char *compr = (unsigned char *)malloc(comprLen);
+		unsigned char* compr = new (std::nothrow) unsigned char[comprLen];
-				if (!compr) {
-					return NULL;
+		if (!compr) return NULL;
-				}
-				SRes res = Lzma86_Encode((Byte *)compr, (size_t *)&comprLen, (const Byte *)m_sData, (size_t)m_lDataSize, level, LZMA_DICT, SZ_FILTER_NO, (progress) ? progress->GetDonePointer() : NULL);
-				if ( res == SZ_OK )
-				{
-					unsigned char *retData = new unsigned char[comprLen];
+		SRes res = Lzma86_Encode((Byte*)compr, (size_t*)&comprLen, (const Byte*)m_sData, (size_t)m_lDataSize,
-					(*outSize) = comprLen;
-					memcpy(retData, compr, comprLen);
+			level, LZMA_DICT, SZ_FILTER_NO, (progress) ? progress->GetDonePointer() : NULL);
-					free(compr);
-					return retData;
-				}
+		if (res == SZ_OK && comprLen > 0)
+		{
+			unsigned char* retData = new (std::nothrow) unsigned char[comprLen];
+			if (!retData) { delete[] compr; return NULL; }
+			memcpy(retData, compr, comprLen);
-				free(compr);
+			delete[] compr;
+			if (outSize) *outSize = comprLen;
+			return retData;
+		}
+		delete[] compr;
-				return NULL;
+		return NULL;
-			}
+	}
-			break;
+	break;
+	}
 	return NULL;
+}
 	if ( m_iDataCompression != SPKCOMPRESS_NONE )
 		return true;
 	m_lUncomprDataSize = m_lDataSize;
-	unsigned long comprLen = m_lDataSize;
+	size_t comprLen = static_cast<size_t>(m_lDataSize);
 	if ( comprLen < 100 )
 		comprLen = 200;
 	else if ( comprLen < 1000 )
 		comprLen *= 2;
 	comprLen += 1000;
 	// best compression, attempt to compress the file multiple times until we get the best one
 	if ( compressionType == SPKCOMPRESS_BEST )
+	{
 		int compress[] = { SPKCOMPRESS_ZLIB, SPKCOMPRESS_LZMA };
 		int bestCompress = -1;
-		unsigned int bestSize = 0;
+		size_t bestSize = 0;
 		unsigned char *bestCompr = NULL;
 		for ( int i = 0; i < 2; i++ )
+		{
-			unsigned long checkSize = 0;
+			size_t checkSize = 0;
 			unsigned char *compr = this->CompressToData(compress[i], &checkSize, progress, level);
 			if ( compr )
+			{
 				if ( checkSize < bestSize || bestCompress == -1 )
+				{
+	}
 	if ( data )
+	{
 		unsigned char *newdata = UnPCKData ( data, datasize, len, CheckPCK() );
-		delete data;
+		delete[] data;
 		return newdata;
+	}
 	return NULL;
+}
 	return NULL;
+}
 unsigned char *UnPCKData ( unsigned char *data, size_t datasize, size_t *len ) { return UnPCKData(data, datasize, len, IsDataPCK(data, datasize)); }
-unsigned char *UnPCKData ( unsigned char *data, size_t datasize, size_t *len, bool nocrypt )
+unsigned char* UnPCKData(unsigned char* data, size_t datasize, size_t* len, bool nocrypt)
+{
-	bool isPCK = IsDataPCK(data, datasize);
-	unsigned char *newData = data;
-	unsigned char *tempData = NULL;
-	if ( nocrypt )
-	{
-		tempData = new unsigned char[datasize];
-		newData = tempData;
-		memcpy(newData, data, datasize);
-		unsigned char magic = newData[0] ^ 0xC8;
-		for ( size_t i = 1; i < datasize; i++ )
-			newData[i] ^= magic;
-		++newData;
-		--datasize;
-	}
-	// create data buffer
-	size_t *uncomprLenSize = (size_t*)(newData + (datasize - 4));
+	if (!data || datasize < 8) { // Minimum size for header + length
-	unsigned long uncomprLen = (unsigned long)*uncomprLenSize;
-	if ( uncomprLen > (datasize * 100) )
-	{
-		if ( tempData ) delete []tempData;
-		*len = 0;
+		if (len) *len = 0;
-		return NULL;
+		return nullptr;
+	}
-	unsigned char *uncompr = new unsigned char[uncomprLen + 1];
-	if ( !uncompr ) {
-		if ( tempData ) delete []tempData;
-		return NULL;
-	}
-	memset ( uncompr, 0, sizeof(uncompr) );
+	bool isPCK = IsDataPCK(data, datasize);
+	unsigned char* newData = data;
+	unsigned char* tempData = nullptr;
-	// find header size
+	if (nocrypt) {
+		tempData = new (std::nothrow) unsigned char[datasize];
+		if (!tempData) { if (len) *len = 0; return nullptr; }
+		memcpy(tempData, data, datasize);
-	unsigned char *buf = newData + PCKHEADERSIZE;
+		unsigned char magic = tempData[0] ^ 0xC8;
+		for (size_t i = 1; i < datasize; i++)
+			tempData[i] ^= magic;
+		newData = tempData + 1;
+		datasize -= 1;
+	}
+	if (datasize < 4) { // Not enough data for length
+		if (tempData) delete[] tempData;
+		if (len) *len = 0;
+		return nullptr;
+	}
+	// Read uncompressed length safely
+	size_t lenPos = datasize - 4;
+	unsigned long uncomprLen = 0;
+	memcpy(&uncomprLen, newData + lenPos, 4);
+	if (uncomprLen > datasize * 100 || uncomprLen == 0) {
+		if (tempData) delete[] tempData;
+		if (len) *len = 0;
+		return nullptr;
+	}
+	unsigned char* uncompr = new (std::nothrow) unsigned char[uncomprLen + 1];
+	if (!uncompr) {
+		if (tempData) delete[] tempData;
+		if (len) *len = 0;
+		return nullptr;
+	}
+	memset(uncompr, 0, uncomprLen + 1);
+	// Parse header
+	size_t bufOffset = PCKHEADERSIZE;
+	if (datasize < bufOffset + 8) { // Not enough data for header and footer
-//	buf = data + (6 + sizeof(time_t));
+		if (tempData) delete[] tempData;
+		delete[] uncompr;
+		if (len) *len = 0;
+		return nullptr;
+	}
-	char flag = newData[3];
+	unsigned char flag = newData[3];
+	unsigned char* buf = newData + bufOffset;
-	if ( flag & GZ_FLAG_EXTRA )
+	if (flag & GZ_FLAG_EXTRA) {
-	{
+		if (datasize < bufOffset + 2) { if (tempData) delete[] tempData; delete[] uncompr; if (len) *len = 0; return nullptr; }
 		size_t xlen = *((short int*)(buf));
+		buf += 2;
 		buf += xlen;
+	}
-	if ( flag & GZ_FLAG_FILENAME )
+	if (flag & GZ_FLAG_FILENAME) {
-	{
-		char *origname = (char*)(buf);
+		char* origname = (char*)(buf);
-		buf += strlen (origname) + 1;
+		buf += strlen(origname) + 1;
+	}
-	if ( flag & GZ_FLAG_COMMENT )
+	if (flag & GZ_FLAG_COMMENT) {
-	{
-		char *comment = (char*)(buf);
+		char* comment = (char*)(buf);
 		buf += strlen(comment) + 1;
+	}
-	if ( flag & GZ_FLAG_HCRC )
+	if (flag & GZ_FLAG_HCRC) {
 		buf += 2;
-	long bufSize = (long)(datasize - (buf-newData) - 8);
+	}
-	int err = uncompress2 ( uncompr, &uncomprLen, buf, bufSize );
+	long bufSize = (long)(datasize - (buf - newData) - 8);
-	if ( err != Z_OK )
+	if (bufSize <= 0) {
+		if (tempData) delete[] tempData;
+		delete[] uncompr;
+		if (len) *len = 0;
+		return nullptr;
-	{
+	}
+	int err = uncompress2(uncompr, &uncomprLen, buf, bufSize);
+	if (err != Z_OK) {
-		if ( tempData ) delete []tempData;
+		if (tempData) delete[] tempData;
-		delete uncompr;
+		delete[] uncompr;
-		*len = 0;
+		if (len) *len = 0;
-		return NULL;
+		return nullptr;
+	}
-	*len = uncomprLen;
+	if (len) *len = uncomprLen;
 	uncompr[uncomprLen] = '\0';
-	if ( tempData ) delete []tempData;
+	if (tempData) delete[](tempData - 1); // tempData was offset by +1
 	return uncompr;
+}
 bool IsDataPCK ( const unsigned char *data, size_t size )
+{

Subversion Repositories spk

(root)/libspk/src/File.cpp – Rev 285 → 308