messages/MForward: reencode forwarded message if target has differing…

… features This ensures we reencode the payload with the appropriate set of features if the client, us, or the target do not have identical features. Otherwise we may forward an encoding with more features than the target can handle. Signed-off-by: Sage Weil <[email protected]>
mitsu-ko · Oct 24, 2016 · a433455 · a433455
1 parent 3eec78e
commit a433455
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/messages/MForward.h b/src/messages/MForward.h
@@ -77,6 +77,9 @@ struct MForward : public Message {
     // message are changed when reencoding with more features than the
     // client had originally.  That should never happen, but we may as
     // well be defensive here.
+    if (con_features != features) {
+      msg->clear_payload();
+    }
     encode_message(msg, features & con_features, payload);
     ::encode(con_features, payload);
     ::encode(entity_name, payload);