fixup! fix(formData): Stop encoding values to calculate length

Author: FreeMasen

builtins/web/form-data/form-data-encoder.cpp

@@ -23,52 +23,76 @@ const char LF = '\n';
 const char CR = '\r';
 const char *CRLF = "\r\n";
 
-// Computes the length of a string after normalizing its newlines.
-// Converts CR, LF, and CRLF into a CRLF sequence.
-size_t compute_normalized_len(std::string_view src) {
-  size_t len = 0;
-
-  for (size_t i = 0; i < src.size(); i++) {
-    if (src[i] == CR) {
-      if (i + 1 < src.size() && src[i + 1] == LF) {
-        i++;
+template<typename CH> 
+size_t compute_extra_characters(CH *chars, size_t len) {
+  size_t extra = 0;
+  for (size_t i = 0; i < len; i++) {
+    auto ch = chars[i];
+    if (ch == CR) {
+      if (i + 1 < len) {
+        char16_t next = chars[i + 1];
+        if (next == LF) {
+          i += 1;
+          // the character is already accounted for
+          continue;
+        }
       }
-      len += 2; // CRLF
-    } else if (src[i] == LF) {
-      len += 2; // CRLF
-    } else {
-      len += 1;
+      extra += 1;
+    } else if (ch == LF) {
+      extra += 1;
     }
   }
+  return extra;
+}
 
+// Computes the length of a string after normalizing its newlines.
+// Converts CR, LF, and CRLF into a CRLF sequence.
+size_t compute_normalized_len(std::string_view src) {
+  size_t len = src.size();
+  len += compute_extra_characters(src.data(), len);
   return len;
+
+  // for (size_t i = 0; i < src.size(); i++) {
+  //   if (src[i] == CR) {
+  //     if (i + 1 < src.size() && src[i + 1] == LF) {
+  //       i++;
+  //     }
+  //     len += 2; // CRLF
+  //   } else if (src[i] == LF) {
+  //     len += 2; // CRLF
+  //   } else {
+  //     len += 1;
+  //   }
+  // }
+
+  // return len;
 }
 
 std::optional<size_t> compute_unencoded_normalized_len(JSContext *cx, JS::HandleString value) {
   auto linear = JS_EnsureLinearString(cx, value);
   if (!linear) {
       return std::nullopt;
   }
-  auto extra_bytes_needed = [](const auto *chars, const auto len) {
-    size_t extra = 0;
-    for (size_t i = 0; i < len; i++) {
-      auto ch = chars[i];
-      if (ch == CR) {
-        if (i+1 < len) {
-          char16_t next = chars[i+1];
-          if (next == LF) {
-            i += 1;
-            // the character is already accounted for
-            continue;
-          }
-        }
-        extra += 1;
-      } else if (ch == LF) {
-          extra += 1;
-      }
-    }
-    return extra;
-  };
+  // auto extra_bytes_needed = [](const auto *chars, const auto len) {
+  //   size_t extra = 0;
+  //   for (size_t i = 0; i < len; i++) {
+  //     auto ch = chars[i];
+  //     if (ch == CR) {
+  //       if (i+1 < len) {
+  //         char16_t next = chars[i+1];
+  //         if (next == LF) {
+  //           i += 1;
+  //           // the character is already accounted for
+  //           continue;
+  //         }
+  //       }
+  //       extra += 1;
+  //     } else if (ch == LF) {
+  //         extra += 1;
+  //     }
+  //   }
+  //   return extra;
+  // };
   auto len = JS::GetDeflatedUTF8StringLength(linear);
   size_t chars_len = JS::GetLinearStringLength(linear);
   JS::AutoCheckCannotGC nogc;
@@ -77,13 +101,15 @@ std::optional<size_t> compute_unencoded_normalized_len(JSContext *cx, JS::Handle
     if (!chars) {
       return std::nullopt;
     }
-    len += extra_bytes_needed(chars, chars_len);
+    // len += extra_bytes_needed(chars, chars_len);
+    len += compute_extra_characters(chars, chars_len);
   } else {
     auto chars = JS::GetTwoByteLinearStringChars(nogc, linear);
     if (!chars) {
       return std::nullopt;
     }
-    len += extra_bytes_needed(chars, chars_len);
+    // len += extra_bytes_needed(chars, chars_len);
+    len += compute_extra_characters(chars, chars_len);
   }
   return len;
 }