From 5f18a419e2cec9f46d67147cae957d304d7a0195 Mon Sep 17 00:00:00 2001
From: Behnam Sabaghi <behnamsabaghi@gmail.com>
Date: Thu, 20 Feb 2020 16:49:03 +0330
Subject: blocks: file_meta_sink header size error handling logic error
This fixes a logical bug introduced in
88a9e1f9332d54c1743d062adfaf48aa6d3040ff, where error conditions were
AND'ed together instead of OR'ed.
---
gr-blocks/lib/file_meta_sink_impl.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'gr-blocks/lib/file_meta_sink_impl.cc')
diff --git a/gr-blocks/lib/file_meta_sink_impl.cc b/gr-blocks/lib/file_meta_sink_impl.cc
index ee918fc11b..783e18de81 100644
--- a/gr-blocks/lib/file_meta_sink_impl.cc
+++ b/gr-blocks/lib/file_meta_sink_impl.cc
@@ -230,7 +230,7 @@ void file_meta_sink_impl::write_header(FILE* fp, pmt::pmt_t header, pmt::pmt_t e
std::string header_str = pmt::serialize_str(header);
std::string extra_str = pmt::serialize_str(extra);
- if ((header_str.size() != METADATA_HEADER_SIZE) && (extra_str.size() != d_extra_size))
+ if ((header_str.size() != METADATA_HEADER_SIZE) || (extra_str.size() != d_extra_size))
throw std::runtime_error("file_meta_sink: header or extra_dict is wrong size.");
size_t nwritten = 0;
--
cgit v1.2.3