X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsegment.cpp;h=7b8e611f271999d6b3a57948166322faccaa71bf;hp=8745e8740dc582f8a53d33ae7ed8e81d36a87398;hb=2c39cfe261f46ba4dd97a403a51e6c11893b6b0a;hpb=558ad6ceb934ab7406d286c1a4ae08da4aba1448

diff --git a/pv/data/segment.cpp b/pv/data/segment.cpp
index 8745e874..7b8e611f 100644
--- a/pv/data/segment.cpp
+++ b/pv/data/segment.cpp
@@ -24,6 +24,7 @@
 #include <cstdlib>
 #include <cstring>
 
+using std::bad_alloc;
 using std::lock_guard;
 using std::min;
 using std::recursive_mutex;
@@ -33,7 +34,8 @@ namespace data {
 
 const uint64_t Segment::MaxChunkSize = 10 * 1024 * 1024;  /* 10MiB */
 
-Segment::Segment(uint64_t samplerate, unsigned int unit_size) :
+Segment::Segment(uint32_t segment_id, uint64_t samplerate, unsigned int unit_size) :
+	segment_id_(segment_id),
 	sample_count_(0),
 	start_time_(0),
 	samplerate_(samplerate),
@@ -90,6 +92,11 @@ unsigned int Segment::unit_size() const
 	return unit_size_;
 }
 
+uint32_t Segment::segment_id() const
+{
+	return segment_id_;
+}
+
 void Segment::set_complete()
 {
 	is_complete_ = true;
@@ -110,15 +117,17 @@ void Segment::free_unused_memory()
 		return;
 	}
 
-	// No more data will come in, so re-create the last chunk accordingly
-	uint8_t* resized_chunk = new uint8_t[used_samples_ * unit_size_];
-	memcpy(resized_chunk, current_chunk_, used_samples_ * unit_size_);
+	if (current_chunk_) {
+		// No more data will come in, so re-create the last chunk accordingly
+		uint8_t* resized_chunk = new uint8_t[used_samples_ * unit_size_];
+		memcpy(resized_chunk, current_chunk_, used_samples_ * unit_size_);
 
-	delete[] current_chunk_;
-	current_chunk_ = resized_chunk;
+		delete[] current_chunk_;
+		current_chunk_ = resized_chunk;
 
-	data_chunks_.pop_back();
-	data_chunks_.push_back(resized_chunk);
+		data_chunks_.pop_back();
+		data_chunks_.push_back(resized_chunk);
+	}
 }
 
 void Segment::append_single_sample(void *data)
@@ -171,8 +180,26 @@ void Segment::append_samples(void* data, uint64_t samples)
 		data_offset += (copy_count * unit_size_);
 
 		if (unused_samples_ == 0) {
-			// If we're out of memory, this will throw std::bad_alloc
-			current_chunk_ = new uint8_t[chunk_size_];
+			try {
+				// If we're out of memory, allocating a chunk will throw
+				// std::bad_alloc. To give the application some usable memory
+				// to work with in case chunk allocation fails, we allocate
+				// extra memory and throw it away if it all succeeded.
+				// This way, memory allocation will fail early enough to let
+				// PV remain alive. Otherwise, PV will crash in a random
+				// memory-allocating part of the application.
+				current_chunk_ = new uint8_t[chunk_size_];
+
+				const int dummy_size = 2 * chunk_size_;
+				auto dummy_chunk = new uint8_t[dummy_size];
+				memset(dummy_chunk, 0xFF, dummy_size);
+				delete[] dummy_chunk;
+			} catch (bad_alloc) {
+				delete[] current_chunk_;  // The new may have succeeded
+				current_chunk_ = nullptr;
+				throw;
+			}
+
 			data_chunks_.push_back(current_chunk_);
 			used_samples_ = 0;
 			unused_samples_ = chunk_size_ / unit_size_;