google
diff --git a/‎conformance/BUILD
Copy file name to clipboardExpand all lines: conformance/BUILD
+2Lines changed: 2 additions & 0 deletions b/‎conformance/BUILD
Copy file name to clipboardExpand all lines: conformance/BUILD
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎conformance/value_conversion.cc
Copy file name to clipboardExpand all lines: conformance/value_conversion.cc
+8-2Lines changed: 8 additions & 2 deletions b/‎conformance/value_conversion.cc
Copy file name to clipboardExpand all lines: conformance/value_conversion.cc
+8-2Lines changed: 8 additions & 2 deletions
@@ -29,12 +29,14 @@ cc_library(
         "//extensions/protobuf:value",
         "//internal:proto_time_encoding",
         "//internal:status_macros",
+        "//internal:time",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/base:nullability",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:cord",
+        "@com_google_absl//absl/time",
         "@com_google_cel_spec//proto/cel/expr:checked_cc_proto",
         "@com_google_cel_spec//proto/cel/expr:syntax_cc_proto",
         "@com_google_cel_spec//proto/cel/expr:value_cc_proto",
 
@@ -25,12 +25,14 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
+#include "absl/time/time.h"
 #include "common/any.h"
 #include "common/value.h"
 #include "common/value_kind.h"
 #include "extensions/protobuf/value.h"
 #include "internal/proto_time_encoding.h"
 #include "internal/status_macros.h"
+#include "internal/time.h"
 #include "google/protobuf/arena.h"
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/io/zero_copy_stream_impl_lite.h"
@@ -84,14 +86,18 @@ absl::StatusOr<Value> FromObject(
     if (!any.UnpackTo(&duration)) {
       return absl::InvalidArgumentError("invalid duration");
     }
-    return cel::DurationValue(internal::DecodeDuration(duration));
+    absl::Duration d = internal::DecodeDuration(duration);
+    CEL_RETURN_IF_ERROR(cel::internal::ValidateDuration(d));
+    return cel::DurationValue(d);
   } else if (any.type_url() ==
              "type.googleapis.com/google.protobuf.Timestamp") {
     google::protobuf::Timestamp timestamp;
     if (!any.UnpackTo(&timestamp)) {
       return absl::InvalidArgumentError("invalid timestamp");
     }
-    return cel::TimestampValue(internal::DecodeTime(timestamp));
+    absl::Time time = internal::DecodeTime(timestamp);
+    CEL_RETURN_IF_ERROR(cel::internal::ValidateTimestamp(time));
+    return cel::TimestampValue(time);
   }
 
   return extensions::ProtoMessageToValue(any, descriptor_pool, message_factory,