nginx: src/core/ngx_conf_file.c comparison

too long parameter error

comparison

equal deleted inserted replaced

-:fabe9ecb099f
+:d17c487ddb52
 {
 u_char      *start, ch, *src, *dst;
 size_t       len;
 ssize_t      n;
 ngx_uint_t   found, need_space, last_space, sharp_comment, variable;
-ngx_uint_t   quoted, s_quoted, d_quoted;
+ngx_uint_t   quoted, s_quoted, d_quoted, start_line;
 ngx_str_t   *word;
 ngx_buf_t   *b;
 found = 0;
 need_space = 0;
 quoted = s_quoted = d_quoted = 0;
 cf->args->nelts = 0;
 b = cf->conf_file->buffer;
 start = b->pos;
+start_line = cf->conf_file->line;
 for ( ;; ) {
 if (b->pos >= b->last) {
 }
 return NGX_CONF_FILE_DONE;
 }
-if (b->pos - start) {
+len = b->pos - start;
-ngx_memcpy(b->start, start, b->pos - start);
-}
+if (len == ngx_pagesize) {
+cf->conf_file->line = start_line;
-n = ngx_read_file(&cf->conf_file->file,
-b->start + (b->pos - start),
+ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-b->end - (b->start + (b->pos - start)),
+"too long parameter \"%*s...\" started",
+10, start);
+return NGX_ERROR;
+}
+if (len) {
+ngx_memcpy(b->start, start, len);
+}
+n = ngx_read_file(&cf->conf_file->file, b->start + len,
+b->end - (b->start + len),
 cf->conf_file->file.offset);
 if (n == NGX_ERROR) {
 return NGX_ERROR;
 }
-b->pos = b->start + (b->pos - start);
+b->pos = b->start + len;
+b->last = b->pos + n;
 start = b->start;
-b->last = b->pos + n;
 }
 ch = *b->pos++;
 if (ch == LF) {
 if (ch == ' ' || ch == '\t' || ch == CR || ch == LF) {
 continue;
 }
 start = b->pos - 1;
+start_line = cf->conf_file->line;
 switch (ch) {
 case ';':
 case '{':

Mercurial > hg > nginx