Merge pull request #1531

9d1d3a4 portable serializer: use signed char for size (kenshi84)
monero-project · Jan 9, 2017 · 278562d · 278562d
2 parents 6cbfe0f + 9d1d3a4
commit 278562d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/external/boost/archive/portable_binary_archive.hpp b/external/boost/archive/portable_binary_archive.hpp
@@ -14,6 +14,7 @@
 #include <boost/config.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/static_assert.hpp>
+#include <boost/archive/archive_exception.hpp>
 
 #include <climits>
 #if CHAR_BIT != 8
@@ -37,7 +38,9 @@ enum portable_binary_archive_flags {
 //#endif
 
 inline void
-reverse_bytes(char size, char *address){
+reverse_bytes(signed char size, char *address){
+    if (size <= 0)
+        throw archive_exception(archive_exception::other_exception);
     char * first = address;
     char * last = first + size - 1;
     for(;first < last;++first, --last){

diff --git a/external/boost/archive/portable_binary_iarchive.hpp b/external/boost/archive/portable_binary_iarchive.hpp
@@ -234,7 +234,7 @@ namespace boost { namespace archive {
 
 inline void 
 portable_binary_iarchive::load_impl(boost::intmax_t & l, char maxsize){
-    char size;
+    signed char size;
     l = 0;
     this->primitive_base_t::load(size);
 

diff --git a/external/boost/archive/portable_binary_oarchive.hpp b/external/boost/archive/portable_binary_oarchive.hpp
@@ -225,7 +225,7 @@ portable_binary_oarchive::save_impl(
     const boost::intmax_t l,
     const char maxsize
 ){
-    char size = 0;
+    signed char size = 0;
 
     if(l == 0){
         this->primitive_base_t::save(size);
@@ -245,7 +245,7 @@ portable_binary_oarchive::save_impl(
     }while(ll != 0);
 
     this->primitive_base_t::save(
-        static_cast<char>(negative ? -size : size)
+        static_cast<signed char>(negative ? -size : size)
     );
 
     if(negative)