From: Philippe Antoine <pantoine@oisf.net>
Date: Sat, 27 Apr 2024 20:06:09 +0000 (+0200)
Subject: sdp: fix logging medias
X-Git-Tag: suricata-8.0.0-beta1~1355
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c53e9ac0dd9ddb99ce901ebd585d9c041ac3232e;p=thirdparty%2Fsuricata.git

sdp: fix logging medias

As introduced by bff790b6ac6f0e5ddf6bd0fe0085881473935c2c

Also handles errors in the caller

Ticket: 6994
---

diff --git a/rust/src/sdp/logger.rs b/rust/src/sdp/logger.rs
index b5e8cbc647..43e16049ab 100644
--- a/rust/src/sdp/logger.rs
+++ b/rust/src/sdp/logger.rs
@@ -107,8 +107,8 @@ fn log_media_description(
             }
             js.close()?;
         }
+        js.close()?;
     }
-    js.close()?;
 
     Ok(())
 }
diff --git a/rust/src/sip/log.rs b/rust/src/sip/log.rs
index 92989ba95e..058b7850cb 100644
--- a/rust/src/sip/log.rs
+++ b/rust/src/sip/log.rs
@@ -30,7 +30,7 @@ fn log(tx: &SIPTransaction, js: &mut JsonBuilder) -> Result<(), JsonError> {
             .set_string("version", &req.version)?;
 
         if let Some(sdp_body) = &req.body {
-            let _ = sdp_log(sdp_body, js);
+            sdp_log(sdp_body, js)?;
         }
     }
 
@@ -43,7 +43,7 @@ fn log(tx: &SIPTransaction, js: &mut JsonBuilder) -> Result<(), JsonError> {
             .set_string("code", &resp.code)?
             .set_string("reason", &resp.reason)?;
         if let Some(sdp_body) = &resp.body {
-            let _ = sdp_log(sdp_body, js);
+            sdp_log(sdp_body, js)?;
         }
     }