epics/pvxs
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fit Put reply argument validation

Browse Source
This commit is contained in:
Michael Davidsaver
2020-02-03 11:33:55 -08:00
parent 03c41c2ce3
commit 24d9eb49f1
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/serverget.cpp
+15 -4
View File
@@ -40,10 +40,21 @@ struct ServerGPR : public ServerOp
return;
} else if(state==Executing) {
if(cmd==CMD_PUT && !value)
throw std::logic_error("PUT reply can't include Value");
else if(cmd==CMD_GET && this->type && (!value || Value::Helper::desc(value)!=this->type.get()))
throw std::logic_error("GET must reply with exact type previously passed to connect()");
/* valid combinations
* GET and !!value
* RPC
* PUT w/ subcmd&0x40 and !!value
* PUT w/o subcmd&0x40 and !value
*/
if(cmd==CMD_GET || (cmd==CMD_PUT && (subcmd&0x40))) {
if(!value || Value::Helper::desc(value)!=this->type.get())
throw std::logic_error("GET must reply with exact type previously passed to connect()");
} else if(cmd==CMD_PUT) {
if(value)
throw std::logic_error("PUT reply can't include Value");
}
}
Status sts{};