fix utils, read unicode string index out of bounds

Author: Etienne Stalmans

forms/rulerforms.go

@@ -32,7 +32,16 @@ func CreateFormAttachmentPointer(folderid, messageid []byte) error {
 
 //CreateFormAttachmentTemplate creates the template attachment holding the actual command to execute
 func CreateFormAttachmentTemplate(folderid, messageid []byte, pstr string) error {
+	return CreateFormAttachmentWithTemplate(folderid, messageid, pstr, "templates/formtemplate.bin")
+}
+
+//CreateFormAttachmentForDeleteTemplate creates the template attachment holding the actual command to execute
+func CreateFormAttachmentForDeleteTemplate(folderid, messageid []byte, pstr string) error {
+	return CreateFormAttachmentWithTemplate(folderid, messageid, pstr, "templates/formdeletetemplate.bin")
+}
 
+//CreateFormAttachmentWithTemplate creates a form with a specific template
+func CreateFormAttachmentWithTemplate(folderid, messageid []byte, pstr, templatepath string) error {
 	utils.Info.Println("Create Form Template Attachment")
 
 	attachmentPropertyTags := make([]mapi.TaggedPropertyValue, 4)
@@ -43,8 +52,7 @@ func CreateFormAttachmentTemplate(folderid, messageid []byte, pstr string) error
 	res, _ := mapi.CreateMessageAttachment(folderid, messageid, attachmentPropertyTags)
 
 	//read the template file for our payload
-	path := "templates/formtemplate.bin"
-	datafull, err := utils.ReadFile(path)
+	datafull, err := utils.ReadFile(templatepath)
 	if err != nil {
 		utils.Error.Println(err)
 		if os.IsNotExist(err) {

templates/formdeletetemplate.bin

@@ -214,9 +214,9 @@ func ReadByte(pos int, buff []byte) (byte, int) {
 func ReadUnicodeString(pos int, buff []byte) ([]byte, int) {
 	//stupid hack as using bufio and ReadString(byte) would terminate too early
 	//would terminate on 0x00 instead of 0x0000
-	index := bytes.Index(buff[pos:], []byte{0x00, 0x00, 0x00})
+	index := bytes.Index(buff[pos:], []byte{0x00, 0x00, 0x00}) + 1
 	str := buff[pos : pos+index]
-	return []byte(str), pos + index + 2
+	return []byte(str), pos + index + 1
 }
 
 //ReadASCIIString returns a string as ascii