Merge pull request #651 from bcgov/test-marshal-NK-4339

additional fix for logic for starting from last regex match
bcgov · Dec 7, 2023 · 32518c3 · 32518c3
2 parents 5798047 + 3b2c1f6
commit 32518c3
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/MCS.FOI.S3FileConversion/MCS.FOI.MSGToPDF/MSGFileProcessor.cs b/MCS.FOI.S3FileConversion/MCS.FOI.MSGToPDF/MSGFileProcessor.cs
@@ -175,8 +175,12 @@ public MSGFileProcessor(Stream sourceStream)
                                         var _inlineAttachment = (Storage.Attachment)inlineAttachment;
                                         Regex regex = new Regex("<img(.|\\n)*cid:" + _inlineAttachment.ContentId + "(.|\\n)*?>");
                                         Match match = regex.Match(bodyreplaced, startAt);
-                                        bodyreplaced = regex.Replace(bodyreplaced, "<img style=\"max-width: 700px\" src=\"data:" + _inlineAttachment.MimeType + ";base64," + Convert.ToBase64String(_inlineAttachment.Data) + "\"/>", 1, startAt);
-                                        startAt = match.Index + match.Length;
+                                        if (match.Success)
+                                        {
+                                            string imgReplacementString = "<img style=\"max-width: 700px\" src=\"data:" + _inlineAttachment.MimeType + ";base64," + Convert.ToBase64String(_inlineAttachment.Data) + "\"/>";
+                                            bodyreplaced = regex.Replace(bodyreplaced, imgReplacementString, 1, startAt);
+                                            startAt = match.Index + imgReplacementString.Length;
+                                        }
                                         foreach (KeyValuePair<MemoryStream, Dictionary<string, string>> attachment in attachmentsObj)
                                         {
                                             if (attachment.Value.ContainsKey("cid") && attachment.Value["cid"] == _inlineAttachment.ContentId)