temporary fix for utf8 diff bugs

multikatt · May 24, 2016 · e82c01e · e82c01e
1 parent 9560db0
commit e82c01e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/libraries/app/database_api.cpp b/libraries/app/database_api.cpp
@@ -1333,6 +1333,8 @@ state database_api::get_state( string path )const
  } catch ( const fc::exception& e ) {
     _state.error = e.to_detail_string();
  }
+ idump((_state)(fc::json::to_string(_state).size()));
+ idump((fc::is_utf8( fc::json::to_string(_state)) ));
  return _state;
 }
 

diff --git a/libraries/chain/steem_evaluator.cpp b/libraries/chain/steem_evaluator.cpp
@@ -275,7 +275,10 @@ void comment_evaluator::do_apply( const comment_operation& o )
                auto patch = dmp.patch_fromText( o.body );
                if( patch.size() ) {
                   auto result = dmp.patch_apply( patch, com.body );
-                  com.body = result.first;
+                  if( !fc::is_utf8( result.first ) ) {
+                     idump(("invalid utf8")(result.first));
+                     com.body = fc::prune_invalid_utf8(result.first);
+                  } else { com.body = result.first; }
                }
                else { // replace
                   com.body = o.body;

diff --git a/libraries/fc b/libraries/fc
+15 −13		include/fc/utf8.hpp
+20 −0		src/utf8.cpp
+1 −1		vendor/websocketpp