Skip to content

http: don't copy bytes from octs #1007

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

Draft
dozreg-toplud wants to merge 3 commits into
base: develop
Choose a base branch
from
Draft

http: don't copy bytes from octs #1007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b708de
http: don't copy bytes from octs
dozreg-toplud May 4, 2026
56b1aa7
http: still copy if the buffer is too small or no null terminator
dozreg-toplud May 4, 2026
b5fad2d
http: finer measurements
dozreg-toplud May 4, 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
4 changes: 2 additions & 2 deletions pkg/noun/retrieve.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1949,11 +1949,11 @@ c3_w*
u3r_word_buffer(u3_atom* a, c3_w* len_w)
{
if ( _(u3a_is_cat(*a)) ) {
*len_w = 1;
if ( len_w ) *len_w = 1;
return a;
}
u3a_atom* pug_u = u3a_to_ptr(*a);
*len_w = pug_u->len_w;
if ( len_w ) *len_w = pug_u->len_w;
return pug_u->buf_w;
}

Expand Down
35 changes: 27 additions & 8 deletions pkg/vere/io/cttp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ static void
_cttp_bods_free(u3_hbod* bod_u)
{
while ( bod_u ) {
u3z(bod_u->atom);
u3_hbod* nex_u = bod_u->nex_u;

c3_free(bod_u);
Expand All @@ -91,6 +92,8 @@ static u3_hbod*
_cttp_bod_new(c3_w len_w, c3_c* hun_c)
{
u3_hbod* bod_u = c3_malloc(1 + len_w + sizeof(*bod_u));
bod_u->atom = u3_nul;
bod_u->hun_y = (c3_y*)(bod_u + 1);
bod_u->hun_y[len_w] = 0;
bod_u->len_w = len_w;
memcpy(bod_u->hun_y, (const c3_y*)hun_c, len_w);
Expand All @@ -106,6 +109,8 @@ _cttp_bod_from_hed(u3_hhed* hed_u)
{
c3_w len_w = hed_u->nam_w + 2 + hed_u->val_w + 2;
u3_hbod* bod_u = c3_malloc(1 + len_w + sizeof(*bod_u));
bod_u->atom = u3_nul;
bod_u->hun_y = (c3_y*)(bod_u + 1);
bod_u->hun_y[len_w] = 0;

memcpy(bod_u->hun_y, hed_u->nam_c, hed_u->nam_w);
Expand Down Expand Up @@ -137,6 +142,9 @@ _cttp_bods_to_octs(u3_hbod* bod_u)
bid_u = bid_u->nex_u;
}
}
if ( c3n == u3a_is_cat(len_w) ) {
u3m_bail(c3__fail);
}
buf_y = c3_malloc(1 + len_w);
buf_y[len_w] = 0;

Expand Down Expand Up @@ -166,17 +174,28 @@ _cttp_bod_from_octs(u3_noun oct)
}
len_w = u3h(oct);

{
u3_hbod* bod_u = c3_malloc(1 + len_w + sizeof(*bod_u));
if ( !_(u3ud(u3t(oct))) ) {
u3m_bail(c3__fail);
}

c3_w len_buf_w = u3r_met(3, u3t(oct));
u3_hbod* bod_u;
if ( len_buf_w <= len_w ) {
bod_u = c3_malloc(1 + len_w + sizeof(*bod_u));
bod_u->atom = u3_nul;
bod_u->hun_y = (c3_y*)(bod_u + 1);
bod_u->hun_y[len_w] = 0;
bod_u->len_w = len_w;
u3r_bytes(0, len_w, bod_u->hun_y, u3t(oct));

bod_u->nex_u = 0;

u3z(oct);
return bod_u;
}
else {
bod_u = c3_malloc(sizeof(*bod_u));
bod_u->atom = u3k(u3t(oct));
bod_u->hun_y = (c3_y*)u3r_word_buffer(&bod_u->atom, NULL);
}
bod_u->len_w = len_w;
bod_u->nex_u = 0;
u3z(oct);
return bod_u;
}

/* _cttp_bods_to_vec(): translate body buffers to array of h2o_iovec_t
Expand Down
28 changes: 20 additions & 8 deletions pkg/vere/io/http.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ static void
_cttp_bods_free(u3_hbod* bod_u)
{
while ( bod_u ) {
u3z(bod_u->atom);
u3_hbod* nex_u = bod_u->nex_u;

c3_free(bod_u);
Expand All @@ -206,17 +207,28 @@ _cttp_bod_from_octs(u3_noun oct)
}
len_w = u3h(oct);

{
u3_hbod* bod_u = c3_malloc(1 + len_w + sizeof(*bod_u));
if ( !_(u3ud(u3t(oct))) ) {
u3m_bail(c3__fail);
}

c3_w len_buf_w = u3r_met(3, u3t(oct));
u3_hbod* bod_u;
if ( len_buf_w <= len_w ) {
bod_u = c3_malloc(1 + len_w + sizeof(*bod_u));
bod_u->atom = u3_nul;
bod_u->hun_y = (c3_y*)(bod_u + 1);
bod_u->hun_y[len_w] = 0;
bod_u->len_w = len_w;
u3r_bytes(0, len_w, bod_u->hun_y, u3t(oct));

bod_u->nex_u = 0;

u3z(oct);
return bod_u;
}
else {
bod_u = c3_malloc(sizeof(*bod_u));
bod_u->atom = u3k(u3t(oct));
bod_u->hun_y = (c3_y*)u3r_word_buffer(&bod_u->atom, NULL);
}
bod_u->len_w = len_w;
bod_u->nex_u = 0;
u3z(oct);
return bod_u;
}

/* _cttp_bods_to_vec(): translate body buffers to array of h2o_iovec_t
Expand Down
3 changes: 2 additions & 1 deletion pkg/vere/vere.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@
*/
typedef struct _u3_hbod {
struct _u3_hbod* nex_u;
u3_atom atom; // set if hun_y is owned by that atom, else 0
c3_w len_w;
c3_y hun_y[0];
c3_y* hun_y;
} u3_hbod;

/* u3_lane: ames lane (IP address and port)
Expand Down
Loading