From 5aafae7616157289f21ca8d2ac3f264f0f1ae0fe Mon Sep 17 00:00:00 2001
From: Zak Henry <zak@cloudnc.com>
Date: Thu, 22 Aug 2024 13:47:06 +1200
Subject: [PATCH] fix(web): fix empty trailer parsing causing infinite parser
 loop

---
 .idea/.gitignore                             |  8 ++++
 .idea/inspectionProfiles/Project_Default.xml | 17 ++++++++
 .idea/misc.xml                               |  4 ++
 .idea/modules.xml                            |  8 ++++
 .idea/tonic.iml                              | 43 ++++++++++++++++++++
 .idea/vcs.xml                                |  6 +++
 tonic-web/src/call.rs                        |  5 ++-
 7 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/tonic.iml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 000000000..13566b81b
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 000000000..0bcfe33ff
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,17 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredPackages">
+        <value>
+          <list size="4">
+            <item index="0" class="java.lang.String" itemvalue="protobuf" />
+            <item index="1" class="java.lang.String" itemvalue="grpcio" />
+            <item index="2" class="java.lang.String" itemvalue="grpcio-tools" />
+            <item index="3" class="java.lang.String" itemvalue="grpcio_tools" />
+          </list>
+        </value>
+      </option>
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 000000000..0a75641dc
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JsBuildToolPackageJson" sorting="DEFINITION_ORDER" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 000000000..66c87c1c2
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/tonic.iml" filepath="$PROJECT_DIR$/.idea/tonic.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/tonic.iml b/.idea/tonic.iml
new file mode 100644
index 000000000..a0bc40e99
--- /dev/null
+++ b/.idea/tonic.iml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/codegen/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/examples/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/interop/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/ambiguous_methods/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/compression/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/default_stubs/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/disable_comments/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/disable_comments/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/extern_path/my_application/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/extern_path/uuid/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/included_service/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/integration_tests/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/integration_tests/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/root-crate-path/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/same_name/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/service_named_result/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/service_named_service/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/stream_conflict/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/use_arc_self/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/wellknown-compiled/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/wellknown/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tonic-build/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tonic-health/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tonic-reflection/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tonic-reflection/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/tonic-types/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tonic-web/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tonic-web/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/tonic-web/tests/integration/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tonic-web/tests/integration/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/tonic/benches" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/tonic/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 000000000..35eb1ddfb
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/tonic-web/src/call.rs b/tonic-web/src/call.rs
index 2bdcdc60c..6a2fa5472 100644
--- a/tonic-web/src/call.rs
+++ b/tonic-web/src/call.rs
@@ -305,7 +305,10 @@ where
                     }
                     FindTrailers::IncompleteBuf => continue,
                     FindTrailers::Done(len) => {
-                        Poll::Ready(Some(Ok(Frame::data(buf.split_to(len).freeze()))))
+                        Poll::Ready(match len {
+                            0 => None,
+                            _ => Some(Ok(Frame::data(buf.split_to(len).freeze()))),
+                        })
                     }
                 };
             }