rust(lint): use is_null() instead of ptr::null_mut()

Bug: #4594

diff --git a/rust/src/applayertemplate/template.rs b/rust/src/applayertemplate/template.rs
index 5c6e87e1ba1d42fc222a6b281432f57cd7910bc7..1b2c20108f7827c3f1db03c05c5cc219ab8bbe02 100644 (file)
--- a/rust/src/applayertemplate/template.rs
+++ b/rust/src/applayertemplate/template.rs
@@ -50,7 +50,7 @@ impl TemplateTransaction {
     }
 
     pub fn free(&mut self) {
-        if self.events != std::ptr::null_mut() {
+        if !self.events.is_null() {
             core::sc_app_layer_decoder_events_free_events(&mut self.events);
         }
         if let Some(state) = self.de_state {
@@ -287,7 +287,7 @@ pub unsafe extern "C" fn rs_template_probing_parser(
     _rdir: *mut u8
 ) -> AppProto {
     // Need at least 2 bytes.
-    if input_len > 1 && input != std::ptr::null_mut() {
+    if input_len > 1 && !input.is_null() {
         let slice = build_slice!(input, input_len as usize);
         if probe(slice).is_ok() {
             return ALPROTO_TEMPLATE;
@@ -340,7 +340,7 @@ pub unsafe extern "C" fn rs_template_parse_request(
 
     let state = cast_pointer!(state, TemplateState);
 
-    if input == std::ptr::null_mut() && input_len > 0 {
+    if input.is_null() && input_len > 0 {
         // Here we have a gap signaled by the input being null, but a greater
         // than 0 input_len which provides the size of the gap.
         state.on_request_gap(input_len);
@@ -368,7 +368,7 @@ pub unsafe extern "C" fn rs_template_parse_response(
     };
     let state = cast_pointer!(state, TemplateState);
 
-    if input == std::ptr::null_mut() && input_len > 0 {
+    if input.is_null() && input_len > 0 {
         // Here we have a gap signaled by the input being null, but a greater
         // than 0 input_len which provides the size of the gap.
         state.on_response_gap(input_len);

diff --git a/rust/src/dcerpc/dcerpc.rs b/rust/src/dcerpc/dcerpc.rs
index f91db9831cec34e3eea2d2e9ca2cbbc9b628b916..6dec6e22cbae4f2a0658a74377b6fa3737d274c5 100644 (file)
--- a/rust/src/dcerpc/dcerpc.rs
+++ b/rust/src/dcerpc/dcerpc.rs
@@ -1158,7 +1158,7 @@ pub unsafe extern "C" fn rs_dcerpc_parse_request(
     if flags & (core::STREAM_START|core::STREAM_MIDSTREAM) == (core::STREAM_START|core::STREAM_MIDSTREAM) {
         state.ts_gap = true;
     }
-    if input_len > 0 && input != std::ptr::null_mut() {
+    if input_len > 0 && !input.is_null() {
         let buf = build_slice!(input, input_len as usize);
         state.flow = Some(flow);
         return state.handle_input_data(buf, core::STREAM_TOSERVER);
@@ -1180,7 +1180,7 @@ pub unsafe extern "C" fn rs_dcerpc_parse_response(
         state.tc_gap = true;
     }
     if input_len > 0 {
-        if input != std::ptr::null_mut() {
+        if !input.is_null() {
             let buf = build_slice!(input, input_len as usize);
             state.flow = Some(flow);
             return state.handle_input_data(buf, core::STREAM_TOCLIENT);

diff --git a/rust/src/dcerpc/dcerpc_udp.rs b/rust/src/dcerpc/dcerpc_udp.rs
index b71dfe18d28812a171091ab5ba97ccf59704cb33..0ece8025ef8a22ea41321f00fc86a6544acf7f0e 100644 (file)
--- a/rust/src/dcerpc/dcerpc_udp.rs
+++ b/rust/src/dcerpc/dcerpc_udp.rs
@@ -210,7 +210,7 @@ pub unsafe extern "C" fn rs_dcerpc_udp_parse(
     input: *const u8, input_len: u32, _data: *const std::os::raw::c_void, _flags: u8,
 ) -> AppLayerResult {
     let state = cast_pointer!(state, DCERPCUDPState);
-    if input_len > 0 && input != std::ptr::null_mut() {
+    if input_len > 0 && !input.is_null() {
         let buf = build_slice!(input, input_len as usize);
         return state.handle_input_data(buf);
     }

diff --git a/rust/src/dcerpc/detect.rs b/rust/src/dcerpc/detect.rs
index 3a8fb632d794a0cd4b001e11be0768e10b38d82d..7cc3a599774398c02f74eaaba146eb734896679b 100644 (file)
--- a/rust/src/dcerpc/detect.rs
+++ b/rust/src/dcerpc/detect.rs
@@ -288,7 +288,7 @@ pub unsafe extern "C" fn rs_dcerpc_iface_parse(carg: *const c_char) -> *mut c_vo
 
 #[no_mangle]
 pub unsafe extern "C" fn rs_dcerpc_iface_free(ptr: *mut c_void) {
-    if ptr != std::ptr::null_mut() {
+    if !ptr.is_null() {
         std::mem::drop(Box::from_raw(ptr as *mut DCEIfaceData));
     }
 }
@@ -335,7 +335,7 @@ pub unsafe extern "C" fn rs_dcerpc_opnum_parse(carg: *const c_char) -> *mut c_vo
 
 #[no_mangle]
 pub unsafe extern "C" fn rs_dcerpc_opnum_free(ptr: *mut c_void) {
-    if ptr != std::ptr::null_mut() {
+    if !ptr.is_null() {
         std::mem::drop(Box::from_raw(ptr as *mut DCEOpnumData));
     }
 }

diff --git a/rust/src/dhcp/dhcp.rs b/rust/src/dhcp/dhcp.rs
index 7d8ce68943f7ddeac798159719619dabbb59c49b..8748b4600b2f4b4ac748ae4e765ec5cd38c9958e 100644 (file)
--- a/rust/src/dhcp/dhcp.rs
+++ b/rust/src/dhcp/dhcp.rs
@@ -96,7 +96,7 @@ impl DHCPTransaction {
     }
 
     pub fn free(&mut self) {
-        if self.events != std::ptr::null_mut() {
+        if !self.events.is_null() {
             sc_app_layer_decoder_events_free_events(&mut self.events);
         }
         match self.de_state {

diff --git a/rust/src/dns/detect.rs b/rust/src/dns/detect.rs
index b389d2c57f11db43dd7baa6a21570552f0342068..ae64614b14ac172818fd6b2fae238b480ab03585 100644 (file)
--- a/rust/src/dns/detect.rs
+++ b/rust/src/dns/detect.rs
@@ -115,7 +115,7 @@ pub unsafe extern "C" fn rs_detect_dns_opcode_parse(carg: *const c_char) -> *mut
 
 #[no_mangle]
 pub unsafe extern "C" fn rs_dns_detect_opcode_free(ptr: *mut c_void) {
-    if ptr != std::ptr::null_mut() {
+    if !ptr.is_null() {
         std::mem::drop(Box::from_raw(ptr as *mut DetectDnsOpcode));
     }
 }

diff --git a/rust/src/dns/dns.rs b/rust/src/dns/dns.rs
index 3e0031e3e968e672acdc2b92ffee8f52e4299ed4..e0ac05fea8c5754a75facd447cb046491d12d5cc 100644 (file)
--- a/rust/src/dns/dns.rs
+++ b/rust/src/dns/dns.rs
@@ -250,7 +250,7 @@ impl DNSTransaction {
     }
 
     pub fn free(&mut self) {
-        if self.events != std::ptr::null_mut() {
+        if !self.events.is_null() {
             core::sc_app_layer_decoder_events_free_events(&mut self.events);
         }
         match self.de_state {
@@ -719,7 +719,7 @@ pub unsafe extern "C" fn rs_dns_parse_request_tcp(_flow: *const core::Flow,
                                            -> AppLayerResult {
     let state = cast_pointer!(state, DNSState);
     if input_len > 0 {
-        if input != std::ptr::null_mut() {
+        if !input.is_null() {
             let buf = std::slice::from_raw_parts(input, input_len as usize);
             return state.parse_request_tcp(buf);
         }
@@ -739,7 +739,7 @@ pub unsafe extern "C" fn rs_dns_parse_response_tcp(_flow: *const core::Flow,
                                             -> AppLayerResult {
     let state = cast_pointer!(state, DNSState);
     if input_len > 0 {
-        if input != std::ptr::null_mut() {
+        if !input.is_null() {
             let buf = std::slice::from_raw_parts(input, input_len as usize);
             return state.parse_response_tcp(buf);
         }

diff --git a/rust/src/http2/http2.rs b/rust/src/http2/http2.rs
index 3cbbf1d2b310b5618e3d2fd322d65ea76dd73a6e..0bea3e2d9c946a9b3c66d17cb74bf54bb41ab27a 100644 (file)
--- a/rust/src/http2/http2.rs
+++ b/rust/src/http2/http2.rs
@@ -166,13 +166,13 @@ impl HTTP2Transaction {
     }
 
     pub fn free(&mut self) {
-        if self.events != std::ptr::null_mut() {
+        if !self.events.is_null() {
             core::sc_app_layer_decoder_events_free_events(&mut self.events);
         }
         if let Some(state) = self.de_state {
             core::sc_detect_engine_state_free(state);
         }
-        if self.file_range != std::ptr::null_mut() {
+        if !self.file_range.is_null() {
             match unsafe { SC } {
                 None => panic!("BUG no suricata_config"),
                 Some(c) => {
@@ -224,7 +224,7 @@ impl HTTP2Transaction {
                     match range::http2_parse_check_content_range(&value) {
                         Ok((_, v)) => {
                             range::http2_range_open(self, &v, flow, sfcm, flags, decompressed);
-                            if over && self.file_range != std::ptr::null_mut() {
+                            if over && !self.file_range.is_null() {
                                 range::http2_range_close(self, files, flags, &[])
                             }
                         }
@@ -234,7 +234,7 @@ impl HTTP2Transaction {
                     }
                 }
             } else {
-                if self.file_range != std::ptr::null_mut() {
+                if !self.file_range.is_null() {
                     if over {
                         range::http2_range_close(self, files, flags, decompressed)
                     } else {
@@ -1008,7 +1008,7 @@ export_tx_data_get!(rs_http2_get_tx_data, HTTP2Transaction);
 pub unsafe extern "C" fn rs_http2_probing_parser_tc(
     _flow: *const Flow, _direction: u8, input: *const u8, input_len: u32, _rdir: *mut u8,
 ) -> AppProto {
-    if input != std::ptr::null_mut() {
+    if !input.is_null() {
         let slice = build_slice!(input, input_len as usize);
         match parser::http2_parse_frame_header(slice) {
             Ok((_, header)) => {
@@ -1049,7 +1049,7 @@ pub extern "C" fn rs_http2_state_new(
     let state = HTTP2State::new();
     let boxed = Box::new(state);
     let r = Box::into_raw(boxed) as *mut _;
-    if orig_state != std::ptr::null_mut() {
+    if !orig_state.is_null() {
         //we could check ALPROTO_HTTP1 == orig_proto
         unsafe {
             HTTP2MimicHttp1Request(orig_state, r);

diff --git a/rust/src/ike/ike.rs b/rust/src/ike/ike.rs
index 6787c22a2839183b9f651e854ef3b2520369680a..8bdb5e051e3439ab2832bb6465472066b4fbf7b1 100644 (file)
--- a/rust/src/ike/ike.rs
+++ b/rust/src/ike/ike.rs
@@ -129,7 +129,7 @@ impl IKETransaction {
     }
 
     pub fn free(&mut self) {
-        if self.events != std::ptr::null_mut() {
+        if !self.events.is_null() {
             core::sc_app_layer_decoder_events_free_events(&mut self.events);
         }
         if let Some(state) = self.de_state {
@@ -316,7 +316,7 @@ pub unsafe extern "C" fn rs_ike_probing_parser(
         return ALPROTO_FAILED;
     }
 
-    if input != std::ptr::null_mut() {
+    if !input.is_null() {
         let slice = build_slice!(input, input_len as usize);
         if probe(slice, direction, rdir) {
             return ALPROTO_IKE ;

diff --git a/rust/src/krb/krb5.rs b/rust/src/krb/krb5.rs
index 8d6bdd5ea8339d9a1b1327c2bdbe744138cb2961..95271a84bee6c4134a08c01af8f86d4473b4cfae 100644 (file)
--- a/rust/src/krb/krb5.rs
+++ b/rust/src/krb/krb5.rs
@@ -235,7 +235,7 @@ impl KRB5Transaction {
 
 impl Drop for KRB5Transaction {
     fn drop(&mut self) {
-        if self.events != std::ptr::null_mut() {
+        if !self.events.is_null() {
             core::sc_app_layer_decoder_events_free_events(&mut self.events);
         }
         if let Some(state) = self.de_state {

diff --git a/rust/src/mqtt/mqtt.rs b/rust/src/mqtt/mqtt.rs
index 15e62920cdec8b0aae778442f62e1bec6c6bb191..9e5d198f4266ca518c41e303138428f996c7ae6d 100644 (file)
--- a/rust/src/mqtt/mqtt.rs
+++ b/rust/src/mqtt/mqtt.rs
@@ -84,7 +84,7 @@ impl MQTTTransaction {
     }
 
     pub fn free(&mut self) {
-        if self.events != std::ptr::null_mut() {
+        if !self.events.is_null() {
             core::sc_app_layer_decoder_events_free_events(&mut self.events);
         }
         if let Some(state) = self.de_state {

diff --git a/rust/src/nfs/nfs.rs b/rust/src/nfs/nfs.rs
index 4df1f403fa71571c79d3d68a7d9aacb6eed4ff3c..c11f5f49d32132a011efd830c4e4b4194e8be44b 100644 (file)
--- a/rust/src/nfs/nfs.rs
+++ b/rust/src/nfs/nfs.rs
@@ -217,7 +217,7 @@ impl NFSTransaction {
     pub fn free(&mut self) {
         debug_validate_bug_on!(self.tx_data.files_opened > 1);
         debug_validate_bug_on!(self.tx_data.files_logged > 1);
-        if self.events != std::ptr::null_mut() {
+        if !self.events.is_null() {
             sc_app_layer_decoder_events_free_events(&mut self.events);
         }
         match self.de_state {

diff --git a/rust/src/ntp/ntp.rs b/rust/src/ntp/ntp.rs
index 9b8b6abf6a4770ab0508c75120462fb713dca60a..175d53cf3d4fe163f1382e6d1a72228fcd6493be 100644 (file)
--- a/rust/src/ntp/ntp.rs
+++ b/rust/src/ntp/ntp.rs
@@ -149,7 +149,7 @@ impl NTPTransaction {
     }
 
     fn free(&mut self) {
-        if self.events != std::ptr::null_mut() {
+        if !self.events.is_null() {
             core::sc_app_layer_decoder_events_free_events(&mut self.events);
         }
     }

diff --git a/rust/src/rdp/rdp.rs b/rust/src/rdp/rdp.rs
index e86b6dd1657b76c253a135fb1e9ba55701054d71..8b197b598299d9fcef5b25fe082c8dc8f79759da 100644 (file)
--- a/rust/src/rdp/rdp.rs
+++ b/rust/src/rdp/rdp.rs
@@ -410,7 +410,7 @@ fn probe_rdp(input: &[u8]) -> bool {
 pub unsafe extern "C" fn rs_rdp_probe_ts_tc(
     _flow: *const Flow, _direction: u8, input: *const u8, input_len: u32, _rdir: *mut u8,
 ) -> AppProto {
-    if input != std::ptr::null_mut() {
+    if !input.is_null() {
         // probe bytes for `rdp` protocol pattern
         let slice = build_slice!(input, input_len as usize);
 

diff --git a/rust/src/rfb/rfb.rs b/rust/src/rfb/rfb.rs
index e61d787abc5e992086d76cbec15987c792177777..d9b6d543cf2e99dacbcb409e9c3cb5b745fc7a35 100644 (file)
--- a/rust/src/rfb/rfb.rs
+++ b/rust/src/rfb/rfb.rs
@@ -75,7 +75,7 @@ impl RFBTransaction {
     }
 
     pub fn free(&mut self) {
-        if self.events != std::ptr::null_mut() {
+        if !self.events.is_null() {
             core::sc_app_layer_decoder_events_free_events(&mut self.events);
         }
         if let Some(state) = self.de_state {

diff --git a/rust/src/sip/sip.rs b/rust/src/sip/sip.rs
index e9b15550781419c4cb25f4bfc122c17740e2b0b3..df31c56b7078cd07c4f3be86560e29748e0ed105 100755 (executable)
--- a/rust/src/sip/sip.rs
+++ b/rust/src/sip/sip.rs
@@ -149,7 +149,7 @@ impl SIPTransaction {
 
 impl Drop for SIPTransaction {
     fn drop(&mut self) {
-        if self.events != std::ptr::null_mut() {
+        if !self.events.is_null() {
             core::sc_app_layer_decoder_events_free_events(&mut self.events);
         }
         if let Some(state) = self.de_state {

diff --git a/rust/src/smb/smb.rs b/rust/src/smb/smb.rs
index f178de87ae559350d995b0524b09bda0e133e452..2eea29f691ca363d7dd27c9e62a89074fd2c9c0b 100644 (file)
--- a/rust/src/smb/smb.rs
+++ b/rust/src/smb/smb.rs
@@ -568,7 +568,7 @@ impl SMBTransaction {
     pub fn free(&mut self) {
         debug_validate_bug_on!(self.tx_data.files_opened > 1);
         debug_validate_bug_on!(self.tx_data.files_logged > 1);
-        if self.events != std::ptr::null_mut() {
+        if !self.events.is_null() {
             sc_app_layer_decoder_events_free_events(&mut self.events);
         }
         match self.de_state {

diff --git a/rust/src/snmp/snmp.rs b/rust/src/snmp/snmp.rs
index 2789ef185ee2f4f3f09bbf90f44cf98a8d239349..b12427ab9c9292d0aa694d166f1bacb7a23e68ec 100644 (file)
--- a/rust/src/snmp/snmp.rs
+++ b/rust/src/snmp/snmp.rs
@@ -267,7 +267,7 @@ impl<'a> SNMPTransaction<'a> {
     }
 
     fn free(&mut self) {
-        if self.events != std::ptr::null_mut() {
+        if !self.events.is_null() {
             core::sc_app_layer_decoder_events_free_events(&mut self.events);
         }
     }

diff --git a/rust/src/ssh/ssh.rs b/rust/src/ssh/ssh.rs
index 70494f5fc1292ef4e2521b8acdbff38435c0c402..7a09b6db07dedc9273df72ebc23cc3b415da8caf 100644 (file)
--- a/rust/src/ssh/ssh.rs
+++ b/rust/src/ssh/ssh.rs
@@ -99,7 +99,7 @@ impl SSHTransaction {
     }
 
     pub fn free(&mut self) {
-        if self.events != std::ptr::null_mut() {
+        if !self.events.is_null() {
             core::sc_app_layer_decoder_events_free_events(&mut self.events);
         }
         if let Some(state) = self.de_state {