tomcat/CVE-2025-31650-2.patch

29 lines
1.3 KiB
Diff
Raw Normal View History

From b98e74f517b36929f4208506e5adad22cb767baa Mon Sep 17 00:00:00 2001
From: Mark Thomas <markt@apache.org>
Date: Wed, 19 Mar 2025 03:21:50 +0000
Subject: [PATCH] Additional fix for BZ 69614
Origin: https://github.com/apache/tomcat/commit/b98e74f517b36929f4208506e5adad22cb767baa
---
java/org/apache/coyote/http2/Stream.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/java/org/apache/coyote/http2/Stream.java b/java/org/apache/coyote/http2/Stream.java
index e8f0d9481c03..ecda8caec811 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -456,6 +456,12 @@ public final void emitHeader(String name, String value) throws HpackException {
setIncremental(p.getIncremental());
} catch (IOException ioe) {
// Not possible with StringReader
+ } catch (IllegalArgumentException iae) {
+ // Invalid priority header field values should be ignored
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("http2Parser.processFramePriorityUpdate.invalid", getConnectionId(),
+ getIdAsString()), iae);
+ }
}
break;
}