Skip to content

fix: use uintptr_t to maintain pointer provenance #2845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rot127 merged 2 commits into from
Jan 12, 2026
Merged

fix: use uintptr_t to maintain pointer provenance #2845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edf1da4
Use uintptr_t to maintain pointer provenance.
kingiler Jan 10, 2026
f3f4c2a
Move include to proper place.
kingiler Jan 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,7 +1020,7 @@ static uint8_t skipdata_size(cs_struct *handle)
}

CAPSTONE_EXPORT
cs_err CAPSTONE_API cs_option(csh ud, cs_opt_type type, size_t value)
cs_err CAPSTONE_API cs_option(csh ud, cs_opt_type type, uintptr_t value)
{
struct cs_struct *handle;
cs_opt_mnem *opt;
Expand Down
5 changes: 3 additions & 2 deletions include/capstone/capstone.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ extern "C" {
#include <libkern/libkern.h>
#else
#include <stdlib.h>
#include <stdint.h>
#include <stdio.h>
#endif

Expand Down Expand Up @@ -70,7 +71,7 @@ extern "C" {
#define CS_MNEMONIC_SIZE 32

// Handle using with all API
typedef size_t csh;
typedef uintptr_t csh;

/// Architecture type
typedef enum cs_arch {
Expand Down Expand Up @@ -723,7 +724,7 @@ cs_err CAPSTONE_API cs_close(csh *handle);
even before cs_open()
*/
CAPSTONE_EXPORT
cs_err CAPSTONE_API cs_option(csh handle, cs_opt_type type, size_t value);
cs_err CAPSTONE_API cs_option(csh handle, cs_opt_type type, uintptr_t value);

/**
Report the last error number when some API function fail.
Expand Down
Loading