Pārlūkot izejas kodu

Update H2O to revision c54c63285 (#9205)

Anton Kirilov 1 gadu atpakaļ
vecāks
revīzija
990e313269

+ 1 - 1
frameworks/C/h2o/h2o.dockerfile

@@ -33,7 +33,7 @@ RUN apt-get -yqq update && \
       ruby \
       systemtap-sdt-dev
 
-ARG H2O_VERSION=18b175f71ede08b50d3e5ae8303dacef3ea510fc
+ARG H2O_VERSION=c54c63285b52421da2782f028022647fc2ea3dd1
 
 WORKDIR /tmp/h2o-build
 RUN curl -LSs "https://github.com/h2o/h2o/archive/${H2O_VERSION}.tar.gz" | \

+ 4 - 2
frameworks/C/h2o/src/handlers/world.c

@@ -238,8 +238,10 @@ static int do_multiple_queries(bool do_update, bool use_cache, h2o_req_t *req)
 	const size_t num_query = get_query_number(req);
 
 	// MAX_QUERIES is a relatively small number, say less than or equal to UINT16_MAX, so assume no
-	// overflow in the following arithmetic operations.
-	assert(num_query && num_query <= MAX_QUERIES && num_query <= UINT16_MAX);
+	// unsigned overflow in the following arithmetic operations.
+	static_assert(MAX_QUERIES <= UINT16_MAX,
+	              "potential out-of-bounds memory accesses in the following code");
+	assert(num_query && num_query <= MAX_QUERIES);
 
 	size_t base_size = offsetof(multiple_query_ctx_t, res) + num_query * sizeof(query_result_t);
 

+ 1 - 1
frameworks/PHP/php/php-h2o.dockerfile

@@ -4,7 +4,7 @@ ARG H2O_PREFIX=/opt/h2o
 
 FROM "ubuntu:${UBUNTU_VERSION}" AS compile
 
-ARG H2O_VERSION=18b175f71ede08b50d3e5ae8303dacef3ea510fc
+ARG H2O_VERSION=c54c63285b52421da2782f028022647fc2ea3dd1
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG H2O_PREFIX

+ 1 - 1
frameworks/Ruby/h2o_mruby/h2o_mruby.dockerfile

@@ -4,7 +4,7 @@ ARG H2O_PREFIX=/opt/h2o
 
 FROM "ubuntu:${UBUNTU_VERSION}" AS compile
 
-ARG H2O_VERSION=18b175f71ede08b50d3e5ae8303dacef3ea510fc
+ARG H2O_VERSION=c54c63285b52421da2782f028022647fc2ea3dd1
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG H2O_PREFIX