Mercurial > hg > nginx

comparison src/core/ngx_parse.c @ 6917:87cf6ddb41c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed ngx_parse_size() / ngx_parse_offset() with 0-length strings.
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 17 Feb 2017 17:01:27 +0300
parents 4ccb37b04454
children
comparison
equal deleted inserted replaced
6916:05fd0dc8f0dc 6917:87cf6ddb41c2
15 u_char unit; 15 u_char unit;
16 size_t len; 16 size_t len;
17 ssize_t size, scale, max; 17 ssize_t size, scale, max;
18 18
19 len = line->len; 19 len = line->len;
20
21 if (len == 0) {
22 return NGX_ERROR;
23 }
24
20 unit = line->data[len - 1]; 25 unit = line->data[len - 1];
21 26
22 switch (unit) { 27 switch (unit) {
23 case 'K': 28 case 'K':
24 case 'k': 29 case 'k':
56 u_char unit; 61 u_char unit;
57 off_t offset, scale, max; 62 off_t offset, scale, max;
58 size_t len; 63 size_t len;
59 64
60 len = line->len; 65 len = line->len;
66
67 if (len == 0) {
68 return NGX_ERROR;
69 }
70
61 unit = line->data[len - 1]; 71 unit = line->data[len - 1];
62 72
63 switch (unit) { 73 switch (unit) {
64 case 'K': 74 case 'K':
65 case 'k': 75 case 'k':