Fix conformance issues around type conversion overflows and duration subtractions#1151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Jul 29, 2026
Merged

Fix conformance issues around type conversion overflows and duration subtractions #1151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions common/src/main/java/dev/cel/common/CelOptions.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,6 +120,8 @@ public enum ProtoUnsetFieldOptions {

public abstract boolean enableComprehension();

public abstract boolean enableTimestampOverflowCheck();

public abstract int maxRegexProgramSize();

public abstract Builder toBuilder();
Expand DownExpand Up@@ -166,6 +168,7 @@ public static Builder newBuilder() {
.unwrapWellKnownTypesOnFunctionDispatch(true)
.fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT)
.enableComprehension(true)
.enableTimestampOverflowCheck(true)
.maxRegexProgramSize(-1);
}

Expand DownExpand Up@@ -529,6 +532,15 @@ public abstract static class Builder {
*/
public abstract Builder enableJsonFieldNames(boolean value);

/**
* Enable or disable validating that duration values resulting from timestamp arithmetic do not
* overflow 64-bit nanoseconds. Defaults to enabled.
*
* <p>Disabling this option is an out-of-conformance behavior that suppresses nanosecond
* overflow validation when subtracting timestamps.
*/
public abstract Builder enableTimestampOverflowCheck(boolean value);

public abstract CelOptions build();
}
}
26 changes: 12 additions & 14 deletions common/src/main/java/dev/cel/common/internal/ProtoAdapter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -325,13 +325,6 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
case FLOAT:
return unwrapAndConvert(DOUBLE_CONVERTER);
case DOUBLE:
case SFIXED64:
case SINT64:
case INT64:
return BidiConverter.of(
BidiConverter.IDENTITY.forwardConverter(),
value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
case BYTES:
if (celOptions.evaluateCanonicalTypesToNativeValues()) {
return BidiConverter.<Object, Object>of(
Expand All@@ -342,21 +335,26 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
return BidiConverter.of(
BidiConverter.IDENTITY.forwardConverter(),
value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
case DOUBLE:
case SFIXED64:
case SINT64:
case INT64:
case STRING:
return BidiConverter.of(
BidiConverter.IDENTITY.forwardConverter(),
value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
case BOOL:
return BidiConverter.of(
BidiConverter.IDENTITY.forwardConverter(),
value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
case ENUM:
return BidiConverter.<Object, Long>of(
value -> (long) ((EnumValueDescriptor) value).getNumber(),
number ->
fieldDescriptor
.getEnumType()
.findValueByNumberCreatingIfUnknown(number.intValue()));
number -> {
if (number > Integer.MAX_VALUE || number < Integer.MIN_VALUE) {
throw new IllegalArgumentException("Enum value out of int32 range: " + number);
}
return fieldDescriptor
.getEnumType()
.findValueByNumberCreatingIfUnknown(number.intValue());
});
case MESSAGE:
return BidiConverter.<MessageOrBuilder, Object>of(
this::adaptProtoToValue,
Expand Down
11 changes: 11 additions & 0 deletions common/src/main/java/dev/cel/common/internal/ProtoTimeUtils.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -402,10 +402,21 @@ public static Timestamp subtract(Timestamp ts, Duration dur) {

/** Calculate the difference between two timestamps. */
public static Duration between(Timestamp from, Timestamp to) {
return between(from, to, /* validateOverflow= */ true);
}

/** Calculate the difference between two timestamps. */
public static Duration between(Timestamp from, Timestamp to, boolean validateOverflow) {
Instant javaFrom = ProtoTimeUtils.toJavaInstant(checkValid(from));
Instant javaTo = ProtoTimeUtils.toJavaInstant(checkValid(to));

java.time.Duration between = java.time.Duration.between(javaFrom, javaTo);
if (validateOverflow) {
// Call toNanos() to validate 64-bit nanosecond overflow (throws ArithmeticException).
// Suppress unused variable warning as the duration object itself is returned.
@SuppressWarnings("unused")
long unused = between.toNanos();
}

return ProtoTimeUtils.toProtoDuration(between);
}
Expand Down
17 changes: 2 additions & 15 deletions conformance/src/test/java/dev/cel/conformance/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,16 +104,12 @@ _ALL_TESTS = [
]

_TESTS_TO_SKIP_LEGACY = [

# Broken test cases which should be supported.
# TODO: Support setting / getting enum values out of the defined enum value range.
"enums/legacy_proto2/select_big,select_neg",
"enums/legacy_proto2/assign_standalone_int_big,assign_standalone_int_neg",
# TODO: Generate errors on enum value assignment overflows for proto3.
"enums/legacy_proto3/assign_standalone_int_too_big,assign_standalone_int_too_neg",
# TODO: Ensure overflow occurs on conversions of double values which might not work properly on all platforms.
"conversions/int/double_int_min_range",
# TODO: Duration and timestamp operations should error on overflow.
"timestamps/timestamp_range/sub_time_duration_over,sub_time_duration_under",

# TODO: Ensure adding negative duration values is appropriately supported.
"timestamps/timestamp_arithmetic/add_time_to_duration_nanos_negative",

Expand DownExpand Up@@ -154,15 +150,6 @@ _TESTS_TO_SKIP_PLANNER = [
# TODO: Check behavior for go/cpp
"basic/functions/unbound_is_runtime_error",

# TODO: Ensure overflow occurs on conversions of double values which might not work properly on all platforms.
"conversions/int/double_int_min_range",
"enums/legacy_proto3/assign_standalone_int_too_big",
"enums/legacy_proto3/assign_standalone_int_too_neg",

# TODO: Duration and timestamp operations should error on overflow.
"timestamps/timestamp_range/sub_time_duration_over",
"timestamps/timestamp_range/sub_time_duration_under",

# Skip until fixed.
"parse/receiver_function_names",

Expand Down
2 changes: 1 addition & 1 deletion runtime/src/main/java/dev/cel/runtime/RuntimeHelpers.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -391,7 +391,7 @@ public static Optional<UnsignedLong> doubleToUnsignedChecked(double v) {
public static Optional<Long> doubleToLongChecked(double v) {
// getExponent of NaN or Infinite values will return a Double.MAX_EXPONENT + 1 (or 128)
int exp = Math.getExponent(v);
if (exp >= 63 && v != Math.scalb(-1.0, 63)) {
if (exp >= 63) {
return Optional.empty();
}
return Optional.of((long) v);
Expand Down
2 changes: 1 addition & 1 deletion runtime/src/main/java/dev/cel/runtime/standard/IntFunction.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ public enum IntOverload implements CelStandardOverload {
return RuntimeHelpers.doubleToLongChecked(arg)
.orElseThrow(
() ->
new CelNumericOverflowException("double is out of range for int"));
new CelNumericOverflowException("double is out of range for int"));
}
return arg.longValue();
})),
Expand Down
24 changes: 22 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/standard/SubtractOperator.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,13 +68,33 @@ public enum SubtractOverload implements CelStandardOverload {
"subtract_timestamp_timestamp",
Instant.class,
Instant.class,
(Instant i1, Instant i2) -> java.time.Duration.between(i2, i1));
(Instant i1, Instant i2) -> {
java.time.Duration between = java.time.Duration.between(i2, i1);
if (celOptions.enableTimestampOverflowCheck()) {
try {
// Call toNanos() to validate 64-bit nanosecond overflow (throws
// ArithmeticException).
@SuppressWarnings("unused")
long unused = between.toNanos();
} catch (ArithmeticException e) {
throw new CelNumericOverflowException(e);
}
}
return between;
});
} else {
return CelFunctionBinding.from(
"subtract_timestamp_timestamp",
Timestamp.class,
Timestamp.class,
(Timestamp t1, Timestamp t2) -> ProtoTimeUtils.between(t2, t1));
(Timestamp t1, Timestamp t2) -> {
try {
return ProtoTimeUtils.between(
t2, t1, celOptions.enableTimestampOverflowCheck());
} catch (ArithmeticException e) {
throw new CelNumericOverflowException(e);
}
});
}
}),
SUBTRACT_TIMESTAMP_DURATION(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix conformance issues around type conversion overflows and duration subtractions#1151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Jul 29, 2026
 Merged


Fix conformance issues around type conversion overflows and duration subtractions
#1151
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,6 +120,8 @@ public enum ProtoUnsetFieldOptions {

 public abstract boolean enableComprehension();

 public abstract boolean enableTimestampOverflowCheck();

 public abstract int maxRegexProgramSize();

 public abstract Builder toBuilder();
Expand DownExpand Up@@ -166,6 +168,7 @@ public static Builder newBuilder() {
 .unwrapWellKnownTypesOnFunctionDispatch(true)
 .fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT)
 .enableComprehension(true)
 .enableTimestampOverflowCheck(true)
 .maxRegexProgramSize(-1);
 }

Expand DownExpand Up@@ -529,6 +532,15 @@ public abstract static class Builder {
 */
 public abstract Builder enableJsonFieldNames(boolean value);

 /**
 * Enable or disable validating that duration values resulting from timestamp arithmetic do not
 * overflow 64-bit nanoseconds. Defaults to enabled.
 *
 * <p>Disabling this option is an out-of-conformance behavior that suppresses nanosecond
 * overflow validation when subtracting timestamps.
 */
 public abstract Builder enableTimestampOverflowCheck(boolean value);

 public abstract CelOptions build();
 }
}

26 changes: 12 additions & 14 deletions
common/src/main/java/dev/cel/common/internal/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -325,13 +325,6 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case FLOAT:
 return unwrapAndConvert(DOUBLE_CONVERTER);
 case DOUBLE:
 case SFIXED64:
 case SINT64:
 case INT64:
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case BYTES:
 if (celOptions.evaluateCanonicalTypesToNativeValues()) {
 return BidiConverter.<Object, Object>of(
Expand All@@ -342,21 +335,26 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case DOUBLE:
 case SFIXED64:
 case SINT64:
 case INT64:
 case STRING:
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case BOOL:
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case ENUM:
 return BidiConverter.<Object, Long>of(
 value -> (long) ((EnumValueDescriptor) value).getNumber(),
 number ->
 fieldDescriptor
 .getEnumType()
 .findValueByNumberCreatingIfUnknown(number.intValue()));
 number -> {
 if (number > Integer.MAX_VALUE || number < Integer.MIN_VALUE) {
 throw new IllegalArgumentException("Enum value out of int32 range: " + number);
 }
 return fieldDescriptor
 .getEnumType()
 .findValueByNumberCreatingIfUnknown(number.intValue());
 });
 case MESSAGE:
 return BidiConverter.<MessageOrBuilder, Object>of(
 this::adaptProtoToValue,
Expand Down

11 changes: 11 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/ProtoTimeUtils.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -402,10 +402,21 @@ public static Timestamp subtract(Timestamp ts, Duration dur) {

 /** Calculate the difference between two timestamps. */
 public static Duration between(Timestamp from, Timestamp to) {
 return between(from, to, /* validateOverflow= */ true);
 }

 /** Calculate the difference between two timestamps. */
 public static Duration between(Timestamp from, Timestamp to, boolean validateOverflow) {
 Instant javaFrom = ProtoTimeUtils.toJavaInstant(checkValid(from));
 Instant javaTo = ProtoTimeUtils.toJavaInstant(checkValid(to));

 java.time.Duration between = java.time.Duration.between(javaFrom, javaTo);
 if (validateOverflow) {
 // Call toNanos() to validate 64-bit nanosecond overflow (throws ArithmeticException).
 // Suppress unused variable warning as the duration object itself is returned.
 @SuppressWarnings("unused")
 long unused = between.toNanos();
 }

 return ProtoTimeUtils.toProtoDuration(between);
 }
Expand Down

17 changes: 2 additions & 15 deletions
conformance/src/test/java/dev/cel/conformance/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,16 +104,12 @@ _ALL_TESTS = [
]

_TESTS_TO_SKIP_LEGACY = [

 # Broken test cases which should be supported.
 # TODO: Support setting / getting enum values out of the defined enum value range.
 "enums/legacy_proto2/select_big,select_neg",
 "enums/legacy_proto2/assign_standalone_int_big,assign_standalone_int_neg",
 # TODO: Generate errors on enum value assignment overflows for proto3.
 "enums/legacy_proto3/assign_standalone_int_too_big,assign_standalone_int_too_neg",
 # TODO: Ensure overflow occurs on conversions of double values which might not work properly on all platforms.
 "conversions/int/double_int_min_range",
 # TODO: Duration and timestamp operations should error on overflow.
 "timestamps/timestamp_range/sub_time_duration_over,sub_time_duration_under",

 # TODO: Ensure adding negative duration values is appropriately supported.
 "timestamps/timestamp_arithmetic/add_time_to_duration_nanos_negative",

Expand DownExpand Up@@ -154,15 +150,6 @@ _TESTS_TO_SKIP_PLANNER = [
 # TODO: Check behavior for go/cpp
 "basic/functions/unbound_is_runtime_error",

 # TODO: Ensure overflow occurs on conversions of double values which might not work properly on all platforms.
 "conversions/int/double_int_min_range",
 "enums/legacy_proto3/assign_standalone_int_too_big",
 "enums/legacy_proto3/assign_standalone_int_too_neg",

 # TODO: Duration and timestamp operations should error on overflow.
 "timestamps/timestamp_range/sub_time_duration_over",
 "timestamps/timestamp_range/sub_time_duration_under",

 # Skip until fixed.
 "parse/receiver_function_names",

Expand Down

2 changes: 1 addition & 1 deletion
runtime/src/main/java/dev/cel/runtime/RuntimeHelpers.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -391,7 +391,7 @@ public static Optional<UnsignedLong> doubleToUnsignedChecked(double v) {
 public static Optional<Long> doubleToLongChecked(double v) {
 // getExponent of NaN or Infinite values will return a Double.MAX_EXPONENT + 1 (or 128)
 int exp = Math.getExponent(v);
 if (exp >= 63 && v != Math.scalb(-1.0, 63)) {
 if (exp >= 63) {
 return Optional.empty();
 }
 return Optional.of((long) v);
Expand Down

2 changes: 1 addition & 1 deletion
runtime/src/main/java/dev/cel/runtime/standard/IntFunction.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ public enum IntOverload implements CelStandardOverload {
 return RuntimeHelpers.doubleToLongChecked(arg)
 .orElseThrow(
 () ->
 new CelNumericOverflowException("double is out of range for int"));
new CelNumericOverflowException("double is out of range for int"));
 }
 return arg.longValue();
 })),
Expand Down

24 changes: 22 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/standard/SubtractOperator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,13 +68,33 @@ public enum SubtractOverload implements CelStandardOverload {
 "subtract_timestamp_timestamp",
 Instant.class,
 Instant.class,
 (Instant i1, Instant i2) -> java.time.Duration.between(i2, i1));
 (Instant i1, Instant i2) -> {
 java.time.Duration between = java.time.Duration.between(i2, i1);
 if (celOptions.enableTimestampOverflowCheck()) {
 try {
 // Call toNanos() to validate 64-bit nanosecond overflow (throws
 // ArithmeticException).
 @SuppressWarnings("unused")
 long unused = between.toNanos();
 } catch (ArithmeticException e) {
 throw new CelNumericOverflowException(e);
 }
 }
 return between;
 });
 } else {
 return CelFunctionBinding.from(
 "subtract_timestamp_timestamp",
 Timestamp.class,
 Timestamp.class,
 (Timestamp t1, Timestamp t2) -> ProtoTimeUtils.between(t2, t1));
 (Timestamp t1, Timestamp t2) -> {
 try {
 return ProtoTimeUtils.between(
 t2, t1, celOptions.enableTimestampOverflowCheck());
 } catch (ArithmeticException e) {
 throw new CelNumericOverflowException(e);
 }
 });
 }
 }),
 SUBTRACT_TIMESTAMP_DURATION(
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix conformance issues around type conversion overflows and duration subtractions#1151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Jul 29, 2026
 Merged


Fix conformance issues around type conversion overflows and duration subtractions
#1151
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,6 +120,8 @@ public enum ProtoUnsetFieldOptions {

 public abstract boolean enableComprehension();

 public abstract boolean enableTimestampOverflowCheck();

 public abstract int maxRegexProgramSize();

 public abstract Builder toBuilder();
Expand DownExpand Up@@ -166,6 +168,7 @@ public static Builder newBuilder() {
 .unwrapWellKnownTypesOnFunctionDispatch(true)
 .fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT)
 .enableComprehension(true)
 .enableTimestampOverflowCheck(true)
 .maxRegexProgramSize(-1);
 }

Expand DownExpand Up@@ -529,6 +532,15 @@ public abstract static class Builder {
 */
 public abstract Builder enableJsonFieldNames(boolean value);

 /**
 * Enable or disable validating that duration values resulting from timestamp arithmetic do not
 * overflow 64-bit nanoseconds. Defaults to enabled.
 *
 * <p>Disabling this option is an out-of-conformance behavior that suppresses nanosecond
 * overflow validation when subtracting timestamps.
 */
 public abstract Builder enableTimestampOverflowCheck(boolean value);

 public abstract CelOptions build();
 }
}

26 changes: 12 additions & 14 deletions
common/src/main/java/dev/cel/common/internal/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -325,13 +325,6 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case FLOAT:
 return unwrapAndConvert(DOUBLE_CONVERTER);
 case DOUBLE:
 case SFIXED64:
 case SINT64:
 case INT64:
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case BYTES:
 if (celOptions.evaluateCanonicalTypesToNativeValues()) {
 return BidiConverter.<Object, Object>of(
Expand All@@ -342,21 +335,26 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case DOUBLE:
 case SFIXED64:
 case SINT64:
 case INT64:
 case STRING:
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case BOOL:
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case ENUM:
 return BidiConverter.<Object, Long>of(
 value -> (long) ((EnumValueDescriptor) value).getNumber(),
 number ->
 fieldDescriptor
 .getEnumType()
 .findValueByNumberCreatingIfUnknown(number.intValue()));
 number -> {
 if (number > Integer.MAX_VALUE || number < Integer.MIN_VALUE) {
 throw new IllegalArgumentException("Enum value out of int32 range: " + number);
 }
 return fieldDescriptor
 .getEnumType()
 .findValueByNumberCreatingIfUnknown(number.intValue());
 });
 case MESSAGE:
 return BidiConverter.<MessageOrBuilder, Object>of(
 this::adaptProtoToValue,
Expand Down

11 changes: 11 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/ProtoTimeUtils.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -402,10 +402,21 @@ public static Timestamp subtract(Timestamp ts, Duration dur) {

 /** Calculate the difference between two timestamps. */
 public static Duration between(Timestamp from, Timestamp to) {
 return between(from, to, /* validateOverflow= */ true);
 }

 /** Calculate the difference between two timestamps. */
 public static Duration between(Timestamp from, Timestamp to, boolean validateOverflow) {
 Instant javaFrom = ProtoTimeUtils.toJavaInstant(checkValid(from));
 Instant javaTo = ProtoTimeUtils.toJavaInstant(checkValid(to));

 java.time.Duration between = java.time.Duration.between(javaFrom, javaTo);
 if (validateOverflow) {
 // Call toNanos() to validate 64-bit nanosecond overflow (throws ArithmeticException).
 // Suppress unused variable warning as the duration object itself is returned.
 @SuppressWarnings("unused")
 long unused = between.toNanos();
 }

 return ProtoTimeUtils.toProtoDuration(between);
 }
Expand Down

17 changes: 2 additions & 15 deletions
conformance/src/test/java/dev/cel/conformance/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,16 +104,12 @@ _ALL_TESTS = [
]

_TESTS_TO_SKIP_LEGACY = [

 # Broken test cases which should be supported.
 # TODO: Support setting / getting enum values out of the defined enum value range.
 "enums/legacy_proto2/select_big,select_neg",
 "enums/legacy_proto2/assign_standalone_int_big,assign_standalone_int_neg",
 # TODO: Generate errors on enum value assignment overflows for proto3.
 "enums/legacy_proto3/assign_standalone_int_too_big,assign_standalone_int_too_neg",
 # TODO: Ensure overflow occurs on conversions of double values which might not work properly on all platforms.
 "conversions/int/double_int_min_range",
 # TODO: Duration and timestamp operations should error on overflow.
 "timestamps/timestamp_range/sub_time_duration_over,sub_time_duration_under",

 # TODO: Ensure adding negative duration values is appropriately supported.
 "timestamps/timestamp_arithmetic/add_time_to_duration_nanos_negative",

Expand DownExpand Up@@ -154,15 +150,6 @@ _TESTS_TO_SKIP_PLANNER = [
 # TODO: Check behavior for go/cpp
 "basic/functions/unbound_is_runtime_error",

 # TODO: Ensure overflow occurs on conversions of double values which might not work properly on all platforms.
 "conversions/int/double_int_min_range",
 "enums/legacy_proto3/assign_standalone_int_too_big",
 "enums/legacy_proto3/assign_standalone_int_too_neg",

 # TODO: Duration and timestamp operations should error on overflow.
 "timestamps/timestamp_range/sub_time_duration_over",
 "timestamps/timestamp_range/sub_time_duration_under",

 # Skip until fixed.
 "parse/receiver_function_names",

Expand Down

2 changes: 1 addition & 1 deletion
runtime/src/main/java/dev/cel/runtime/RuntimeHelpers.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -391,7 +391,7 @@ public static Optional<UnsignedLong> doubleToUnsignedChecked(double v) {
 public static Optional<Long> doubleToLongChecked(double v) {
 // getExponent of NaN or Infinite values will return a Double.MAX_EXPONENT + 1 (or 128)
 int exp = Math.getExponent(v);
 if (exp >= 63 && v != Math.scalb(-1.0, 63)) {
 if (exp >= 63) {
 return Optional.empty();
 }
 return Optional.of((long) v);
Expand Down

2 changes: 1 addition & 1 deletion
runtime/src/main/java/dev/cel/runtime/standard/IntFunction.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ public enum IntOverload implements CelStandardOverload {
 return RuntimeHelpers.doubleToLongChecked(arg)
 .orElseThrow(
 () ->
 new CelNumericOverflowException("double is out of range for int"));
new CelNumericOverflowException("double is out of range for int"));
 }
 return arg.longValue();
 })),
Expand Down

24 changes: 22 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/standard/SubtractOperator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,13 +68,33 @@ public enum SubtractOverload implements CelStandardOverload {
 "subtract_timestamp_timestamp",
 Instant.class,
 Instant.class,
 (Instant i1, Instant i2) -> java.time.Duration.between(i2, i1));
 (Instant i1, Instant i2) -> {
 java.time.Duration between = java.time.Duration.between(i2, i1);
 if (celOptions.enableTimestampOverflowCheck()) {
 try {
 // Call toNanos() to validate 64-bit nanosecond overflow (throws
 // ArithmeticException).
 @SuppressWarnings("unused")
 long unused = between.toNanos();
 } catch (ArithmeticException e) {
 throw new CelNumericOverflowException(e);
 }
 }
 return between;
 });
 } else {
 return CelFunctionBinding.from(
 "subtract_timestamp_timestamp",
 Timestamp.class,
 Timestamp.class,
 (Timestamp t1, Timestamp t2) -> ProtoTimeUtils.between(t2, t1));
 (Timestamp t1, Timestamp t2) -> {
 try {
 return ProtoTimeUtils.between(
 t2, t1, celOptions.enableTimestampOverflowCheck());
 } catch (ArithmeticException e) {
 throw new CelNumericOverflowException(e);
 }
 });
 }
 }),
 SUBTRACT_TIMESTAMP_DURATION(
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix conformance issues around type conversion overflows and duration subtractions#1151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Jul 29, 2026
 Merged


Fix conformance issues around type conversion overflows and duration subtractions
#1151
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,6 +120,8 @@ public enum ProtoUnsetFieldOptions {

 public abstract boolean enableComprehension();

 public abstract boolean enableTimestampOverflowCheck();

 public abstract int maxRegexProgramSize();

 public abstract Builder toBuilder();
Expand DownExpand Up@@ -166,6 +168,7 @@ public static Builder newBuilder() {
 .unwrapWellKnownTypesOnFunctionDispatch(true)
 .fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT)
 .enableComprehension(true)
 .enableTimestampOverflowCheck(true)
 .maxRegexProgramSize(-1);
 }

Expand DownExpand Up@@ -529,6 +532,15 @@ public abstract static class Builder {
 */
 public abstract Builder enableJsonFieldNames(boolean value);

 /**
 * Enable or disable validating that duration values resulting from timestamp arithmetic do not
 * overflow 64-bit nanoseconds. Defaults to enabled.
 *
 * <p>Disabling this option is an out-of-conformance behavior that suppresses nanosecond
 * overflow validation when subtracting timestamps.
 */
 public abstract Builder enableTimestampOverflowCheck(boolean value);

 public abstract CelOptions build();
 }
}

26 changes: 12 additions & 14 deletions
common/src/main/java/dev/cel/common/internal/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -325,13 +325,6 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case FLOAT:
 return unwrapAndConvert(DOUBLE_CONVERTER);
 case DOUBLE:
 case SFIXED64:
 case SINT64:
 case INT64:
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case BYTES:
 if (celOptions.evaluateCanonicalTypesToNativeValues()) {
 return BidiConverter.<Object, Object>of(
Expand All@@ -342,21 +335,26 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case DOUBLE:
 case SFIXED64:
 case SINT64:
 case INT64:
 case STRING:
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case BOOL:
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case ENUM:
 return BidiConverter.<Object, Long>of(
 value -> (long) ((EnumValueDescriptor) value).getNumber(),
 number ->
 fieldDescriptor
 .getEnumType()
 .findValueByNumberCreatingIfUnknown(number.intValue()));
 number -> {
 if (number > Integer.MAX_VALUE || number < Integer.MIN_VALUE) {
 throw new IllegalArgumentException("Enum value out of int32 range: " + number);
 }
 return fieldDescriptor
 .getEnumType()
 .findValueByNumberCreatingIfUnknown(number.intValue());
 });
 case MESSAGE:
 return BidiConverter.<MessageOrBuilder, Object>of(
 this::adaptProtoToValue,
Expand Down

11 changes: 11 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/ProtoTimeUtils.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -402,10 +402,21 @@ public static Timestamp subtract(Timestamp ts, Duration dur) {

 /** Calculate the difference between two timestamps. */
 public static Duration between(Timestamp from, Timestamp to) {
 return between(from, to, /* validateOverflow= */ true);
 }

 /** Calculate the difference between two timestamps. */
 public static Duration between(Timestamp from, Timestamp to, boolean validateOverflow) {
 Instant javaFrom = ProtoTimeUtils.toJavaInstant(checkValid(from));
 Instant javaTo = ProtoTimeUtils.toJavaInstant(checkValid(to));

 java.time.Duration between = java.time.Duration.between(javaFrom, javaTo);
 if (validateOverflow) {
 // Call toNanos() to validate 64-bit nanosecond overflow (throws ArithmeticException).
 // Suppress unused variable warning as the duration object itself is returned.
 @SuppressWarnings("unused")
 long unused = between.toNanos();
 }

 return ProtoTimeUtils.toProtoDuration(between);
 }
Expand Down

17 changes: 2 additions & 15 deletions
conformance/src/test/java/dev/cel/conformance/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,16 +104,12 @@ _ALL_TESTS = [
]

_TESTS_TO_SKIP_LEGACY = [

 # Broken test cases which should be supported.
 # TODO: Support setting / getting enum values out of the defined enum value range.
 "enums/legacy_proto2/select_big,select_neg",
 "enums/legacy_proto2/assign_standalone_int_big,assign_standalone_int_neg",
 # TODO: Generate errors on enum value assignment overflows for proto3.
 "enums/legacy_proto3/assign_standalone_int_too_big,assign_standalone_int_too_neg",
 # TODO: Ensure overflow occurs on conversions of double values which might not work properly on all platforms.
 "conversions/int/double_int_min_range",
 # TODO: Duration and timestamp operations should error on overflow.
 "timestamps/timestamp_range/sub_time_duration_over,sub_time_duration_under",

 # TODO: Ensure adding negative duration values is appropriately supported.
 "timestamps/timestamp_arithmetic/add_time_to_duration_nanos_negative",

Expand DownExpand Up@@ -154,15 +150,6 @@ _TESTS_TO_SKIP_PLANNER = [
 # TODO: Check behavior for go/cpp
 "basic/functions/unbound_is_runtime_error",

 # TODO: Ensure overflow occurs on conversions of double values which might not work properly on all platforms.
 "conversions/int/double_int_min_range",
 "enums/legacy_proto3/assign_standalone_int_too_big",
 "enums/legacy_proto3/assign_standalone_int_too_neg",

 # TODO: Duration and timestamp operations should error on overflow.
 "timestamps/timestamp_range/sub_time_duration_over",
 "timestamps/timestamp_range/sub_time_duration_under",

 # Skip until fixed.
 "parse/receiver_function_names",

Expand Down

2 changes: 1 addition & 1 deletion
runtime/src/main/java/dev/cel/runtime/RuntimeHelpers.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -391,7 +391,7 @@ public static Optional<UnsignedLong> doubleToUnsignedChecked(double v) {
 public static Optional<Long> doubleToLongChecked(double v) {
 // getExponent of NaN or Infinite values will return a Double.MAX_EXPONENT + 1 (or 128)
 int exp = Math.getExponent(v);
 if (exp >= 63 && v != Math.scalb(-1.0, 63)) {
 if (exp >= 63) {
 return Optional.empty();
 }
 return Optional.of((long) v);
Expand Down

2 changes: 1 addition & 1 deletion
runtime/src/main/java/dev/cel/runtime/standard/IntFunction.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ public enum IntOverload implements CelStandardOverload {
 return RuntimeHelpers.doubleToLongChecked(arg)
 .orElseThrow(
 () ->
 new CelNumericOverflowException("double is out of range for int"));
new CelNumericOverflowException("double is out of range for int"));
 }
 return arg.longValue();
 })),
Expand Down

24 changes: 22 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/standard/SubtractOperator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,13 +68,33 @@ public enum SubtractOverload implements CelStandardOverload {
 "subtract_timestamp_timestamp",
 Instant.class,
 Instant.class,
 (Instant i1, Instant i2) -> java.time.Duration.between(i2, i1));
 (Instant i1, Instant i2) -> {
 java.time.Duration between = java.time.Duration.between(i2, i1);
 if (celOptions.enableTimestampOverflowCheck()) {
 try {
 // Call toNanos() to validate 64-bit nanosecond overflow (throws
 // ArithmeticException).
 @SuppressWarnings("unused")
 long unused = between.toNanos();
 } catch (ArithmeticException e) {
 throw new CelNumericOverflowException(e);
 }
 }
 return between;
 });
 } else {
 return CelFunctionBinding.from(
 "subtract_timestamp_timestamp",
 Timestamp.class,
 Timestamp.class,
 (Timestamp t1, Timestamp t2) -> ProtoTimeUtils.between(t2, t1));
 (Timestamp t1, Timestamp t2) -> {
 try {
 return ProtoTimeUtils.between(
 t2, t1, celOptions.enableTimestampOverflowCheck());
 } catch (ArithmeticException e) {
 throw new CelNumericOverflowException(e);
 }
 });
 }
 }),
 SUBTRACT_TIMESTAMP_DURATION(
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fix conformance issues around type conversion overflows and duration subtractions#1151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Jul 29, 2026
 Merged


Fix conformance issues around type conversion overflows and duration subtractions
#1151
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,6 +120,8 @@ public enum ProtoUnsetFieldOptions {

 public abstract boolean enableComprehension();

 public abstract boolean enableTimestampOverflowCheck();

 public abstract int maxRegexProgramSize();

 public abstract Builder toBuilder();
Expand DownExpand Up@@ -166,6 +168,7 @@ public static Builder newBuilder() {
 .unwrapWellKnownTypesOnFunctionDispatch(true)
 .fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT)
 .enableComprehension(true)
 .enableTimestampOverflowCheck(true)
 .maxRegexProgramSize(-1);
 }

Expand DownExpand Up@@ -529,6 +532,15 @@ public abstract static class Builder {
 */
 public abstract Builder enableJsonFieldNames(boolean value);

 /**
 * Enable or disable validating that duration values resulting from timestamp arithmetic do not
 * overflow 64-bit nanoseconds. Defaults to enabled.
 *
 * <p>Disabling this option is an out-of-conformance behavior that suppresses nanosecond
 * overflow validation when subtracting timestamps.
 */
 public abstract Builder enableTimestampOverflowCheck(boolean value);

 public abstract CelOptions build();
 }
}

26 changes: 12 additions & 14 deletions
common/src/main/java/dev/cel/common/internal/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -325,13 +325,6 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case FLOAT:
 return unwrapAndConvert(DOUBLE_CONVERTER);
 case DOUBLE:
 case SFIXED64:
 case SINT64:
 case INT64:
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case BYTES:
 if (celOptions.evaluateCanonicalTypesToNativeValues()) {
 return BidiConverter.<Object, Object>of(
Expand All@@ -342,21 +335,26 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case DOUBLE:
 case SFIXED64:
 case SINT64:
 case INT64:
 case STRING:
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case BOOL:
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case ENUM:
 return BidiConverter.<Object, Long>of(
 value -> (long) ((EnumValueDescriptor) value).getNumber(),
 number ->
 fieldDescriptor
 .getEnumType()
 .findValueByNumberCreatingIfUnknown(number.intValue()));
 number -> {
 if (number > Integer.MAX_VALUE || number < Integer.MIN_VALUE) {
 throw new IllegalArgumentException("Enum value out of int32 range: " + number);
 }
 return fieldDescriptor
 .getEnumType()
 .findValueByNumberCreatingIfUnknown(number.intValue());
 });
 case MESSAGE:
 return BidiConverter.<MessageOrBuilder, Object>of(
 this::adaptProtoToValue,
Expand Down

11 changes: 11 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/ProtoTimeUtils.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -402,10 +402,21 @@ public static Timestamp subtract(Timestamp ts, Duration dur) {

 /** Calculate the difference between two timestamps. */
 public static Duration between(Timestamp from, Timestamp to) {
 return between(from, to, /* validateOverflow= */ true);
 }

 /** Calculate the difference between two timestamps. */
 public static Duration between(Timestamp from, Timestamp to, boolean validateOverflow) {
 Instant javaFrom = ProtoTimeUtils.toJavaInstant(checkValid(from));
 Instant javaTo = ProtoTimeUtils.toJavaInstant(checkValid(to));

 java.time.Duration between = java.time.Duration.between(javaFrom, javaTo);
 if (validateOverflow) {
 // Call toNanos() to validate 64-bit nanosecond overflow (throws ArithmeticException).
 // Suppress unused variable warning as the duration object itself is returned.
 @SuppressWarnings("unused")
 long unused = between.toNanos();
 }

 return ProtoTimeUtils.toProtoDuration(between);
 }
Expand Down

17 changes: 2 additions & 15 deletions
conformance/src/test/java/dev/cel/conformance/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,16 +104,12 @@ _ALL_TESTS = [
]

_TESTS_TO_SKIP_LEGACY = [

 # Broken test cases which should be supported.
 # TODO: Support setting / getting enum values out of the defined enum value range.
 "enums/legacy_proto2/select_big,select_neg",
 "enums/legacy_proto2/assign_standalone_int_big,assign_standalone_int_neg",
 # TODO: Generate errors on enum value assignment overflows for proto3.
 "enums/legacy_proto3/assign_standalone_int_too_big,assign_standalone_int_too_neg",
 # TODO: Ensure overflow occurs on conversions of double values which might not work properly on all platforms.
 "conversions/int/double_int_min_range",
 # TODO: Duration and timestamp operations should error on overflow.
 "timestamps/timestamp_range/sub_time_duration_over,sub_time_duration_under",

 # TODO: Ensure adding negative duration values is appropriately supported.
 "timestamps/timestamp_arithmetic/add_time_to_duration_nanos_negative",

Expand DownExpand Up@@ -154,15 +150,6 @@ _TESTS_TO_SKIP_PLANNER = [
 # TODO: Check behavior for go/cpp
 "basic/functions/unbound_is_runtime_error",

 # TODO: Ensure overflow occurs on conversions of double values which might not work properly on all platforms.
 "conversions/int/double_int_min_range",
 "enums/legacy_proto3/assign_standalone_int_too_big",
 "enums/legacy_proto3/assign_standalone_int_too_neg",

 # TODO: Duration and timestamp operations should error on overflow.
 "timestamps/timestamp_range/sub_time_duration_over",
 "timestamps/timestamp_range/sub_time_duration_under",

 # Skip until fixed.
 "parse/receiver_function_names",

Expand Down

2 changes: 1 addition & 1 deletion
runtime/src/main/java/dev/cel/runtime/RuntimeHelpers.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -391,7 +391,7 @@ public static Optional<UnsignedLong> doubleToUnsignedChecked(double v) {
 public static Optional<Long> doubleToLongChecked(double v) {
 // getExponent of NaN or Infinite values will return a Double.MAX_EXPONENT + 1 (or 128)
 int exp = Math.getExponent(v);
 if (exp >= 63 && v != Math.scalb(-1.0, 63)) {
 if (exp >= 63) {
 return Optional.empty();
 }
 return Optional.of((long) v);
Expand Down

2 changes: 1 addition & 1 deletion
runtime/src/main/java/dev/cel/runtime/standard/IntFunction.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ public enum IntOverload implements CelStandardOverload {
 return RuntimeHelpers.doubleToLongChecked(arg)
 .orElseThrow(
 () ->
 new CelNumericOverflowException("double is out of range for int"));
new CelNumericOverflowException("double is out of range for int"));
 }
 return arg.longValue();
 })),
Expand Down

24 changes: 22 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/standard/SubtractOperator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,13 +68,33 @@ public enum SubtractOverload implements CelStandardOverload {
 "subtract_timestamp_timestamp",
 Instant.class,
 Instant.class,
 (Instant i1, Instant i2) -> java.time.Duration.between(i2, i1));
 (Instant i1, Instant i2) -> {
 java.time.Duration between = java.time.Duration.between(i2, i1);
 if (celOptions.enableTimestampOverflowCheck()) {
 try {
 // Call toNanos() to validate 64-bit nanosecond overflow (throws
 // ArithmeticException).
 @SuppressWarnings("unused")
 long unused = between.toNanos();
 } catch (ArithmeticException e) {
 throw new CelNumericOverflowException(e);
 }
 }
 return between;
 });
 } else {
 return CelFunctionBinding.from(
 "subtract_timestamp_timestamp",
 Timestamp.class,
 Timestamp.class,
 (Timestamp t1, Timestamp t2) -> ProtoTimeUtils.between(t2, t1));
 (Timestamp t1, Timestamp t2) -> {
 try {
 return ProtoTimeUtils.between(
 t2, t1, celOptions.enableTimestampOverflowCheck());
 } catch (ArithmeticException e) {
 throw new CelNumericOverflowException(e);
 }
 });
 }
 }),
 SUBTRACT_TIMESTAMP_DURATION(
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix conformance issues around type conversion overflows and duration subtractions#1151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Jul 29, 2026
 Merged


Fix conformance issues around type conversion overflows and duration subtractions
#1151
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,6 +120,8 @@ public enum ProtoUnsetFieldOptions {

 public abstract boolean enableComprehension();

 public abstract boolean enableTimestampOverflowCheck();

 public abstract int maxRegexProgramSize();

 public abstract Builder toBuilder();
Expand DownExpand Up@@ -166,6 +168,7 @@ public static Builder newBuilder() {
 .unwrapWellKnownTypesOnFunctionDispatch(true)
 .fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT)
 .enableComprehension(true)
 .enableTimestampOverflowCheck(true)
 .maxRegexProgramSize(-1);
 }

Expand DownExpand Up@@ -529,6 +532,15 @@ public abstract static class Builder {
 */
 public abstract Builder enableJsonFieldNames(boolean value);

 /**
 * Enable or disable validating that duration values resulting from timestamp arithmetic do not
 * overflow 64-bit nanoseconds. Defaults to enabled.
 *
 * <p>Disabling this option is an out-of-conformance behavior that suppresses nanosecond
 * overflow validation when subtracting timestamps.
 */
 public abstract Builder enableTimestampOverflowCheck(boolean value);

 public abstract CelOptions build();
 }
}

26 changes: 12 additions & 14 deletions
common/src/main/java/dev/cel/common/internal/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -325,13 +325,6 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case FLOAT:
 return unwrapAndConvert(DOUBLE_CONVERTER);
 case DOUBLE:
 case SFIXED64:
 case SINT64:
 case INT64:
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case BYTES:
 if (celOptions.evaluateCanonicalTypesToNativeValues()) {
 return BidiConverter.<Object, Object>of(
Expand All@@ -342,21 +335,26 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case DOUBLE:
 case SFIXED64:
 case SINT64:
 case INT64:
 case STRING:
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case BOOL:
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case ENUM:
 return BidiConverter.<Object, Long>of(
 value -> (long) ((EnumValueDescriptor) value).getNumber(),
 number ->
 fieldDescriptor
 .getEnumType()
 .findValueByNumberCreatingIfUnknown(number.intValue()));
 number -> {
 if (number > Integer.MAX_VALUE || number < Integer.MIN_VALUE) {
 throw new IllegalArgumentException("Enum value out of int32 range: " + number);
 }
 return fieldDescriptor
 .getEnumType()
 .findValueByNumberCreatingIfUnknown(number.intValue());
 });
 case MESSAGE:
 return BidiConverter.<MessageOrBuilder, Object>of(
 this::adaptProtoToValue,
Expand Down

11 changes: 11 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/ProtoTimeUtils.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -402,10 +402,21 @@ public static Timestamp subtract(Timestamp ts, Duration dur) {

 /** Calculate the difference between two timestamps. */
 public static Duration between(Timestamp from, Timestamp to) {
 return between(from, to, /* validateOverflow= */ true);
 }

 /** Calculate the difference between two timestamps. */
 public static Duration between(Timestamp from, Timestamp to, boolean validateOverflow) {
 Instant javaFrom = ProtoTimeUtils.toJavaInstant(checkValid(from));
 Instant javaTo = ProtoTimeUtils.toJavaInstant(checkValid(to));

 java.time.Duration between = java.time.Duration.between(javaFrom, javaTo);
 if (validateOverflow) {
 // Call toNanos() to validate 64-bit nanosecond overflow (throws ArithmeticException).
 // Suppress unused variable warning as the duration object itself is returned.
 @SuppressWarnings("unused")
 long unused = between.toNanos();
 }

 return ProtoTimeUtils.toProtoDuration(between);
 }
Expand Down

17 changes: 2 additions & 15 deletions
conformance/src/test/java/dev/cel/conformance/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,16 +104,12 @@ _ALL_TESTS = [
]

_TESTS_TO_SKIP_LEGACY = [

 # Broken test cases which should be supported.
 # TODO: Support setting / getting enum values out of the defined enum value range.
 "enums/legacy_proto2/select_big,select_neg",
 "enums/legacy_proto2/assign_standalone_int_big,assign_standalone_int_neg",
 # TODO: Generate errors on enum value assignment overflows for proto3.
 "enums/legacy_proto3/assign_standalone_int_too_big,assign_standalone_int_too_neg",
 # TODO: Ensure overflow occurs on conversions of double values which might not work properly on all platforms.
 "conversions/int/double_int_min_range",
 # TODO: Duration and timestamp operations should error on overflow.
 "timestamps/timestamp_range/sub_time_duration_over,sub_time_duration_under",

 # TODO: Ensure adding negative duration values is appropriately supported.
 "timestamps/timestamp_arithmetic/add_time_to_duration_nanos_negative",

Expand DownExpand Up@@ -154,15 +150,6 @@ _TESTS_TO_SKIP_PLANNER = [
 # TODO: Check behavior for go/cpp
 "basic/functions/unbound_is_runtime_error",

 # TODO: Ensure overflow occurs on conversions of double values which might not work properly on all platforms.
 "conversions/int/double_int_min_range",
 "enums/legacy_proto3/assign_standalone_int_too_big",
 "enums/legacy_proto3/assign_standalone_int_too_neg",

 # TODO: Duration and timestamp operations should error on overflow.
 "timestamps/timestamp_range/sub_time_duration_over",
 "timestamps/timestamp_range/sub_time_duration_under",

 # Skip until fixed.
 "parse/receiver_function_names",

Expand Down

2 changes: 1 addition & 1 deletion
runtime/src/main/java/dev/cel/runtime/RuntimeHelpers.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -391,7 +391,7 @@ public static Optional<UnsignedLong> doubleToUnsignedChecked(double v) {
 public static Optional<Long> doubleToLongChecked(double v) {
 // getExponent of NaN or Infinite values will return a Double.MAX_EXPONENT + 1 (or 128)
 int exp = Math.getExponent(v);
 if (exp >= 63 && v != Math.scalb(-1.0, 63)) {
 if (exp >= 63) {
 return Optional.empty();
 }
 return Optional.of((long) v);
Expand Down

2 changes: 1 addition & 1 deletion
runtime/src/main/java/dev/cel/runtime/standard/IntFunction.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ public enum IntOverload implements CelStandardOverload {
 return RuntimeHelpers.doubleToLongChecked(arg)
 .orElseThrow(
 () ->
 new CelNumericOverflowException("double is out of range for int"));
new CelNumericOverflowException("double is out of range for int"));
 }
 return arg.longValue();
 })),
Expand Down

24 changes: 22 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/standard/SubtractOperator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,13 +68,33 @@ public enum SubtractOverload implements CelStandardOverload {
 "subtract_timestamp_timestamp",
 Instant.class,
 Instant.class,
 (Instant i1, Instant i2) -> java.time.Duration.between(i2, i1));
 (Instant i1, Instant i2) -> {
 java.time.Duration between = java.time.Duration.between(i2, i1);
 if (celOptions.enableTimestampOverflowCheck()) {
 try {
 // Call toNanos() to validate 64-bit nanosecond overflow (throws
 // ArithmeticException).
 @SuppressWarnings("unused")
 long unused = between.toNanos();
 } catch (ArithmeticException e) {
 throw new CelNumericOverflowException(e);
 }
 }
 return between;
 });
 } else {
 return CelFunctionBinding.from(
 "subtract_timestamp_timestamp",
 Timestamp.class,
 Timestamp.class,
 (Timestamp t1, Timestamp t2) -> ProtoTimeUtils.between(t2, t1));
 (Timestamp t1, Timestamp t2) -> {
 try {
 return ProtoTimeUtils.between(
 t2, t1, celOptions.enableTimestampOverflowCheck());
 } catch (ArithmeticException e) {
 throw new CelNumericOverflowException(e);
 }
 });
 }
 }),
 SUBTRACT_TIMESTAMP_DURATION(
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix conformance issues around type conversion overflows and duration subtractions#1151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Jul 29, 2026
 Merged


Fix conformance issues around type conversion overflows and duration subtractions
#1151
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,6 +120,8 @@ public enum ProtoUnsetFieldOptions {

 public abstract boolean enableComprehension();

 public abstract boolean enableTimestampOverflowCheck();

 public abstract int maxRegexProgramSize();

 public abstract Builder toBuilder();
Expand DownExpand Up@@ -166,6 +168,7 @@ public static Builder newBuilder() {
 .unwrapWellKnownTypesOnFunctionDispatch(true)
 .fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT)
 .enableComprehension(true)
 .enableTimestampOverflowCheck(true)
 .maxRegexProgramSize(-1);
 }

Expand DownExpand Up@@ -529,6 +532,15 @@ public abstract static class Builder {
 */
 public abstract Builder enableJsonFieldNames(boolean value);

 /**
 * Enable or disable validating that duration values resulting from timestamp arithmetic do not
 * overflow 64-bit nanoseconds. Defaults to enabled.
 *
 * <p>Disabling this option is an out-of-conformance behavior that suppresses nanosecond
 * overflow validation when subtracting timestamps.
 */
 public abstract Builder enableTimestampOverflowCheck(boolean value);

 public abstract CelOptions build();
 }
}

26 changes: 12 additions & 14 deletions
common/src/main/java/dev/cel/common/internal/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -325,13 +325,6 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case FLOAT:
 return unwrapAndConvert(DOUBLE_CONVERTER);
 case DOUBLE:
 case SFIXED64:
 case SINT64:
 case INT64:
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case BYTES:
 if (celOptions.evaluateCanonicalTypesToNativeValues()) {
 return BidiConverter.<Object, Object>of(
Expand All@@ -342,21 +335,26 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case DOUBLE:
 case SFIXED64:
 case SINT64:
 case INT64:
 case STRING:
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case BOOL:
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case ENUM:
 return BidiConverter.<Object, Long>of(
 value -> (long) ((EnumValueDescriptor) value).getNumber(),
 number ->
 fieldDescriptor
 .getEnumType()
 .findValueByNumberCreatingIfUnknown(number.intValue()));
 number -> {
 if (number > Integer.MAX_VALUE || number < Integer.MIN_VALUE) {
 throw new IllegalArgumentException("Enum value out of int32 range: " + number);
 }
 return fieldDescriptor
 .getEnumType()
 .findValueByNumberCreatingIfUnknown(number.intValue());
 });
 case MESSAGE:
 return BidiConverter.<MessageOrBuilder, Object>of(
 this::adaptProtoToValue,
Expand Down

11 changes: 11 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/ProtoTimeUtils.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -402,10 +402,21 @@ public static Timestamp subtract(Timestamp ts, Duration dur) {

 /** Calculate the difference between two timestamps. */
 public static Duration between(Timestamp from, Timestamp to) {
 return between(from, to, /* validateOverflow= */ true);
 }

 /** Calculate the difference between two timestamps. */
 public static Duration between(Timestamp from, Timestamp to, boolean validateOverflow) {
 Instant javaFrom = ProtoTimeUtils.toJavaInstant(checkValid(from));
 Instant javaTo = ProtoTimeUtils.toJavaInstant(checkValid(to));

 java.time.Duration between = java.time.Duration.between(javaFrom, javaTo);
 if (validateOverflow) {
 // Call toNanos() to validate 64-bit nanosecond overflow (throws ArithmeticException).
 // Suppress unused variable warning as the duration object itself is returned.
 @SuppressWarnings("unused")
 long unused = between.toNanos();
 }

 return ProtoTimeUtils.toProtoDuration(between);
 }
Expand Down

17 changes: 2 additions & 15 deletions
conformance/src/test/java/dev/cel/conformance/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,16 +104,12 @@ _ALL_TESTS = [
]

_TESTS_TO_SKIP_LEGACY = [

 # Broken test cases which should be supported.
 # TODO: Support setting / getting enum values out of the defined enum value range.
 "enums/legacy_proto2/select_big,select_neg",
 "enums/legacy_proto2/assign_standalone_int_big,assign_standalone_int_neg",
 # TODO: Generate errors on enum value assignment overflows for proto3.
 "enums/legacy_proto3/assign_standalone_int_too_big,assign_standalone_int_too_neg",
 # TODO: Ensure overflow occurs on conversions of double values which might not work properly on all platforms.
 "conversions/int/double_int_min_range",
 # TODO: Duration and timestamp operations should error on overflow.
 "timestamps/timestamp_range/sub_time_duration_over,sub_time_duration_under",

 # TODO: Ensure adding negative duration values is appropriately supported.
 "timestamps/timestamp_arithmetic/add_time_to_duration_nanos_negative",

Expand DownExpand Up@@ -154,15 +150,6 @@ _TESTS_TO_SKIP_PLANNER = [
 # TODO: Check behavior for go/cpp
 "basic/functions/unbound_is_runtime_error",

 # TODO: Ensure overflow occurs on conversions of double values which might not work properly on all platforms.
 "conversions/int/double_int_min_range",
 "enums/legacy_proto3/assign_standalone_int_too_big",
 "enums/legacy_proto3/assign_standalone_int_too_neg",

 # TODO: Duration and timestamp operations should error on overflow.
 "timestamps/timestamp_range/sub_time_duration_over",
 "timestamps/timestamp_range/sub_time_duration_under",

 # Skip until fixed.
 "parse/receiver_function_names",

Expand Down

2 changes: 1 addition & 1 deletion
runtime/src/main/java/dev/cel/runtime/RuntimeHelpers.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -391,7 +391,7 @@ public static Optional<UnsignedLong> doubleToUnsignedChecked(double v) {
 public static Optional<Long> doubleToLongChecked(double v) {
 // getExponent of NaN or Infinite values will return a Double.MAX_EXPONENT + 1 (or 128)
 int exp = Math.getExponent(v);
 if (exp >= 63 && v != Math.scalb(-1.0, 63)) {
 if (exp >= 63) {
 return Optional.empty();
 }
 return Optional.of((long) v);
Expand Down

2 changes: 1 addition & 1 deletion
runtime/src/main/java/dev/cel/runtime/standard/IntFunction.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ public enum IntOverload implements CelStandardOverload {
 return RuntimeHelpers.doubleToLongChecked(arg)
 .orElseThrow(
 () ->
 new CelNumericOverflowException("double is out of range for int"));
new CelNumericOverflowException("double is out of range for int"));
 }
 return arg.longValue();
 })),
Expand Down

24 changes: 22 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/standard/SubtractOperator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,13 +68,33 @@ public enum SubtractOverload implements CelStandardOverload {
 "subtract_timestamp_timestamp",
 Instant.class,
 Instant.class,
 (Instant i1, Instant i2) -> java.time.Duration.between(i2, i1));
 (Instant i1, Instant i2) -> {
 java.time.Duration between = java.time.Duration.between(i2, i1);
 if (celOptions.enableTimestampOverflowCheck()) {
 try {
 // Call toNanos() to validate 64-bit nanosecond overflow (throws
 // ArithmeticException).
 @SuppressWarnings("unused")
 long unused = between.toNanos();
 } catch (ArithmeticException e) {
 throw new CelNumericOverflowException(e);
 }
 }
 return between;
 });
 } else {
 return CelFunctionBinding.from(
 "subtract_timestamp_timestamp",
 Timestamp.class,
 Timestamp.class,
 (Timestamp t1, Timestamp t2) -> ProtoTimeUtils.between(t2, t1));
 (Timestamp t1, Timestamp t2) -> {
 try {
 return ProtoTimeUtils.between(
 t2, t1, celOptions.enableTimestampOverflowCheck());
 } catch (ArithmeticException e) {
 throw new CelNumericOverflowException(e);
 }
 });
 }
 }),
 SUBTRACT_TIMESTAMP_DURATION(
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix conformance issues around type conversion overflows and duration subtractions#1151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Jul 29, 2026
 Merged


Fix conformance issues around type conversion overflows and duration subtractions
#1151
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,6 +120,8 @@ public enum ProtoUnsetFieldOptions {

 public abstract boolean enableComprehension();

 public abstract boolean enableTimestampOverflowCheck();

 public abstract int maxRegexProgramSize();

 public abstract Builder toBuilder();
Expand DownExpand Up@@ -166,6 +168,7 @@ public static Builder newBuilder() {
 .unwrapWellKnownTypesOnFunctionDispatch(true)
 .fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT)
 .enableComprehension(true)
 .enableTimestampOverflowCheck(true)
 .maxRegexProgramSize(-1);
 }

Expand DownExpand Up@@ -529,6 +532,15 @@ public abstract static class Builder {
 */
 public abstract Builder enableJsonFieldNames(boolean value);

 /**
 * Enable or disable validating that duration values resulting from timestamp arithmetic do not
 * overflow 64-bit nanoseconds. Defaults to enabled.
 *
 * <p>Disabling this option is an out-of-conformance behavior that suppresses nanosecond
 * overflow validation when subtracting timestamps.
 */
 public abstract Builder enableTimestampOverflowCheck(boolean value);

 public abstract CelOptions build();
 }
}

26 changes: 12 additions & 14 deletions
common/src/main/java/dev/cel/common/internal/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -325,13 +325,6 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case FLOAT:
 return unwrapAndConvert(DOUBLE_CONVERTER);
 case DOUBLE:
 case SFIXED64:
 case SINT64:
 case INT64:
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case BYTES:
 if (celOptions.evaluateCanonicalTypesToNativeValues()) {
 return BidiConverter.<Object, Object>of(
Expand All@@ -342,21 +335,26 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case DOUBLE:
 case SFIXED64:
 case SINT64:
 case INT64:
 case STRING:
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case BOOL:
 return BidiConverter.of(
 BidiConverter.IDENTITY.forwardConverter(),
 value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
 case ENUM:
 return BidiConverter.<Object, Long>of(
 value -> (long) ((EnumValueDescriptor) value).getNumber(),
 number ->
 fieldDescriptor
 .getEnumType()
 .findValueByNumberCreatingIfUnknown(number.intValue()));
 number -> {
 if (number > Integer.MAX_VALUE || number < Integer.MIN_VALUE) {
 throw new IllegalArgumentException("Enum value out of int32 range: " + number);
 }
 return fieldDescriptor
 .getEnumType()
 .findValueByNumberCreatingIfUnknown(number.intValue());
 });
 case MESSAGE:
 return BidiConverter.<MessageOrBuilder, Object>of(
 this::adaptProtoToValue,
Expand Down

11 changes: 11 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/ProtoTimeUtils.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -402,10 +402,21 @@ public static Timestamp subtract(Timestamp ts, Duration dur) {

 /** Calculate the difference between two timestamps. */
 public static Duration between(Timestamp from, Timestamp to) {
 return between(from, to, /* validateOverflow= */ true);
 }

 /** Calculate the difference between two timestamps. */
 public static Duration between(Timestamp from, Timestamp to, boolean validateOverflow) {
 Instant javaFrom = ProtoTimeUtils.toJavaInstant(checkValid(from));
 Instant javaTo = ProtoTimeUtils.toJavaInstant(checkValid(to));

 java.time.Duration between = java.time.Duration.between(javaFrom, javaTo);
 if (validateOverflow) {
 // Call toNanos() to validate 64-bit nanosecond overflow (throws ArithmeticException).
 // Suppress unused variable warning as the duration object itself is returned.
 @SuppressWarnings("unused")
 long unused = between.toNanos();
 }

 return ProtoTimeUtils.toProtoDuration(between);
 }
Expand Down

17 changes: 2 additions & 15 deletions
conformance/src/test/java/dev/cel/conformance/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,16 +104,12 @@ _ALL_TESTS = [
]

_TESTS_TO_SKIP_LEGACY = [

 # Broken test cases which should be supported.
 # TODO: Support setting / getting enum values out of the defined enum value range.
 "enums/legacy_proto2/select_big,select_neg",
 "enums/legacy_proto2/assign_standalone_int_big,assign_standalone_int_neg",
 # TODO: Generate errors on enum value assignment overflows for proto3.
 "enums/legacy_proto3/assign_standalone_int_too_big,assign_standalone_int_too_neg",
 # TODO: Ensure overflow occurs on conversions of double values which might not work properly on all platforms.
 "conversions/int/double_int_min_range",
 # TODO: Duration and timestamp operations should error on overflow.
 "timestamps/timestamp_range/sub_time_duration_over,sub_time_duration_under",

 # TODO: Ensure adding negative duration values is appropriately supported.
 "timestamps/timestamp_arithmetic/add_time_to_duration_nanos_negative",

Expand DownExpand Up@@ -154,15 +150,6 @@ _TESTS_TO_SKIP_PLANNER = [
 # TODO: Check behavior for go/cpp
 "basic/functions/unbound_is_runtime_error",

 # TODO: Ensure overflow occurs on conversions of double values which might not work properly on all platforms.
 "conversions/int/double_int_min_range",
 "enums/legacy_proto3/assign_standalone_int_too_big",
 "enums/legacy_proto3/assign_standalone_int_too_neg",

 # TODO: Duration and timestamp operations should error on overflow.
 "timestamps/timestamp_range/sub_time_duration_over",
 "timestamps/timestamp_range/sub_time_duration_under",

 # Skip until fixed.
 "parse/receiver_function_names",

Expand Down

2 changes: 1 addition & 1 deletion
runtime/src/main/java/dev/cel/runtime/RuntimeHelpers.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -391,7 +391,7 @@ public static Optional<UnsignedLong> doubleToUnsignedChecked(double v) {
 public static Optional<Long> doubleToLongChecked(double v) {
 // getExponent of NaN or Infinite values will return a Double.MAX_EXPONENT + 1 (or 128)
 int exp = Math.getExponent(v);
 if (exp >= 63 && v != Math.scalb(-1.0, 63)) {
 if (exp >= 63) {
 return Optional.empty();
 }
 return Optional.of((long) v);
Expand Down

2 changes: 1 addition & 1 deletion
runtime/src/main/java/dev/cel/runtime/standard/IntFunction.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ public enum IntOverload implements CelStandardOverload {
 return RuntimeHelpers.doubleToLongChecked(arg)
 .orElseThrow(
 () ->
 new CelNumericOverflowException("double is out of range for int"));
new CelNumericOverflowException("double is out of range for int"));
 }
 return arg.longValue();
 })),
Expand Down

24 changes: 22 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/standard/SubtractOperator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,13 +68,33 @@ public enum SubtractOverload implements CelStandardOverload {
 "subtract_timestamp_timestamp",
 Instant.class,
 Instant.class,
 (Instant i1, Instant i2) -> java.time.Duration.between(i2, i1));
 (Instant i1, Instant i2) -> {
 java.time.Duration between = java.time.Duration.between(i2, i1);
 if (celOptions.enableTimestampOverflowCheck()) {
 try {
 // Call toNanos() to validate 64-bit nanosecond overflow (throws
 // ArithmeticException).
 @SuppressWarnings("unused")
 long unused = between.toNanos();
 } catch (ArithmeticException e) {
 throw new CelNumericOverflowException(e);
 }
 }
 return between;
 });
 } else {
 return CelFunctionBinding.from(
 "subtract_timestamp_timestamp",
 Timestamp.class,
 Timestamp.class,
 (Timestamp t1, Timestamp t2) -> ProtoTimeUtils.between(t2, t1));
 (Timestamp t1, Timestamp t2) -> {
 try {
 return ProtoTimeUtils.between(
 t2, t1, celOptions.enableTimestampOverflowCheck());
 } catch (ArithmeticException e) {
 throw new CelNumericOverflowException(e);
 }
 });
 }
 }),
 SUBTRACT_TIMESTAMP_DURATION(
Expand Down
Loading