Merge branch 'main' into test_864878821

Author: rgoldfinger6

MODULE.bazel

@@ -13,13 +13,6 @@ module(
 # https://bazel.build/versions/6.0.0/build/bzlmod#version-resolution
 # Thus the highest version in their module graph is resolved.
 
-# These dependencies must be declared before the other rules dependencies.
-# Workaround rules_apple having a default dependency on rules_swift 2.4.0, which in turn has a
-# hard dependency on the presence of swiftc.exe on Windows.
-bazel_dep(name = "rules_swift", version = "3.0.2", repo_name = "build_bazel_rules_swift")
-
-# TODO: Can rules_apple be removed, and thus allow rules_swift to be removed?
-bazel_dep(name = "rules_apple", version = "4.0.0", repo_name = "build_bazel_rules_apple")
 bazel_dep(name = "apple_support", version = "1.15.1", repo_name = "build_bazel_apple_support")
 
 # Keep apple_support on 1.15.1 for now to avoid this issue:

WORKSPACE

@@ -114,10 +114,6 @@ load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
 
 rules_pkg_dependencies()
 
-load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependencies")
-
-apple_rules_dependencies()
-
 load("@build_bazel_apple_support//lib:repositories.bzl", "apple_support_dependencies")
 
 apple_support_dependencies()

cmake/dependencies.cmake

@@ -10,8 +10,6 @@ if(${CMAKE_VERSION} VERSION_GREATER 3.16 OR ${CMAKE_VERSION} VERSION_EQUAL 3.16)
   include_guard()
 endif()
 
-set(rules_swift-version "3.0.2")
-set(rules_apple-version "4.0.0")
 set(apple_support-version "1.15.1")
 set(abseil-cpp-version "20250512.1")
 set(rules_cc-version "0.0.17")

java/core/src/main/java/com/google/protobuf/CodedInputStream.java

@@ -58,7 +58,12 @@ public static CodedInputStream newInstance(final InputStream input) {
     return newInstance(input, DEFAULT_BUFFER_SIZE);
   }
 
-  /** Create a new CodedInputStream wrapping the given InputStream, with a specified buffer size. */
+  /**
+   * Create a new CodedInputStream wrapping the given InputStream, with a specified buffer size.
+   *
+   * <p>{@code bufferSize} must be greater than 0. If {@code bufferSize} is less than 8, a minimum
+   * buffer size of 8 will be used to ensure efficient reading of 64-bit values.
+   */
   public static CodedInputStream newInstance(final InputStream input, int bufferSize) {
     if (bufferSize <= 0) {
       throw new IllegalArgumentException("bufferSize must be > 0");
@@ -1560,6 +1565,9 @@ private static final class StreamDecoder extends CodedInputStream {
 
     private StreamDecoder(final InputStream input, int bufferSize) {
       checkNotNull(input, "input");
+      if (bufferSize < FIXED64_SIZE) {
+        bufferSize = FIXED64_SIZE;
+      }
       this.input = input;
       this.buffer = new byte[bufferSize];
       this.bufferSize = 0;

java/core/src/test/java/com/google/protobuf/CodedInputStreamTest.java

@@ -9,6 +9,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
+import static com.google.protobuf.WireFormat.FIXED64_SIZE;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertThrows;
 
@@ -149,7 +150,7 @@ private static final class SmallBlockInputStream extends FilterInputStream {
     private int readCalls;
 
     public SmallBlockInputStream(byte[] data, int blockSize) {
-      super(new ByteArrayInputStream(data));
+      super(new ByteArrayInputStreamMatchingZeroLengthReadSemantics(data));
       this.blockSize = blockSize;
     }
 
@@ -217,7 +218,7 @@ private void assertReadVarint(byte[] data, long value) throws Exception {
     // array first.
     byte[] longerData = new byte[data.length + 1];
     System.arraycopy(data, 0, longerData, 0, data.length);
-    InputStream rawInput = new ByteArrayInputStream(longerData);
+    InputStream rawInput = new ByteArrayInputStreamMatchingZeroLengthReadSemantics(longerData);
     assertThat(CodedInputStream.readRawVarint32(rawInput)).isEqualTo((int) value);
     assertThat(rawInput.available()).isEqualTo(1);
   }
@@ -253,7 +254,8 @@ private void assertReadVarintFailure(InvalidProtocolBufferException expected, by
 
     // Make sure we get the same error when reading direct from an InputStream.
     try {
-      CodedInputStream.readRawVarint32(new ByteArrayInputStream(data));
+      CodedInputStream.readRawVarint32(
+          new ByteArrayInputStreamMatchingZeroLengthReadSemantics(data));
       assertWithMessage("Should have thrown an exception.").fail();
     } catch (InvalidProtocolBufferException e) {
       assertThat(e).hasMessageThat().isEqualTo(expected.getMessage());
@@ -800,13 +802,16 @@ public void testMaliciousSGroupTagsWithMapField_fromInputStream() throws Excepti
             InvalidProtocolBufferException.class,
             () ->
                 MapContainer.parseFrom(
-                    new ByteArrayInputStream(NESTING_SGROUP_WITH_INITIAL_BYTES)));
+                    new ByteArrayInputStreamMatchingZeroLengthReadSemantics(
+                        NESTING_SGROUP_WITH_INITIAL_BYTES)));
     Throwable mergeFromThrown =
         assertThrows(
             InvalidProtocolBufferException.class,
             () ->
                 MapContainer.newBuilder()
-                    .mergeFrom(new ByteArrayInputStream(NESTING_SGROUP_WITH_INITIAL_BYTES)));
+                    .mergeFrom(
+                        new ByteArrayInputStreamMatchingZeroLengthReadSemantics(
+                            NESTING_SGROUP_WITH_INITIAL_BYTES)));
 
     assertThat(parseFromThrown)
         .hasMessageThat()
@@ -818,7 +823,8 @@ public void testMaliciousSGroupTagsWithMapField_fromInputStream() throws Excepti
 
   @Test
   public void testMaliciousSGroupTags_inputStream_skipMessage() throws Exception {
-    ByteArrayInputStream inputSteam = new ByteArrayInputStream(NESTING_SGROUP);
+    InputStream inputSteam =
+        new ByteArrayInputStreamMatchingZeroLengthReadSemantics(NESTING_SGROUP);
     CodedInputStream input = CodedInputStream.newInstance(inputSteam);
     CodedOutputStream output = CodedOutputStream.newInstance(new byte[NESTING_SGROUP.length]);
 
@@ -986,7 +992,9 @@ public void testRefillBufferWithCorrectSize() throws Exception {
         inputStreamBufferLength <= rawInput.length + 1;
         inputStreamBufferLength++) {
       CodedInputStream input =
-          CodedInputStream.newInstance(new ByteArrayInputStream(rawInput), inputStreamBufferLength);
+          CodedInputStream.newInstance(
+              new ByteArrayInputStreamMatchingZeroLengthReadSemantics(rawInput),
+              inputStreamBufferLength);
       input.setSizeLimit(rawInput.length - 1);
       input.readString();
       input.readString();
@@ -1001,7 +1009,9 @@ public void testRefillBufferWithCorrectSize() throws Exception {
 
   @Test
   public void testIsAtEnd() throws Exception {
-    CodedInputStream input = CodedInputStream.newInstance(new ByteArrayInputStream(new byte[5]));
+    CodedInputStream input =
+        CodedInputStream.newInstance(
+            new ByteArrayInputStreamMatchingZeroLengthReadSemantics(new byte[5]));
     try {
       for (int i = 0; i < 5; i++) {
         assertThat(input.isAtEnd()).isFalse();
@@ -1026,7 +1036,9 @@ public void testCurrentLimitExceeded() throws Exception {
     output.flush();
 
     byte[] rawInput = rawOutput.toByteArray();
-    CodedInputStream input = CodedInputStream.newInstance(new ByteArrayInputStream(rawInput));
+    CodedInputStream input =
+        CodedInputStream.newInstance(
+            new ByteArrayInputStreamMatchingZeroLengthReadSemantics(rawInput));
     // The length of the whole rawInput
     input.setSizeLimit(11);
     // Some number that is smaller than the rawInput's length
@@ -1260,7 +1272,7 @@ public void testReadLargeByteStringFromInputStream() throws Exception {
 
     CodedInputStream input =
         CodedInputStream.newInstance(
-            new ByteArrayInputStream(data) {
+            new ByteArrayInputStreamMatchingZeroLengthReadSemantics(data) {
               @Override
               public synchronized int available() {
                 return 0;
@@ -1285,7 +1297,7 @@ public void testReadLargeByteArrayFromInputStream() throws Exception {
 
     CodedInputStream input =
         CodedInputStream.newInstance(
-            new ByteArrayInputStream(data) {
+            new ByteArrayInputStreamMatchingZeroLengthReadSemantics(data) {
               @Override
               public synchronized int available() {
                 return 0;
@@ -1569,7 +1581,9 @@ public void testSkipInvalidEndGroup_nested(@TestParameter InputType inputType) t
   @Test
   public void testSkipPastEndOfByteArrayInput() throws Exception {
     try {
-      CodedInputStream.newInstance(new ByteArrayInputStream(new byte[100])).skipRawBytes(101);
+      CodedInputStream.newInstance(
+              new ByteArrayInputStreamMatchingZeroLengthReadSemantics(new byte[100]))
+          .skipRawBytes(101);
       assertWithMessage("Should have thrown an exception").fail();
     } catch (InvalidProtocolBufferException e) {
       // Expected
@@ -1580,11 +1594,11 @@ public void testSkipPastEndOfByteArrayInput() throws Exception {
   public void testMaliciousInputStream() throws Exception {
     ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
     CodedOutputStream codedOutputStream = CodedOutputStream.newInstance(outputStream);
-    codedOutputStream.writeByteArrayNoTag(new byte[] {0x0, 0x1, 0x2, 0x3, 0x4, 0x5});
+    codedOutputStream.writeByteArrayNoTag(new byte[] {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8});
     codedOutputStream.flush();
     final List<byte[]> maliciousCapture = new ArrayList<>();
     InputStream inputStream =
-        new ByteArrayInputStream(outputStream.toByteArray()) {
+        new ByteArrayInputStreamMatchingZeroLengthReadSemantics(outputStream.toByteArray()) {
           @Override
           public synchronized int read(byte[] b, int off, int len) {
             maliciousCapture.add(b);
@@ -1680,4 +1694,66 @@ public void testCodedInputStreamWithEmptyBuffers_isAtEndAfterRead() throws Excep
     cis.readRawBytes(4096);
     assertThat(cis.isAtEnd()).isTrue();
   }
+
+  @Test
+  public void testStreamDecoderReadFixed64_inputTooSmall(@TestParameter boolean bufferTooSmall)
+      throws Exception {
+    byte[] data = bytes(0xde, 0xbc, 0x9a, 0x78, 0x56, 0x34, 0x12);
+    InputStream input = new ByteArrayInputStreamMatchingZeroLengthReadSemantics(data);
+    CodedInputStream cis =
+        CodedInputStream.newInstance(input, FIXED64_SIZE - (bufferTooSmall ? 1 : 0));
+    try {
+      cis.readFixed64();
+      assertWithMessage("Should have thrown an exception").fail();
+    } catch (InvalidProtocolBufferException expected) {
+      assertThat(expected)
+          .hasMessageThat()
+          .isEqualTo(InvalidProtocolBufferException.truncatedMessage().getMessage());
+    }
+  }
+
+  @Test
+  public void testStreamDecoderReadFixed64_bufferBounds(@TestParameter boolean bufferTooSmall)
+      throws Exception {
+    byte[] data = bytes(0xf0, 0xde, 0xbc, 0x9a, 0x78, 0x56, 0x34, 0x12);
+    InputStream input = new ByteArrayInputStreamMatchingZeroLengthReadSemantics(data);
+    CodedInputStream cis =
+        CodedInputStream.newInstance(input, FIXED64_SIZE - (bufferTooSmall ? 1 : 0));
+    assertThat(cis.readFixed64()).isEqualTo(0x123456789abcdef0L);
+  }
+
+  /**
+   * A {@link ByteArrayInputStream} that matches the behavior of {@link
+   * InputStream#read(byte[],int,int)} when the requested length is 0.
+   */
+  private static class ByteArrayInputStreamMatchingZeroLengthReadSemantics
+      extends ByteArrayInputStream {
+    private ByteArrayInputStreamMatchingZeroLengthReadSemantics(byte[] data) {
+      super(data);
+    }
+
+    @Override
+    public synchronized int read(byte[] b, int off, int len) {
+      // Inline Objects.checkFromIndexSize() which is API 30+.
+      if ((b.length | off | len) < 0 || len > b.length - off) {
+        throw new IndexOutOfBoundsException();
+      }
+      // Eagerly return 0 if the requested length is 0 to match InputStream behavior.
+      if (len == 0) {
+        return 0;
+      }
+
+      if (pos >= count) {
+        return -1;
+      }
+
+      int avail = count - pos;
+      if (len > avail) {
+        len = avail;
+      }
+      System.arraycopy(buf, pos, b, off, len);
+      pos += len;
+      return len;
+    }
+  }
 }

java/core/src/test/java/com/google/protobuf/GeneratedMessageTest.java

@@ -1722,6 +1722,9 @@ public int read(byte[] b, int off, int len) throws IOException {
                   throw injectedException;
                 }
                 first = false;
+                if (len > bytes.length) {
+                  len = bytes.length;
+                }
                 System.arraycopy(bytes, 0, b, off, len);
                 return len;
               }

java/lite/src/test/java/com/google/protobuf/LiteTest.java

@@ -1467,6 +1467,9 @@ public int read(byte[] b, int off, int len) throws IOException {
                   throw injectedException;
                 }
                 first = false;
+                if (len > bytes.length) {
+                  len = bytes.length;
+                }
                 System.arraycopy(bytes, 0, b, off, len);
                 return len;
               }

protobuf_deps.bzl

@@ -171,23 +171,6 @@ def protobuf_deps():
             sha256 = "d20c951960ed77cb7b341c2a59488534e494d5ad1d30c4818c736d57772a9fef",
         )
 
-    # Workaround rules_apple having a default dependency on rules_swift 2.4.0, which in turn has a
-    # hard dependency on the presence of swiftc.exe on Windows.
-    if not native.existing_rule("build_bazel_rules_swift"):
-        http_archive(
-            name = "build_bazel_rules_swift",
-            sha256 = "b17bdad10f3996cffc1ae3634e426d5280848cdb25ae5351f39357599938f5c6",
-            url = "https://github.com/bazelbuild/rules_swift/releases/download/3.0.2/rules_swift.3.0.2.tar.gz",
-        )
-
-    # TODO: Can rules_apple be removed, and thus allow rules_swift to be removed?
-    if not native.existing_rule("build_bazel_rules_apple"):
-        http_archive(
-            name = "build_bazel_rules_apple",
-            sha256 = "70b0fb2aec1055c978109199bf58ccb5008aba8e242f3305194045c271ca3cae",
-            url = "https://github.com/bazelbuild/rules_apple/releases/download/4.0.0/rules_apple.4.0.0.tar.gz",
-        )
-
     if not native.existing_rule("build_bazel_apple_support"):
         http_archive(
             name = "build_bazel_apple_support",

ruby/ext/google/protobuf_c/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@build_bazel_rules_apple//apple:apple_binary.bzl", "apple_binary")
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
 load("//upb/cmake:build_defs.bzl", "staleness_test")
@@ -111,31 +111,29 @@ cc_library(
     alwayslink = 1,
 )
 
-apple_binary(
+cc_binary(
     name = "ffi_bundle",
-    binary_type = "loadable_bundle",
     linkopts = [
-        "-undefined,dynamic_lookup",
-        "-multiply_defined,suppress",
+        "-Wl,-undefined,dynamic_lookup",
+        "-Wl,-multiply_defined,suppress",
+        "-Wl,-bundle",
     ],
-    minimum_os_version = "12.0",
-    platform_type = "macos",
     tags = ["manual"],
+    target_compatible_with = ["@platforms//os:osx"],
     deps = [
         ":protobuf_c_ffi",
     ],
 )
 
-apple_binary(
+cc_binary(
     name = "bundle",
-    binary_type = "loadable_bundle",
     linkopts = [
-        "-undefined,dynamic_lookup",
-        "-multiply_defined,suppress",
+        "-Wl,-undefined,dynamic_lookup",
+        "-Wl,-multiply_defined,suppress",
+        "-Wl,-bundle",
     ],
-    minimum_os_version = "12.0",
-    platform_type = "macos",
     tags = ["manual"],
+    target_compatible_with = ["@platforms//os:osx"],
     deps = [
         ":protobuf_c",
     ],