Merge pull request #250 from bitshares/update-unpack-static-variant

Avoid potential corruption during unpack of static_variant
bitshares · Feb 6, 2024 · 9060dbc · 9060dbc
2 parents 3ea07ea + 2d73734
commit 9060dbc
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/include/fc/io/raw.hpp b/include/fc/io/raw.hpp
@@ -889,8 +889,9 @@ namespace fc {
        --_max_depth;
        unsigned_int w;
        fc::raw::unpack( s, w, _max_depth );
-       sv.set_which(w.value);
-       sv.visit( unpack_static_variant<Stream>( s, _max_depth ) );
+       static_variant<T...> helper( static_cast<typename static_variant<T...>::tag_type>(w.value) );
+       helper.visit( unpack_static_variant<Stream>( s, _max_depth ) );
+       sv = helper;
     }
 
 } } // namespace fc::raw