From 1a89ce1757e75f8ba9bda76d7373a7e8527bcfc5 Mon Sep 17 00:00:00 2001
From: larsrc <larsrc@google.com>
Date: Fri, 25 Jun 2021 02:21:51 -0700
Subject: [PATCH] Make worker JSON protocol properly ignore unknown fields.

RELNOTES: None.
PiperOrigin-RevId: 381428739
---
 .../build/lib/worker/JsonWorkerMessageProcessor.java      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/google/devtools/build/lib/worker/JsonWorkerMessageProcessor.java b/src/main/java/com/google/devtools/build/lib/worker/JsonWorkerMessageProcessor.java
index d15ab345c197a2..804d6cbf1462c5 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/JsonWorkerMessageProcessor.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/JsonWorkerMessageProcessor.java
@@ -79,7 +79,10 @@ private static ImmutableList<Input> readInputs(JsonReader reader) throws IOExcep
             path = reader.nextString();
             break;
           default:
-            continue;
+            // As per https://docs.bazel.build/versions/main/creating-workers.html#work-responses,
+            // unknown fields are ignored.
+            reader.skipValue();
+            break;
         }
       }
       reader.endObject();
@@ -125,6 +128,9 @@ public WorkRequest readWorkRequest() throws IOException {
             requestId = reader.nextInt();
             break;
           default:
+            // As per https://docs.bazel.build/versions/main/creating-workers.html#work-responses,
+            // unknown fields are ignored.
+            reader.skipValue();
             break;
         }
       }