Fix NPE if file name is missing from quote attachment pointer

Trolldemorted · Trolldemorted · commit 7dcb0ea038dc · 2018-05-14T23:54:22.000+02:00
diff --git a/libsignal-service-dotnet/SignalServiceMessageSender.cs b/libsignal-service-dotnet/SignalServiceMessageSender.cs
@@ -305,10 +305,15 @@ private byte[] CreateMessageContent(SignalServiceDataMessage message)// throws I
                     if (attachment.IsPointer())
                     {
                         var pointer = attachment.AsPointer();
-                        quote.Attachments.Add(new AttachmentPointer()
+                        var protoPointer = new AttachmentPointer()
                         {
                             ContentType = pointer.ContentType
-                        });
+                        };
+                        if (pointer.FileName != null)
+                        {
+                            protoPointer.FileName = pointer.FileName;
+                        }
+                        quote.Attachments.Add(protoPointer);
                     }
                     else
                     {

Original file line number	Diff line number	Diff line change
`@@ -305,10 +305,15 @@ private byte[] CreateMessageContent(SignalServiceDataMessage message)// throws I`
`305`	`305`	`if (attachment.IsPointer())`
`306`	`306`	`{`
`307`	`307`	`var pointer = attachment.AsPointer();`
`308`		`- quote.Attachments.Add(new AttachmentPointer()`
	`308`	`+ var protoPointer = new AttachmentPointer()`
`309`	`309`	`{`
`310`	`310`	`ContentType = pointer.ContentType`
`311`		`- });`
	`311`	`+ };`
	`312`	`+ if (pointer.FileName != null)`
	`313`	`+ {`
	`314`	`+ protoPointer.FileName = pointer.FileName;`
	`315`	`+ }`
	`316`	`+ quote.Attachments.Add(protoPointer);`
`312`	`317`	`}`
`313`	`318`	`else`
`314`	`319`	`{`