marc 97/01/29 15:51:38
Modified: src mod_rewrite.c
Log:
Fix mod_rewrite truncation error introduced by buffer overflow
patches. Closes PR#133.
Reviewed by: Randy Terbush
Revision Changes Path
1.16 +1 -1 apache/src/mod_rewrite.c
Index: mod_rewrite.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C3 -r1.15 -r1.16
*** mod_rewrite.c 1997/01/20 04:28:15 1.15
--- mod_rewrite.c 1997/01/29 23:51:37 1.16
***************
*** 1544,1550 ****
/* substitute in output */
#ifdef HAS_APACHE_REGEX_LIB
strncpy(newuri, pregsub(r->pool, output, uri,
regexp->re_nsub+1, regmatch), sizeof(newuri)-1); /* substitute in output */
! newuri[sizeof(newuri-1)] = '\0';
#else
regsub(regexp, output, newuri); /*
substitute in output */
#endif
--- 1544,1550 ----
/* substitute in output */
#ifdef HAS_APACHE_REGEX_LIB
strncpy(newuri, pregsub(r->pool, output, uri,
regexp->re_nsub+1, regmatch), sizeof(newuri)-1); /* substitute in output */
! newuri[sizeof(newuri)-1] = '\0';
#else
regsub(regexp, output, newuri); /*
substitute in output */
#endif
