Skip to content

fix: three memcpy operations in jv_print in jv_print.c #3521

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

Open
orbisai0security wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −1
Open

fix: three memcpy operations in jv_print in jv_print.c #3521

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion src/jv_print.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,20 @@ int jq_set_colors(const char *code_str) {
goto default_colors;
}

size_t buf_size = codes[num_colors] - codes[0] + 3 * num_colors;
colors_buf = jv_mem_realloc(
colors_buf,
// add ESC '[' 'm' to each string
// '\0' is already included in difference of codes
codes[num_colors] - codes[0] + 3 * num_colors
buf_size
);
char *cb = colors_buf;
char *cb_end = colors_buf + buf_size;
for (; ci < num_colors; ci++) {
colors[ci] = cb;
size_t len = codes[ci + 1] - 1 - codes[ci];
if (len + 4 > (size_t)(cb_end - cb))
break;

cb[0] = ESC[0];
cb[1] = '[';
Expand Down Expand Up @@ -423,6 +427,7 @@ char *jv_dump_string_trunc(jv x, char *outbuf, size_t bufsize) {
size_t l = bufsize - (delim ? 5 : 4); // "...", delim (if any), '\0'
const char *s = jvp_utf8_backtrack(str + l, str, NULL);
if (s) l = s - str;
if (l > bufsize - 1) l = bufsize - 1;
memcpy(outbuf, str, l);
outbuf[l++] = '.';
outbuf[l++] = '.';
Expand All @@ -431,6 +436,7 @@ char *jv_dump_string_trunc(jv x, char *outbuf, size_t bufsize) {
outbuf[l] = '\0';
} else {
size_t l = MIN(len, bufsize - 1);
if (l > bufsize - 1) l = bufsize - 1;
memcpy(outbuf, str, l);
outbuf[l] = '\0';
}
Expand Down