]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
hoist assertion around print_args. Fixes #5672
authorAlan T. DeKok <aland@freeradius.org>
Fri, 31 Oct 2025 13:30:03 +0000 (09:30 -0400)
committerAlan T. DeKok <aland@freeradius.org>
Fri, 31 Oct 2025 13:30:26 +0000 (09:30 -0400)
src/protocols/tacacs/base.c

index 4095da6b9d6eb0fa0f5f82c12cb73ef489ce592b..626f30966463ed5957d9c314f6eb25c6ee5e0482 100644 (file)
@@ -444,9 +444,9 @@ void _fr_tacacs_packet_log_hex(fr_log_t const *log, fr_tacacs_packet_t const *pa
     } while (0)
 
        switch (packet->hdr.type) {
-               default:
-                       print_hex(log, file, line, "      data   ", p, length);
-                       return;
+       default:
+               print_hex(log, file, line, "      data   ", p, length);
+               return;
 
        case FR_TAC_PLUS_AUTHEN:
                if (packet_is_authen_start_request(packet)) {
@@ -495,6 +495,8 @@ void _fr_tacacs_packet_log_hex(fr_log_t const *log, fr_tacacs_packet_t const *pa
                        ASCII("      server_msg     ", fr_nbo_to_uint16(hdr + 2));
                        HEXIT("      data           ", fr_nbo_to_uint16(hdr + 4));
                }
+
+               fr_assert(p == end);
                break;
 
        case FR_TAC_PLUS_AUTHOR:
@@ -577,11 +579,11 @@ void _fr_tacacs_packet_log_hex(fr_log_t const *log, fr_tacacs_packet_t const *pa
 
                        ASCII("      server_msg     ", fr_nbo_to_uint16(hdr));
                        HEXIT("      data           ", fr_nbo_to_uint16(hdr + 2));
+
+                       fr_assert(p == end);
                }
                break;
        }
-
-       fr_assert(p == end);
 }
 
 int fr_tacacs_global_init(void)