prevent use WaitFor with temporary futures (#1058)

ydb-platform · Apr 26, 2024 · b4ff2c5 · b4ff2c5
1 parent 5417fad
commit b4ff2c5
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/cloud/storage/core/libs/coroutine/executor.h b/cloud/storage/core/libs/coroutine/executor.h
@@ -43,7 +43,7 @@ class TExecutor final
     template <typename T>
     const T& WaitFor(NThreading::TFuture<T> future)
     {
-        struct TRequestCancelled : T
+        struct TRequestCancelled: T
         {
             TRequestCancelled()
                 : T(TErrorResponse(E_REJECTED, "request cancelled"))
@@ -56,6 +56,15 @@ class TExecutor final
         return future.GetValue();
     }
 
+    template <typename T>
+    T WaitFor(NThreading::TFuture<T>&& future)
+    {
+        if (!future.HasValue() && !WaitForI(future)) {
+            return TErrorResponse(E_REJECTED, "request cancelled");
+        }
+        return future.ExtractValue();
+    }
+
     void WaitFor(NThreading::TFuture<void> future)
     {
         if (!future.HasValue()) {