Correct BPF bindings error

capstone-engine · Dec 11, 2024 · 7dfbe55 · 7dfbe55
1 parent d2e0e92
commit 7dfbe55
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/arch/BPF/BPFInstPrinter.c b/arch/BPF/BPFInstPrinter.c
@@ -8,6 +8,7 @@
 #include "BPFConstants.h"
 #include "BPFInstPrinter.h"
 #include "BPFMapping.h"
+#include "../../Mapping.h"
 
 static cs_bpf_op *expand_bpf_operands(cs_bpf *bpf)
 {
@@ -348,7 +349,7 @@ static void print_operand(MCInst *MI, struct SStream *O, const cs_bpf_op *op)
  * */
 void BPF_printInst(MCInst *MI, struct SStream *O, void *PrinterInfo)
 {
-	cs_bpf bpf;
+	cs_bpf bpf = { 0 };
 
 	/* set pubOpcode as instruction id */
 	SStream_concat(O, BPF_insn_name((csh)MI->csh, MCInst_getOpcodePub(MI)));
@@ -362,7 +363,7 @@ void BPF_printInst(MCInst *MI, struct SStream *O, void *PrinterInfo)
 	}
 
 #ifndef CAPSTONE_DIET
-	if (MI->flat_insn->detail) {
+	if (detail_is_set(MI)) {
 		MI->flat_insn->detail->bpf = bpf;
 	}
 #endif

diff --git a/bindings/python/capstone/bpf.py b/bindings/python/capstone/bpf.py
@@ -7,13 +7,13 @@
 
 class BPFOpMem(ctypes.Structure):
     _fields_ = (
-        ('base', ctypes.c_uint8),
+        ('base', ctypes.c_int),
         ('disp', ctypes.c_int32),
     )
 
 class BPFOpValue(ctypes.Union):
     _fields_ = (
-        ('reg', ctypes.c_uint8),
+        ('reg', ctypes.c_int),
         ('imm', ctypes.c_uint64),
         ('off', ctypes.c_uint32),
         ('mem', BPFOpMem),
@@ -26,9 +26,9 @@ class BPFOp(ctypes.Structure):
     _fields_ = (
         ('type', ctypes.c_uint),
         ('value', BPFOpValue),
-        ('access', ctypes.c_uint8),
         ('is_signed', ctypes.c_bool),
         ('is_pkt', ctypes.c_bool),
+        ('access', ctypes.c_uint8),
     )
 
     @property

diff --git a/suite/cstest/src/test_detail_bpf.c b/suite/cstest/src/test_detail_bpf.c
@@ -1,9 +1,9 @@
 // Copyright © 2024 Rot127 <[email protected]>
 // SPDX-License-Identifier: BSD-3
 
-#include "capstone/bpf.h"
 #include "test_compare.h"
 #include "test_detail_bpf.h"
+#include <capstone/bpf.h>
 #include <capstone/capstone.h>
 #include <stdio.h>
 #include <string.h>