Skip to content
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.

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

Fix color ascii escapes in json output, again #10922

Merged
merged 1 commit into from Aug 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion libr/core/disasm.c
Expand Up @@ -472,7 +472,7 @@ static void ds_comment(RDisasmState *ds, bool align, const char *format, ...) {
} else {
char buffer[4096];
vsnprintf (buffer, sizeof(buffer), format, ap);
char *escstr = r_str_escape_latin1 (buffer, false, true, false);
char *escstr = r_str_escape_latin1 (buffer, false, true, true);
if (escstr) {
r_cons_printf ("%s", escstr);
free (escstr);
Expand Down
2 changes: 1 addition & 1 deletion libr/util/str.c
Expand Up @@ -1259,7 +1259,7 @@ R_API char *r_str_escape_dot(const char *buf) {
}

R_API char *r_str_escape_latin1(const char *buf, bool show_asciidot, bool esc_bslash, bool colors) {
return r_str_escape_ (buf, false, false, !colors, show_asciidot, esc_bslash);
return r_str_escape_ (buf, false, colors, !colors, show_asciidot, esc_bslash);
}

static char *r_str_escape_utf(const char *buf, int buf_size, RStrEnc enc, bool show_asciidot, bool esc_bslash) {
Expand Down