commit before updating to master

scikit-hep · Jan 20, 2022 · 4b9a541 · 4b9a541
1 parent 5c08fc1
commit 4b9a541
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/libawkward/builder/ArrayBuilder.cpp b/src/libawkward/builder/ArrayBuilder.cpp
@@ -29,7 +29,9 @@ namespace awkward {
 
   void
   ArrayBuilder::clear() {
-    builder_.get()->clear();
+    if (builder_) {
+      builder_.get()->clear();
+    }
   }
 
   void

diff --git a/src/libawkward/builder/BoolBuilder.cpp b/src/libawkward/builder/BoolBuilder.cpp
@@ -34,7 +34,7 @@ namespace awkward {
 
     container.copy_buffer(form_key.str() + "-data",
                           buffer_.ptr().get(),
-                          buffer_.length() * (int64_t)sizeof(bool));
+                          (int64_t)(buffer_.length() * sizeof(bool)));
 
     return "{\"class\": \"NumpyArray\", \"primitive\": \"bool\", \"form_key\": \""
            + form_key.str() + "\"}";

diff --git a/src/libawkward/builder/GrowableBuffer.cpp b/src/libawkward/builder/GrowableBuffer.cpp
@@ -128,7 +128,7 @@ namespace awkward {
   GrowableBuffer<T>::clear() {
     length_ = 0;
     reserved_ = (size_t) options_.initial();
-    ptr_ = nullptr;
+    ptr_ = UniquePtr(reinterpret_cast<T*>(awkward_malloc(options_.initial()*(int64_t)sizeof(T))));
   }
 
   template <typename T>