Feature: Highlight conditional gadgets in all modes by MrQuantum1915 · Pull Request #6324 · rizinorg/rizin

MrQuantum1915 · 2026-05-07T19:59:08Z

Your checklist for this pull request

I've read the guidelines for contributing to this repository.
I made sure to follow the project's coding style.
I've documented every RZ_API function and struct this PR changes.
I've added tests that prove my changes are effective (required for changes to RZ_API).
I've updated the Rizin book with the relevant information (if needed).
I've used AI tools to generate fully or partially these code changes and I'm sure the changes are not copyrighted by somebody else.

Detailed description

As discussed with @notxvilka in mattermost, implemented highlighting of conditional gadgets in all modes (non-color mode too)

This applies when e gadget.conditional=true is set
Please let me know if you mean to highlight conditional terminator instruction in the output no matter what is the state of config : gadget.conditional

Just to be clear is_conditional is set by using a trick actually. We get to know if teminator is conditional or not, by the function in gadget_[rjc]op.c so what i did is :

if gadget_is_valid_terminator return true for allow_conditional is passed as true
&&
return false when allow_conditional is passed as false
= the gadget is conditional terminator.

I did this hack so that it is same code for ROP/COP/JOP.

UI/UX and color choices may be slightly questionable, i may be bad at that :)
suggestions welcome...

Here are some ss (arm32)

I also injected is_conditional key in JSON output when it is, otherwise the key is not injected
an exerpt:

    {
        "opcodes": [
            {
                "offset": 0,
                "size": 4,
                "opcode": "str lr, [sp, -4]!",
                "type": "store"
            },
            {
                "offset": 4,
                "size": 4,
                "opcode": "mov r0, r0",
                "type": "mov"
            },
            {
                "offset": 8,
                "size": 4,
                "opcode": "mov r1, r1",
                "type": "mov"
            },
            {
                "offset": 12,
                "size": 4,
                "opcode": "ldmeq sp!, {pc}",
                "type": "cret"
            }
        ],
        "retaddr": 12,
        "size": 16,
        "is_conditional": true
    },

Test plan

Added (updated) new tests for conditonal gadgets

Closing issues

notxvilka

Ideally we would need to follow the colorscheme rather than hardcoding colors, especially important for terminals with white background (see #6338). But it's better done in a separate PR. Currently it's good as is.

codecov · 2026-05-11T15:43:30Z

Codecov Report

❌ Patch coverage is 62.06897% with 22 lines in your changes missing coverage. Please review.
✅ Project coverage is 48.45%. Comparing base (b4f2c39) to head (bed2a85).

Files with missing lines	Patch %	Lines
librz/core/gadget.c	62.06%	9 Missing and 13 partials ⚠️

Additional details and impacted files

Files with missing lines	Coverage Δ
librz/core/gadget.c	`63.27% <62.06%> (+1.85%)`	⬆️

... and 11 files with indirect coverage changes

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b4f2c39...bed2a85. Read the comment docs.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

MrQuantum1915 · 2026-05-11T17:28:52Z

Ideally we would need to follow the colorscheme rather than hardcoding colors, especially important for terminals with white background (see #6338). But it's better done in a separate PR. Currently it's good as is.

yeah, we'd probably need help from someone better with UI/colors, I am pretty bad at that 😂

wargio · 2026-05-13T14:51:11Z

+	const char *highlight_color = colorize ? Color_CYAN : "";
+	const char *reset_color = colorize ? Color_RESET : "";
+	if (is_conditional) {
+		rz_cons_printf("%sGadget 0x%" PFMT64x " [Conditional Gadget]%s\n", highlight_color, gadget_info->address, reset_color);


Suggested change

rz_cons_printf("%sGadget 0x%" PFMT64x " [Conditional Gadget]%s\n", highlight_color, gadget_info->address, reset_color);

rz_cons_printf("%sGadget 0x%" PFMT64x " [Conditional]%s\n", highlight_color, gadget_info->address, reset_color);

wargio · 2026-05-13T14:51:25Z

+	const char *highlight_color = colorize ? Color_CYAN : "";
+	const char *reset_color = colorize ? Color_RESET : "";
+	if (is_conditional) {
+		rz_cons_printf("%sGadget 0x%" PFMT64x " (size %d bytes) [Conditional Gadget]%s\n", highlight_color, addr, size, reset_color);


Suggested change

rz_cons_printf("%sGadget 0x%" PFMT64x " (size %d bytes) [Conditional Gadget]%s\n", highlight_color, addr, size, reset_color);

rz_cons_printf("%sGadget 0x%" PFMT64x " (size %d bytes) [Conditional]%s\n", highlight_color, addr, size, reset_color);

wargio · 2026-05-13T14:52:37Z

+0x00000000         04e02de50000a0e10110a0e10080bd08 [Conditional Gadget] str lr, [sp, -4]!; ; mov r0, r0; ; mov r1, r1; ; ldmeq sp!, {pc}; 
+0x00000004                 0000a0e10110a0e10080bd08 [Conditional Gadget] mov r0, r0; ; mov r1, r1; ; ldmeq sp!, {pc}; 
+0x00000008                         0110a0e10080bd08 [Conditional Gadget] mov r1, r1; ; ldmeq sp!, {pc}; 
+0x0000000c                                 0080bd08 [Conditional Gadget] ldmeq sp!, {pc}; 
+0x00000000 04e02de50000a0e10110a0e10080bd081eff2fe1 str lr, [sp, -4]!; ; mov r0, r0; ; mov r1, r1; ; ldmeq sp!, {pc}; ; bx lr; 
+0x00000004         0000a0e10110a0e10080bd081eff2fe1 mov r0, r0; ; mov r1, r1; ; ldmeq sp!, {pc}; ; bx lr; 
+0x00000008                 0110a0e10080bd081eff2fe1 mov r1, r1; ; ldmeq sp!, {pc}; ; bx lr; 
+0x0000000c                         0080bd081eff2fe1 ldmeq sp!, {pc}; ; bx lr; 
+0x00000010                                 1eff2fe1 bx lr; 


the bytes length should be limited by an evar.

MrQuantum1915 requested review from Rot127, b1llow, kazarmy, notxvilka, ret2libc, thestr4ng3r and wargio as code owners May 7, 2026 19:59

github-actions Bot added rz-test RzCore labels May 7, 2026

MrQuantum1915 force-pushed the feat/highlight-cond-gadget branch 2 times, most recently from 070b71f to 89dfa94 Compare May 11, 2026 10:13

highlight conditional gadgets in all modes

bed2a85

MrQuantum1915 force-pushed the feat/highlight-cond-gadget branch from 89dfa94 to bed2a85 Compare May 11, 2026 10:15

notxvilka approved these changes May 11, 2026

View reviewed changes

wargio reviewed May 13, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Feature: Highlight conditional gadgets in all modes#6324

Feature: Highlight conditional gadgets in all modes#6324
MrQuantum1915 wants to merge 1 commit into
rizinorg:devfrom
MrQuantum1915:feat/highlight-cond-gadget

MrQuantum1915 commented May 7, 2026 •

edited

Loading

Uh oh!

notxvilka left a comment •

edited

Loading

Uh oh!

codecov Bot commented May 11, 2026

Uh oh!

MrQuantum1915 commented May 11, 2026

Uh oh!

wargio May 13, 2026

Uh oh!

wargio May 13, 2026

Uh oh!

wargio May 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	rz_cons_printf("%sGadget 0x%" PFMT64x " [Conditional Gadget]%s\n", highlight_color, gadget_info->address, reset_color);
	rz_cons_printf("%sGadget 0x%" PFMT64x " [Conditional]%s\n", highlight_color, gadget_info->address, reset_color);

Uh oh!

Conversation

MrQuantum1915 commented May 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

notxvilka left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codecov Bot commented May 11, 2026

Codecov Report

Uh oh!

MrQuantum1915 commented May 11, 2026

Uh oh!

wargio May 13, 2026

Choose a reason for hiding this comment

Uh oh!

wargio May 13, 2026

Choose a reason for hiding this comment

Uh oh!

wargio May 13, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

MrQuantum1915 commented May 7, 2026 •

edited

Loading

notxvilka left a comment •

edited

Loading