Merge 312be8a into 6efb9e8

Author: pixcc

ydb/core/cms/cms_tx_load_state.cpp

@@ -9,6 +9,17 @@
 
 namespace NKikimr::NCms {
 
+namespace {
+
+template<typename T>
+bool ParseFromStringSafe(const TString& input, T* output) {
+    google::protobuf::TextFormat::Parser parser;
+    parser.AllowUnknownField(true);
+    return parser.ParseFromString(input, output);
+}
+
+} // anonymous namespace
+
 class TCms::TTxLoadState : public TTransactionBase<TCms> {
 public:
     TTxLoadState(TCms *self)
@@ -91,7 +102,7 @@ class TCms::TTxLoadState : public TTransactionBase<TCms> {
             request.Owner = owner;
             request.Order = order;
             request.Priority = priority;
-            google::protobuf::TextFormat::ParseFromString(requestStr, &request.Request);
+            ParseFromStringSafe(requestStr, &request.Request);
 
             LOG_DEBUG(ctx, NKikimrServices::CMS, "Loaded request %s owned by %s: %s",
                       id.data(), owner.data(), requestStr.data());
@@ -149,7 +160,7 @@ class TCms::TTxLoadState : public TTransactionBase<TCms> {
             permission.PermissionId = id;
             permission.RequestId = requestId;
             permission.Owner = owner;
-            google::protobuf::TextFormat::ParseFromString(actionStr, &permission.Action);
+            ParseFromStringSafe(actionStr, &permission.Action);
             permission.Deadline = TInstant::MicroSeconds(deadline);
 
             LOG_DEBUG(ctx, NKikimrServices::CMS, "Loaded permission %s owned by %s valid until %s: %s",
@@ -185,7 +196,7 @@ class TCms::TTxLoadState : public TTransactionBase<TCms> {
             TNotificationInfo notification;
             notification.NotificationId = id;
             notification.Owner = owner;
-            google::protobuf::TextFormat::ParseFromString(notificationStr, &notification.Notification);
+            ParseFromStringSafe(notificationStr, &notification.Notification);
 
             LOG_DEBUG(ctx, NKikimrServices::CMS, "Loaded notification %s owned by %s: %s",
                       id.data(), owner.data(), notificationStr.data());