TT#14008 fix format list printing logic

Explicitly copy SDP up to the format list before printing it out. This
preserves broken input SDP.

closes #1461

Change-Id: I839a200f159f25854c86add244571a948e2c90cf

daemon/sdp.c

@@ -1825,7 +1825,6 @@ static int replace_transport_protocol(struct sdp_chopper *chop,
 static int print_format_str(GString *s, struct call_media *cm) {
 	if (!cm->format_str.s)
 		return 0;
-	g_string_append(s, " ");
 	g_string_append_len(s, cm->format_str.s, cm->format_str.len);
 	return 0;
 }
@@ -1839,7 +1838,9 @@ static int print_codec_list(GString *s, struct call_media *media) {
 
 	for (GList *l = media->codecs.codec_prefs.head; l; l = l->next) {
 		struct rtp_payload_type *pt = l->data;
-		g_string_append_printf(s, " %u", pt->payload_type);
+		if (l != media->codecs.codec_prefs.head)
+			g_string_append_c(s, ' ');
+		g_string_append_printf(s, "%u", pt->payload_type);
 	}
 	return 0;
 }
@@ -1847,6 +1848,8 @@ static int print_codec_list(GString *s, struct call_media *media) {
 static int replace_codec_list(struct sdp_chopper *chop,
 		struct sdp_media *media, struct call_media *cm)
 {
+	if (copy_up_to(chop, &media->formats))
+		return -1;
 	if (skip_over(chop, &media->formats))
 		return -1;
 
@@ -2865,12 +2868,12 @@ int sdp_create(str *out, struct call_monologue *monologue, struct sdp_ng_flags *
 			goto err;
 		err = "Unknown media protocol";
 		if (media->protocol)
-			g_string_append_printf(s, "m=" STR_FORMAT " %i %s",
+			g_string_append_printf(s, "m=" STR_FORMAT " %i %s ",
 					STR_FMT(&media->type),
 					rtp_ps->selected_sfd->socket.local.port,
 					media->protocol->name);
 		else if (media->protocol_str.s)
-			g_string_append_printf(s, "m=" STR_FORMAT " %i " STR_FORMAT,
+			g_string_append_printf(s, "m=" STR_FORMAT " %i " STR_FORMAT " ",
 					STR_FMT(&media->type),
 					rtp_ps->selected_sfd->socket.local.port,
 					STR_FMT(&media->protocol_str));

t/auto-daemon-tests.pl

@@ -15085,4 +15085,60 @@ a=rtcp:PORT
 SDP
 
 
+
+new_call;
+
+offer('GH #1461', { }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+c=IN IP4 198.51.100.1
+t=0 0
+m=audio 2000 RTP/AVP 0
+c=IN IP4 198.51.100.1
+m=application 0 RTP/AVP 124
+m=application 0 * 
+----------------------------
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+c=IN IP4 203.0.113.1
+t=0 0
+m=audio PORT RTP/AVP 0
+c=IN IP4 203.0.113.1
+a=rtpmap:0 PCMU/8000
+a=sendrecv
+a=rtcp:PORT
+m=application 0 RTP/AVP 124
+m=application 0 * 
+SDP
+
+new_call;
+
+offer('GH #1461', { }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+c=IN IP4 198.51.100.1
+t=0 0
+m=audio 2000 RTP/AVP 0
+c=IN IP4 198.51.100.1
+m=application 0 RTP/AVP 124
+m=application 0 *
+----------------------------
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+c=IN IP4 203.0.113.1
+t=0 0
+m=audio PORT RTP/AVP 0
+c=IN IP4 203.0.113.1
+a=rtpmap:0 PCMU/8000
+a=sendrecv
+a=rtcp:PORT
+m=application 0 RTP/AVP 124
+m=application 0 *
+SDP
+
+
 done_testing();