Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
ca7682ba
Commit
ca7682ba
authored
Oct 23, 2023
by
Dridi Boukelmoune
Committed by
Simon Stridsberg
Mar 18, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
http2_send: Proper null checks for h2 errors
Conflicts: bin/varnishd/http2/cache_http2_send.c
parent
2b05b9ed
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
15 deletions
+16
-15
cache_http2_send.c
bin/varnishd/http2/cache_http2_send.c
+16
-15
No files found.
bin/varnishd/http2/cache_http2_send.c
View file @
ca7682ba
...
@@ -239,11 +239,11 @@ h2_errcheck(const struct h2_req *r2, const struct h2_sess *h2)
...
@@ -239,11 +239,11 @@ h2_errcheck(const struct h2_req *r2, const struct h2_sess *h2)
CHECK_OBJ_NOTNULL
(
r2
,
H2_REQ_MAGIC
);
CHECK_OBJ_NOTNULL
(
r2
,
H2_REQ_MAGIC
);
CHECK_OBJ_NOTNULL
(
h2
,
H2_SESS_MAGIC
);
CHECK_OBJ_NOTNULL
(
h2
,
H2_SESS_MAGIC
);
if
(
r2
->
error
)
if
(
r2
->
error
!=
NULL
)
return
(
r2
->
error
);
return
(
r2
->
error
);
if
(
h2
->
error
&&
r2
->
stream
>
h2
->
goaway_last_stream
)
if
(
h2
->
error
!=
NULL
&&
r2
->
stream
>
h2
->
goaway_last_stream
)
return
(
h2
->
error
);
return
(
h2
->
error
);
return
(
0
);
return
(
NULL
);
}
}
static
int64_t
static
int64_t
...
@@ -263,25 +263,25 @@ h2_do_window(struct worker *wrk, struct h2_req *r2,
...
@@ -263,25 +263,25 @@ h2_do_window(struct worker *wrk, struct h2_req *r2,
if
(
r2
->
t_window
<=
0
||
h2
->
req0
->
t_window
<=
0
)
{
if
(
r2
->
t_window
<=
0
||
h2
->
req0
->
t_window
<=
0
)
{
r2
->
t_winupd
=
VTIM_real
();
r2
->
t_winupd
=
VTIM_real
();
h2_send_rel_locked
(
h2
,
r2
);
h2_send_rel_locked
(
h2
,
r2
);
while
(
r2
->
t_window
<=
0
&&
h2_errcheck
(
r2
,
h2
)
==
0
)
{
while
(
r2
->
t_window
<=
0
&&
h2_errcheck
(
r2
,
h2
)
==
NULL
)
{
r2
->
cond
=
&
wrk
->
cond
;
r2
->
cond
=
&
wrk
->
cond
;
(
void
)
h2_cond_wait
(
r2
->
cond
,
h2
,
r2
);
(
void
)
h2_cond_wait
(
r2
->
cond
,
h2
,
r2
);
r2
->
cond
=
NULL
;
r2
->
cond
=
NULL
;
}
}
while
(
h2
->
req0
->
t_window
<=
0
&&
h2_errcheck
(
r2
,
h2
)
==
0
)
while
(
h2
->
req0
->
t_window
<=
0
&&
h2_errcheck
(
r2
,
h2
)
==
NULL
)
(
void
)
h2_cond_wait
(
h2
->
winupd_cond
,
h2
,
r2
);
(
void
)
h2_cond_wait
(
h2
->
winupd_cond
,
h2
,
r2
);
if
(
h2_errcheck
(
r2
,
h2
)
==
0
)
{
if
(
h2_errcheck
(
r2
,
h2
)
==
NULL
)
{
w
=
h2_win_limit
(
r2
,
h2
);
w
=
vmin_t
(
int64_t
,
h2_win_limit
(
r2
,
h2
),
wanted
);
if
(
w
>
wanted
)
w
=
wanted
;
h2_win_charge
(
r2
,
h2
,
w
);
h2_win_charge
(
r2
,
h2
,
w
);
assert
(
w
>
0
);
assert
(
w
>
0
);
}
}
h2_send_get_locked
(
wrk
,
h2
,
r2
);
h2_send_get_locked
(
wrk
,
h2
,
r2
);
}
}
if
(
w
==
0
&&
h2_errcheck
(
r2
,
h2
)
==
0
)
{
if
(
w
==
0
&&
h2_errcheck
(
r2
,
h2
)
==
NULL
)
{
assert
(
r2
->
t_window
>
0
);
assert
(
r2
->
t_window
>
0
);
assert
(
h2
->
req0
->
t_window
>
0
);
assert
(
h2
->
req0
->
t_window
>
0
);
w
=
h2_win_limit
(
r2
,
h2
);
w
=
h2_win_limit
(
r2
,
h2
);
...
@@ -318,7 +318,7 @@ h2_send(struct worker *wrk, struct h2_req *r2, h2_frame ftyp, uint8_t flags,
...
@@ -318,7 +318,7 @@ h2_send(struct worker *wrk, struct h2_req *r2, h2_frame ftyp, uint8_t flags,
AN
(
H2_SEND_HELD
(
h2
,
r2
));
AN
(
H2_SEND_HELD
(
h2
,
r2
));
if
(
h2_errcheck
(
r2
,
h2
))
if
(
h2_errcheck
(
r2
,
h2
)
!=
NULL
)
return
;
return
;
AN
(
ftyp
);
AN
(
ftyp
);
...
@@ -343,7 +343,7 @@ h2_send(struct worker *wrk, struct h2_req *r2, h2_frame ftyp, uint8_t flags,
...
@@ -343,7 +343,7 @@ h2_send(struct worker *wrk, struct h2_req *r2, h2_frame ftyp, uint8_t flags,
if
(
ftyp
->
respect_window
)
{
if
(
ftyp
->
respect_window
)
{
tf
=
h2_do_window
(
wrk
,
r2
,
h2
,
(
len
>
mfs
)
?
mfs
:
len
);
tf
=
h2_do_window
(
wrk
,
r2
,
h2
,
(
len
>
mfs
)
?
mfs
:
len
);
if
(
h2_errcheck
(
r2
,
h2
))
if
(
h2_errcheck
(
r2
,
h2
)
!=
NULL
)
return
;
return
;
AN
(
H2_SEND_HELD
(
h2
,
r2
));
AN
(
H2_SEND_HELD
(
h2
,
r2
));
}
else
}
else
...
@@ -363,8 +363,8 @@ h2_send(struct worker *wrk, struct h2_req *r2, h2_frame ftyp, uint8_t flags,
...
@@ -363,8 +363,8 @@ h2_send(struct worker *wrk, struct h2_req *r2, h2_frame ftyp, uint8_t flags,
tf
=
mfs
;
tf
=
mfs
;
if
(
ftyp
->
respect_window
&&
p
!=
ptr
)
{
if
(
ftyp
->
respect_window
&&
p
!=
ptr
)
{
tf
=
h2_do_window
(
wrk
,
r2
,
h2
,
tf
=
h2_do_window
(
wrk
,
r2
,
h2
,
(
len
>
mfs
)
?
mfs
:
len
);
(
len
>
mfs
)
?
mfs
:
len
);
if
(
h2_errcheck
(
r2
,
h2
))
if
(
h2_errcheck
(
r2
,
h2
)
!=
NULL
)
return
;
return
;
AN
(
H2_SEND_HELD
(
h2
,
r2
));
AN
(
H2_SEND_HELD
(
h2
,
r2
));
}
}
...
@@ -385,7 +385,7 @@ h2_send(struct worker *wrk, struct h2_req *r2, h2_frame ftyp, uint8_t flags,
...
@@ -385,7 +385,7 @@ h2_send(struct worker *wrk, struct h2_req *r2, h2_frame ftyp, uint8_t flags,
ftyp
=
ftyp
->
continuation
;
ftyp
=
ftyp
->
continuation
;
flags
&=
ftyp
->
flags
;
flags
&=
ftyp
->
flags
;
final_flags
&=
ftyp
->
flags
;
final_flags
&=
ftyp
->
flags
;
}
while
(
!
h2
->
error
&&
len
>
0
);
}
while
(
h2
->
error
==
NULL
&&
len
>
0
);
}
}
}
}
...
@@ -398,6 +398,7 @@ H2_Send_RST(struct worker *wrk, struct h2_sess *h2, const struct h2_req *r2,
...
@@ -398,6 +398,7 @@ H2_Send_RST(struct worker *wrk, struct h2_sess *h2, const struct h2_req *r2,
CHECK_OBJ_NOTNULL
(
h2
,
H2_SESS_MAGIC
);
CHECK_OBJ_NOTNULL
(
h2
,
H2_SESS_MAGIC
);
CHECK_OBJ_NOTNULL
(
r2
,
H2_REQ_MAGIC
);
CHECK_OBJ_NOTNULL
(
r2
,
H2_REQ_MAGIC
);
AN
(
H2_SEND_HELD
(
h2
,
r2
));
AN
(
H2_SEND_HELD
(
h2
,
r2
));
AN
(
h2e
);
Lck_Lock
(
&
h2
->
sess
->
mtx
);
Lck_Lock
(
&
h2
->
sess
->
mtx
);
VSLb
(
h2
->
vsl
,
SLT_Debug
,
"H2: stream %u: %s"
,
stream
,
h2e
->
txt
);
VSLb
(
h2
->
vsl
,
SLT_Debug
,
"H2: stream %u: %s"
,
stream
,
h2e
->
txt
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment