Skip to content

Commit 3acf23c

Browse files
Abort on out of bounds accesses.
Previously out of bounds accesses would trigger undefined behavior. PiperOrigin-RevId: 851463137
1 parent 7beda33 commit 3acf23c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/google/protobuf/port.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,8 @@ PROTOBUF_EXPORT extern GlobalEmptyString fixed_address_empty_string;
841841
enum class BoundsCheckMode { kNoEnforcement, kReturnDefault, kAbort };
842842

843843
PROTOBUF_EXPORT constexpr BoundsCheckMode GetBoundsCheckMode() {
844-
#if defined(PROTOBUF_INTERNAL_BOUNDS_CHECK_MODE_ABORT)
844+
#if defined(PROTO2_OPENSOURCE) || \
845+
defined(PROTOBUF_INTERNAL_BOUNDS_CHECK_MODE_ABORT)
845846
return BoundsCheckMode::kAbort;
846847
#elif defined(PROTOBUF_INTERNAL_BOUNDS_CHECK_MODE_RETURN_DEFAULT)
847848
return BoundsCheckMode::kReturnDefault;

0 commit comments

Comments
 (0)