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

 	ubound=deflateBound(&zs, (unsigned long)size);
 	if ( newsize < ubound)
+	{
 		newsize += ubound;
 		data = (unsigned char *)realloc ( data, sizeof(unsigned char) * newsize );
+		if (!data)
+			return nullptr;
+	}
 	zs.next_out=d;
 	zs.avail_out=(unsigned int)newsize - pos;
 	while((ret=deflate(&zs, Z_FINISH))==Z_OK)
+	{
 		newsize += 1024;
 		data = (unsigned char *)realloc ( data, sizeof(unsigned char) * newsize );
+		if (!data)
+			return nullptr;
 		zs.next_out=data + zs.total_out;
 		zs.avail_out=(unsigned int)newsize - zs.total_out;
+	}
 	pos += zs.total_out;
 	int s = sizeof(crc) + sizeof(size);
 	if ( newsize < (size_t)(s + pos) )
+	{
 		newsize += (s + pos) - newsize;
 		data = (unsigned char *)realloc ( data, sizeof(unsigned char) * newsize );
+		if (!data)
+			return nullptr;
+	}
+	unsigned long lSize = static_cast<unsigned long>(size);
 	memcpy(&data[pos], &crc, sizeof(crc));
 	pos += sizeof(crc);
-	memcpy(&data[pos], &size, sizeof(size));
+	memcpy(&data[pos], &lSize, sizeof(lSize));
-	pos += sizeof(size);
+	pos += sizeof(lSize);
 	newsize = pos;
 	unsigned char *retdata = NULL;
 	if ( ret == Z_STREAM_END )

Subversion Repositories spk