/[Apache-SVN]/httpd/httpd/trunk/modules/filters/mod_include.c
ViewVC logotype

Diff of /httpd/httpd/trunk/modules/filters/mod_include.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 795446, Sat Jul 18 23:21:52 2009 UTC revision 795642, Sun Jul 19 21:54:36 2009 UTC
# Line 611  static const char *get_include_var(const Line 611  static const char *get_include_var(const
611                  idx, r->filename);                  idx, r->filename);
612              return NULL;              return NULL;
613          }          }
614          else if (re->match[idx].rm_so == re->match[idx].rm_eo) {          else if (re->nsub < idx || idx >= AP_MAX_REG_MATCH) {
615                ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
616                              "regex capture $%" APR_SIZE_T_FMT
617                              " is out of range (last regex was: '%s') in %s",
618                              idx, re->rexp, r->filename);
619              return NULL;              return NULL;
620          }          }
621          else if (re->match[idx].rm_so < 0 || re->match[idx].rm_eo < 0) {          else if (re->match[idx].rm_so < 0 || re->match[idx].rm_eo < 0) {
# Line 620  static const char *get_include_var(const Line 624  static const char *get_include_var(const
624               */               */
625              return NULL;              return NULL;
626          }          }
         else if (re->nsub < idx || idx >= AP_MAX_REG_MATCH) {  
             ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,  
                           "regex capture $%" APR_SIZE_T_FMT  
                           " is out of range (last regex was: '%s') in %s",  
                           idx, re->rexp, r->filename);  
             return NULL;  
         }  
627    
628          else {          else {
629              val = apr_pstrmemdup(ctx->dpool, re->source + re->match[idx].rm_so,              val = apr_pstrmemdup(ctx->dpool, re->source + re->match[idx].rm_so,
Legend:
Removed from v.795446  
changed lines
  Added in v.795642
apache@apache.org
 ViewVC Help
Powered by ViewVC 1.1.2