Error checking for some structure fields

Author: ibmmqmet

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 Newest updates are at the top of this file.
 
+## July 30 2019 - v4.0.10
+* ibmmq - Add error checking to some structure fields (#111)
+
 ## July 22 2019 - v4.0.9
 * mqmetric - Support RESET QSTATS on z/OS queue manager
 * mqmetric - Add a Logger class to enable debug output

ibmmq/mqi.go

@@ -336,6 +336,11 @@ func (x *MQQueueManager) Sub(gosd *MQSD, qObject *MQObject) (MQObject, error) {
 		qMgr: x,
 	}
 
+	err := checkSD(gosd, "MQSUB")
+	if err != nil {
+		return subObject, err
+	}
+
 	copySDtoC(&mqsd, gosd)
 
 	C.MQSUB(x.hConn,
@@ -504,6 +509,11 @@ func (object MQObject) Put(gomd *MQMD,
 	var mqpmo C.MQPMO
 	var ptr C.PMQVOID
 
+	err := checkMD(gomd, "MQPUT")
+	if err != nil {
+		return err
+	}
+
 	bufflen := len(buffer)
 
 	copyMDtoC(&mqmd, gomd)
@@ -550,6 +560,11 @@ func (x *MQQueueManager) Put1(good *MQOD, gomd *MQMD,
 	var mqod C.MQOD
 	var ptr C.PMQVOID
 
+	err := checkMD(gomd, "MQPUT1")
+	if err != nil {
+		return err
+	}
+
 	copyODtoC(&mqod, good)
 	copyMDtoC(&mqmd, gomd)
 	copyPMOtoC(&mqpmo, gopmo)
@@ -600,6 +615,15 @@ func (object MQObject) Get(gomd *MQMD,
 	var datalen C.MQLONG
 	var ptr C.PMQVOID
 
+	err := checkMD(gomd, "MQGET")
+	if err != nil {
+		return 0, err
+	}
+	err = checkGMO(gogmo, "MQGET")
+	if err != nil {
+		return 0, err
+	}
+
 	bufflen := len(buffer)
 
 	copyMDtoC(&mqmd, gomd)

ibmmq/mqiMQGMO.go

@@ -75,6 +75,23 @@ func NewMQGMO() *MQGMO {
 	return gmo
 }
 
+func checkGMO(gogmo *MQGMO, verb string) error {
+	mqrc := C.MQRC_NONE
+
+	if len(gogmo.MsgToken) != C.MQ_MSG_TOKEN_LENGTH {
+		mqrc = C.MQRC_GMO_ERROR
+	}
+
+	if mqrc != C.MQRC_NONE {
+		mqreturn := MQReturn{MQCC: C.MQCC_FAILED,
+			MQRC: int32(mqrc),
+			verb: verb,
+		}
+		return &mqreturn
+	}
+	return nil
+}
+
 func copyGMOtoC(mqgmo *C.MQGMO, gogmo *MQGMO) {
 	var i int
 

ibmmq/mqiMQMD.go

@@ -103,6 +103,32 @@ func NewMQMD() *MQMD {
 	return md
 }
 
+func checkMD(gomd *MQMD, verb string) error {
+	mqrc := C.MQRC_NONE
+
+	if len(gomd.MsgId) != C.MQ_MSG_ID_LENGTH {
+		mqrc = C.MQRC_MSG_ID_ERROR
+	}
+	if len(gomd.CorrelId) != C.MQ_CORREL_ID_LENGTH {
+		mqrc = C.MQRC_CORREL_ID_ERROR
+	}
+	if len(gomd.GroupId) != C.MQ_GROUP_ID_LENGTH {
+		mqrc = C.MQRC_GROUP_ID_ERROR
+	}
+	if len(gomd.AccountingToken) != C.MQ_ACCOUNTING_TOKEN_LENGTH {
+		mqrc = C.MQRC_MD_ERROR // No specific error defined
+	}
+
+	if mqrc != C.MQRC_NONE {
+		mqreturn := MQReturn{MQCC: C.MQCC_FAILED,
+			MQRC: int32(mqrc),
+			verb: verb,
+		}
+		return &mqreturn
+	}
+	return nil
+}
+
 func copyMDtoC(mqmd *C.MQMD, gomd *MQMD) {
 	var i int
 	setMQIString((*C.char)(&mqmd.StrucId[0]), "MD  ", 4)

ibmmq/mqiMQOD.go

@@ -98,6 +98,23 @@ func NewMQOD() *MQOD {
 	return od
 }
 
+func checkOD(good *MQOD, verb string) error {
+	mqrc := C.MQRC_NONE
+
+	if len(good.AlternateSecurityId) != C.MQ_SECURITY_ID_LENGTH {
+		mqrc = C.MQRC_OD_ERROR
+	}
+
+	if mqrc != C.MQRC_NONE {
+		mqreturn := MQReturn{MQCC: C.MQCC_FAILED,
+			MQRC: int32(mqrc),
+			verb: verb,
+		}
+		return &mqreturn
+	}
+	return nil
+}
+
 /*
  * It is expected that copyXXtoC and copyXXfromC will be called as
  * matching pairs. That means that we can handle the MQCHARV type

ibmmq/mqiMQSD.go

@@ -90,6 +90,25 @@ func NewMQSD() *MQSD {
 	return sd
 }
 
+func checkSD(gosd *MQSD, verb string) error {
+	mqrc := C.MQRC_NONE
+
+	if len(gosd.AlternateSecurityId) != C.MQ_SECURITY_ID_LENGTH {
+		mqrc = C.MQRC_SD_ERROR
+	}
+	if len(gosd.PubAccountingToken) != C.MQ_ACCOUNTING_TOKEN_LENGTH {
+		mqrc = C.MQRC_SD_ERROR
+	}
+	if mqrc != C.MQRC_NONE {
+		mqreturn := MQReturn{MQCC: C.MQCC_FAILED,
+			MQRC: int32(mqrc),
+			verb: verb,
+		}
+		return &mqreturn
+	}
+	return nil
+}
+
 /*
 It is expected that copyXXtoC and copyXXfromC will be called as
 matching pairs. That means that we can handle the MQCHARV type

ibmmq/mqicb.go

@@ -145,6 +145,15 @@ func (object *MQObject) CB(goOperation int32, gocbd *MQCBD, gomd *MQMD, gogmo *M
 	var mqmd C.MQMD
 	var mqgmo C.MQGMO
 
+	err := checkMD(gomd, "MQCB")
+	if err != nil {
+		return err
+	}
+	err = checkGMO(gogmo, "MQCB")
+	if err != nil {
+		return err
+	}
+
 	mqOperation = C.MQLONG(goOperation)
 	copyCBDtoC(&mqcbd, gocbd)
 	copyMDtoC(&mqmd, gomd)