+1220
-2492
lines changedFilter options
+1220
-2492
lines changed Original file line number Diff line number Diff line change
@@ -29,14 +29,14 @@
29 29
* @macro
30 30
* Version number of the nghttp2 library release
31 31
*/
32 -
#define NGHTTP2_VERSION "1.64.0"
32 +
#define NGHTTP2_VERSION "1.65.0"
33 33 34 34
/**
35 35
* @macro
36 36
* Numerical representation of the version number of the nghttp2 library
37 37
* release. This is a 24 bit number with 8 bits for major number, 8 bits
38 38
* for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
39 39
*/
40 -
#define NGHTTP2_VERSION_NUM 0x014000
40 +
#define NGHTTP2_VERSION_NUM 0x014100
41 41 42 42
#endif /* NGHTTP2VER_H */
Original file line number Diff line number Diff line change
@@ -594,8 +594,19 @@ static void hd_map_remove(nghttp2_hd_map *map, nghttp2_hd_entry *ent) {
594 594
static int hd_ringbuf_init(nghttp2_hd_ringbuf *ringbuf, size_t bufsize,
595 595
nghttp2_mem *mem) {
596 596
size_t size;
597 +
const size_t max_size = SIZE_MAX / sizeof(nghttp2_hd_entry *);
598 + 599 +
if (bufsize > max_size) {
600 +
return NGHTTP2_ERR_NOMEM;
601 +
}
602 + 597 603
for (size = 1; size < bufsize; size <<= 1)
598 604
;
605 + 606 +
if (size > max_size) {
607 +
return NGHTTP2_ERR_NOMEM;
608 +
}
609 + 599 610
ringbuf->buffer = nghttp2_mem_malloc(mem, sizeof(nghttp2_hd_entry *) * size);
600 611
if (ringbuf->buffer == NULL) {
601 612
return NGHTTP2_ERR_NOMEM;
@@ -207,7 +207,6 @@ static int http_request_on_header(nghttp2_stream *stream, nghttp2_hd_nv *nv,
207 207
if (!trailer &&
208 208
/* Do not parse the header field in PUSH_PROMISE. */
209 209
(stream->stream_id & 1) &&
210 -
(stream->flags & NGHTTP2_STREAM_FLAG_NO_RFC7540_PRIORITIES) &&
211 210
!(stream->http_flags & NGHTTP2_HTTP_FLAG_BAD_PRIORITY)) {
212 211
nghttp2_extpri_from_uint8(&extpri, stream->http_extpri);
213 212
if (nghttp2_http_parse_priority(&extpri, nv->value->base,
@@ -660,17 +659,17 @@ void nghttp2_http_record_request_method(nghttp2_stream *stream,
660 659
int nghttp2_http_parse_priority(nghttp2_extpri *dest, const uint8_t *value,
661 660
size_t valuelen) {
662 661
nghttp2_extpri pri = *dest;
663 -
sf_parser sfp;
664 -
sf_vec key;
665 -
sf_value val;
662 +
sfparse_parser sfp;
663 +
sfparse_vec key;
664 +
sfparse_value val;
666 665
int rv;
667 666 668 -
sf_parser_init(&sfp, value, valuelen);
667 +
sfparse_parser_init(&sfp, value, valuelen);
669 668 670 669
for (;;) {
671 -
rv = sf_parser_dict(&sfp, &key, &val);
670 +
rv = sfparse_parser_dict(&sfp, &key, &val);
672 671
if (rv != 0) {
673 -
if (rv == SF_ERR_EOF) {
672 +
if (rv == SFPARSE_ERR_EOF) {
674 673
break;
675 674
}
676 675
@@ -683,15 +682,15 @@ int nghttp2_http_parse_priority(nghttp2_extpri *dest, const uint8_t *value,
683 682 684 683
switch (key.base[0]) {
685 684
case 'i':
686 -
if (val.type != SF_TYPE_BOOLEAN) {
685 +
if (val.type != SFPARSE_TYPE_BOOLEAN) {
687 686
return NGHTTP2_ERR_INVALID_ARGUMENT;
688 687
}
689 688 690 689
pri.inc = val.boolean;
691 690 692 691
break;
693 692
case 'u':
694 -
if (val.type != SF_TYPE_INTEGER ||
693 +
if (val.type != SFPARSE_TYPE_INTEGER ||
695 694
val.integer < NGHTTP2_EXTPRI_URGENCY_HIGH ||
696 695
NGHTTP2_EXTPRI_URGENCY_LOW < val.integer) {
697 696
return NGHTTP2_ERR_INVALID_ARGUMENT;
You can’t perform that action at this time.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4