From c95d9a68fe9470ab2497abb86edd6fa34aaa5a3b Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Tue, 19 Oct 2021 11:21:09 -0700
Subject: [PATCH] pvif: more error checking

---
 pdbApp/pvif.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pdbApp/pvif.cpp b/pdbApp/pvif.cpp
index c9bfd5b..f11f335 100644
--- a/pdbApp/pvif.cpp
+++ b/pdbApp/pvif.cpp
@@ -777,6 +777,9 @@ short PVD2DBR(pvd::ScalarType pvt)
 epics::pvData::FieldConstPtr
 ScalarBuilder::dtype()
 {
+    if(!channel)
+        throw std::runtime_error("+type:\"scalar\" requires +channel:");
+
     short dbr = dbChannelFinalFieldType(channel);
     const long maxelem = dbChannelFinalElements(channel);
     const pvd::ScalarType pvt = DBR2PVD(dbr);
@@ -955,6 +958,9 @@ struct PlainBuilder : public PVIFBuilder
 
     // fetch the structure description
     virtual epics::pvData::FieldConstPtr dtype() OVERRIDE FINAL {
+        if(!channel)
+            throw std::runtime_error("+type:\"plain\" requires +channel:");
+
         const short dbr = dbChannelFinalFieldType(channel);
         const long maxelem = dbChannelFinalElements(channel);
         const pvd::ScalarType pvt = DBR2PVD(dbr);