EPICS_base/pva2pva
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

pvif: more error checking

Browse Source
This commit is contained in:
Michael Davidsaver
2021-10-19 11:21:09 -07:00
parent 8be883f98b
commit c95d9a68fe
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pdbApp/pvif.cpp
View File

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