Fixed float and double reading/writing bug in Buffer

marcizhu · Dec 9, 2016 · 27f0d5f · 27f0d5f
1 parent fd29317
commit 27f0d5f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Cereal/Cereal/src/Buffer.h b/Cereal/Cereal/src/Buffer.h
@@ -147,7 +147,7 @@ namespace Cereal {
 		{
 			unsigned int x;
 
-			*(unsigned int*)&x = (unsigned int)data;
+			*(unsigned int*)&x = *(unsigned int*)&data;
 
 			writeBytes<unsigned int>(x);
 
@@ -159,7 +159,7 @@ namespace Cereal {
 		{
 			unsigned long long x;
 
-			*(unsigned long long*)&x = (unsigned long long)data;
+			*(unsigned long long*)&x = *(unsigned long long*)&data;
 
 			writeBytes<unsigned long long>(x);
 

diff --git a/Cereal/Cereal/src/Reader.h b/Cereal/Cereal/src/Reader.h
@@ -50,7 +50,7 @@ namespace Cereal {
 
 			float result;
 
-			memcpy_s(&result, 4, &value, 4);
+			memcpy_s(&result, sizeof(float), &value, sizeof(float));
 
 			return result;
 		}
@@ -63,13 +63,13 @@ namespace Cereal {
 		{
 			unsigned long long value = src[pointer] << (sizeof(int) * 8 - 8);
 
-			for (int i = pointer; i < (int)pointer + (int) sizeof(float); i++)
+			for (int i = 0; i < (int) sizeof(double); i++)
 			{
 				value |= (src[pointer + i] << ((sizeof(int) * 8 - 8) - (i * 8)));
 			}
 
 			double result;
-			memcpy_s(&result, 4, &value, 4);
+			memcpy_s(&result, sizeof(double), &value, sizeof(double));
 
 			return result;
 		}

diff --git a/Sandbox/Sandbox.cpp b/Sandbox/Sandbox.cpp
@@ -7,6 +7,8 @@
 
 #include <Cereal.h>
 
+#include <src/Writer.h>
+
 void gotoxy(int x, int y)
 {
 	CONSOLE_SCREEN_BUFFER_INFO SBInfo;