X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Fdb%2Fsqlite3statement.cpp;h=fea3d76849c968adbbee3fb8546e4eae4dad1e04;hp=81df27a419c6421a822f33318ea2425bb0c6d17b;hb=63376b2a82c3f6cdf2df56b1f134bd7df0aaab3a;hpb=e773b0ecb8a35c67cde5b2e82bbebb05224f34d0

diff --git a/src/db/sqlite3statement.cpp b/src/db/sqlite3statement.cpp
index 81df27a..fea3d76 100644
--- a/src/db/sqlite3statement.cpp
+++ b/src/db/sqlite3statement.cpp
@@ -229,8 +229,24 @@ const bool Statement::ResultBlob(const int column, void *data, int &length)
 	{
 		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
 		//PThread::Guard g(DB::Instance()->m_mutex);
-		data=(void *)sqlite3_column_blob(m_statement,column);
-		length=sqlite3_column_bytes(m_statement,column);
+		int bloblength=sqlite3_column_bytes(m_statement,column);
+		if(bloblength>length)
+		{
+			bloblength=length;
+		}
+		if(bloblength<length)
+		{
+			length=bloblength;
+		}
+		const void *blobptr=sqlite3_column_blob(m_statement,column);
+		if(blobptr)
+		{
+			std::copy((unsigned char *)blobptr,(unsigned char *)blobptr+bloblength,(unsigned char *)data);
+		}
+		else
+		{
+			length=0;
+		}
 		return true;
 	}
 	else