fix: decode error for short_message

Author: hujiaming.0927

cmpp/cmpp20/pdu_submit.go

@@ -153,7 +153,7 @@ func (p *PduSubmit) IDecode(data []byte) error {
 		p.DestTerminalID[i] = b.ReadCStringN(21)
 	}
 	p.MsgLength = b.ReadUint8()
-	p.MsgContent = b.ReadCStringN(int(p.MsgLength))
+	p.MsgContent = string(b.ReadNBytes(int(p.MsgLength)))
 	p.Reserve = b.ReadCStringN(8)
 
 	return b.Error()

smgp/smgp30/pdu_deliver.go

@@ -70,7 +70,7 @@ func (d *Deliver) IDecode(data []byte) error {
 	d.SrcTermID = b.ReadCStringN(21)
 	d.DestTermID = b.ReadCStringN(21)
 	d.MsgLength = b.ReadUint8()
-	d.MsgContent = b.ReadCStringNWithoutTrim(int(d.MsgLength))
+	d.MsgContent = string(b.ReadNBytes(int(d.MsgLength)))
 	d.Reserve = b.ReadCStringN(8)
 	d.Options = smgp.ReadOptions(b)
 

smgp/smgp30/pdu_submit.go

@@ -103,7 +103,7 @@ func (s *Submit) IDecode(data []byte) error {
 		s.DestTermID = append(s.DestTermID, tmp)
 	}
 	s.MsgLength = b.ReadUint8()
-	s.MsgContent = b.ReadCStringN(int(s.MsgLength))
+	s.MsgContent = string(b.ReadNBytes(int(s.MsgLength)))
 	s.Reserve = b.ReadCStringN(8)
 
 	var parseErr error

smpp/smpp34/pdu_deliver_sm.go

@@ -68,9 +68,7 @@ func (d *DeliverSm) IDecode(data []byte) error {
 	d.DataCoding = buf.ReadUint8()
 	d.SmDefaultMsgId = buf.ReadUint8()
 	d.SmLength = buf.ReadUint8()
-	temp := make([]byte, d.SmLength)
-	buf.ReadBytes(temp)
-	d.ShortMessage = temp
+	d.ShortMessage = buf.ReadNBytes(int(d.SmLength))
 	d.TLVs = smpp.ReadTLVs1(buf)
 
 	return buf.Error()

smpp/smpp34/pdu_submit_sm.go

@@ -70,9 +70,7 @@ func (s *SubmitSm) IDecode(data []byte) error {
 	s.DataCoding = r.ReadUint8()
 	s.SmDefaultMsgID = r.ReadUint8()
 	s.SmLength = r.ReadUint8()
-	temp := make([]byte, s.SmLength)
-	r.ReadBytes(temp)
-	s.ShortMessage = temp
+	s.ShortMessage = r.ReadNBytes(int(s.SmLength))
 	s.TLVs = smpp.ReadTLVs1(r)
 
 	return r.Error()