fixup! fixup! http: Use libhtp-rs.

OISF · Jan 30, 2025 · 81c8b60 · 81c8b60
1 parent 4103247
commit 81c8b60
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/rust/htp/src/c_api/header.rs b/rust/htp/src/c_api/header.rs
@@ -177,13 +177,13 @@ pub unsafe extern "C" fn htp_header_value_ptr(header: *const Header) -> *const u
 ///
 /// tx: Header pointer.
 ///
-/// Returns the length or -1 on error.
+/// Returns the length or 0 on a NULL pointer.
 /// # Safety
 /// When calling this method, you have to ensure that header is either properly initialized or NULL
 #[no_mangle]
-pub unsafe extern "C" fn htp_header_value_len(header: *const Header) -> isize {
+pub unsafe extern "C" fn htp_header_value_len(header: *const Header) -> usize {
     header
         .as_ref()
-        .map(|header| isize::try_from(header.value.len()).unwrap_or(-1))
-        .unwrap_or(-1)
+        .map(|header| header.value.len())
+        .unwrap_or(0)
 }
diff --git a/src/log-httplog.c b/src/log-httplog.c
@@ -231,7 +231,7 @@ static void LogHttpLogCustom(LogHttpLogThread *aft, htp_tx_t *tx, const SCTime_t
             h_request_hdr = htp_tx_request_header(tx, node->data);
             if (h_request_hdr != NULL) {
                 datalen = node->maxlen;
-                if (datalen == 0 || datalen > (size_t)htp_header_value_len(h_request_hdr)) {
+                if (datalen == 0 || datalen > htp_header_value_len(h_request_hdr)) {
                     datalen = htp_header_value_len(h_request_hdr);
                 }
                 PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset, aft->buffer->size,
@@ -283,7 +283,7 @@ static void LogHttpLogCustom(LogHttpLogThread *aft, htp_tx_t *tx, const SCTime_t
             }
                 if (h_response_hdr != NULL) {
                     datalen = node->maxlen;
-                    if (datalen == 0 || datalen > (size_t)htp_header_value_len(h_response_hdr)) {
+                    if (datalen == 0 || datalen > htp_header_value_len(h_response_hdr)) {
                         datalen = htp_header_value_len(h_response_hdr);
                     }
                     PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,