Skip to content

Commit 990e313

Browse files
authored
Update H2O to revision c54c63285 (#9205)
1 parent 919e13b commit 990e313

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

frameworks/C/h2o/h2o.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ RUN apt-get -yqq update && \
3333
ruby \
3434
systemtap-sdt-dev
3535

36-
ARG H2O_VERSION=18b175f71ede08b50d3e5ae8303dacef3ea510fc
36+
ARG H2O_VERSION=c54c63285b52421da2782f028022647fc2ea3dd1
3737

3838
WORKDIR /tmp/h2o-build
3939
RUN curl -LSs "https://github.com/h2o/h2o/archive/${H2O_VERSION}.tar.gz" | \

frameworks/C/h2o/src/handlers/world.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,10 @@ static int do_multiple_queries(bool do_update, bool use_cache, h2o_req_t *req)
238238
const size_t num_query = get_query_number(req);
239239

240240
// MAX_QUERIES is a relatively small number, say less than or equal to UINT16_MAX, so assume no
241-
// overflow in the following arithmetic operations.
242-
assert(num_query && num_query <= MAX_QUERIES && num_query <= UINT16_MAX);
241+
// unsigned overflow in the following arithmetic operations.
242+
static_assert(MAX_QUERIES <= UINT16_MAX,
243+
"potential out-of-bounds memory accesses in the following code");
244+
assert(num_query && num_query <= MAX_QUERIES);
243245

244246
size_t base_size = offsetof(multiple_query_ctx_t, res) + num_query * sizeof(query_result_t);
245247

frameworks/PHP/php/php-h2o.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG H2O_PREFIX=/opt/h2o
44

55
FROM "ubuntu:${UBUNTU_VERSION}" AS compile
66

7-
ARG H2O_VERSION=18b175f71ede08b50d3e5ae8303dacef3ea510fc
7+
ARG H2O_VERSION=c54c63285b52421da2782f028022647fc2ea3dd1
88

99
ARG DEBIAN_FRONTEND=noninteractive
1010
ARG H2O_PREFIX

frameworks/Ruby/h2o_mruby/h2o_mruby.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG H2O_PREFIX=/opt/h2o
44

55
FROM "ubuntu:${UBUNTU_VERSION}" AS compile
66

7-
ARG H2O_VERSION=18b175f71ede08b50d3e5ae8303dacef3ea510fc
7+
ARG H2O_VERSION=c54c63285b52421da2782f028022647fc2ea3dd1
88

99
ARG DEBIAN_FRONTEND=noninteractive
1010
ARG H2O_PREFIX

0 commit comments

Comments
 (0)