Avoid unspecified evaluation order of arguments in as_array

jameseh96 · Jan 28, 2024 · f9a256c · f9a256c
1 parent a36c76d
commit f9a256c
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/pypdu/pypdu_conversion_helpers.cc b/src/pypdu/pypdu_conversion_helpers.cc
@@ -107,14 +107,15 @@ void def_conversions(py::module m, py::class_<SampleSource>& cls) {
                 [](const SampleSource& ss,
                    TimestampUnits units,
                    bool filterNaNValues) {
-                    auto samples = std::make_unique<std::vector<Sample>>();
-                    *samples = to_samples(ss);
+                    auto samples = to_samples(ss);
 
-                    maybeConvertOrFilter(*samples, units, filterNaNValues);
+                    maybeConvertOrFilter(samples, units, filterNaNValues);
 
-                    return py::array_t(samples->size(),
-                                       samples->data(),
-                                       py::cast(std::move(samples)));
+                    auto size = samples.size();
+                    auto data = samples.data();
+
+                    return py::array_t(
+                            size, data, py::cast(std::move(samples)));
                 },
                 "timestamp_units"_a = TimestampUnits::Milliseconds,
                 "filter_nan_values"_a = false);